ovsdb-server: Fix a reference count leak bug

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

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 095bc40..f174061 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,6 +1,7 @@
 # -*- shell-script -*-
 HAVE_OPENSSL='@HAVE_OPENSSL@'
 HAVE_PYTHON='@HAVE_PYTHON@'
+HAVE_PYTHON3='@HAVE_PYTHON3@'
 EGREP='@EGREP@'
 PERL='@PERL@'
 
@@ -8,6 +9,10 @@ if test x"$PYTHON" = x; then
     PYTHON='@PYTHON@'
 fi
 
+if test x"$PYTHON3" = x; then
+    PYTHON3='@PYTHON3@'
+fi
+
 PYTHONPATH=$abs_top_srcdir/python:$abs_top_builddir/tests:$PYTHONPATH
 export PYTHONPATH
 
@@ -111,16 +116,16 @@ if test "$IS_WIN32" = "yes"; then
     HAVE_PYTHON="no"
 fi
 
-# Conntrack test requirements
-if test x`which conntrack` != x; then
-    HAVE_CONNTRACK="yes"
-else
-    HAVE_CONNTRACK="no"
-fi
-
 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_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