odp-util: Fix formatting and parsing of 'frag' in tnl_push ipv4 argument.

[cascardo/ovs.git] / tests / atlocal.in

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 8e9fd9b..2a163db 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -111,9 +111,16 @@ if test "$IS_WIN32" = "yes"; then
     HAVE_PYTHON="no"
 fi
 
-# Conntrack test requirements
-if test x`which conntrack` != x; then
-    HAVE_CONNTRACK="yes"
+if test "$HAVE_PYTHON" = "yes" \
+   && test "x`$PYTHON $abs_top_srcdir/tests/test-l7.py --help | grep 'ftp'`" != x; then
+    HAVE_PYFTPDLIB="yes"
 else
-    HAVE_CONNTRACK="no"
+    HAVE_PYFTPDLIB="no"
+fi
+
+# Determine correct netcat option to quit on stdin EOF
+if nc --version 2>&1 | grep -q nmap.org; then
+    NC_EOF_OPT="--send-only"
+else
+    NC_EOF_OPT="-q 1"
 fi