X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=tests%2Fatlocal.in;h=f174061d8f82a2ccdc14813eb5c6354e641893aa;hb=8fb7d02686ed85ad799dfd902ea88d977dab1868;hp=bada7e2a6aca15b554010551dc010bb7cda450e3;hpb=d98e14985fa69e25989c98677e9d60e886d52691;p=cascardo%2Fovs.git

diff --git a/tests/atlocal.in b/tests/atlocal.in
index bada7e2a6..f174061d8 100644
--- 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,20 +9,21 @@ 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
 
 PYTHONIOENCODING=utf_8
 export PYTHONIOENCODING
 
-# PYTHONDONTWRITEBYTECODE=yes keeps Python 2.6+ from creating .pyc and .pyo
+# PYTHONDONTWRITEBYTECODE=yes keeps Python from creating .pyc and .pyo
 # files.  Creating .py[co] works OK for any given version of Open
 # vSwitch, but it causes trouble if you switch from a version with
 # foo/__init__.py into an (older) version with plain foo.py, since
 # foo/__init__.pyc will cause Python to ignore foo.py.
-#
-# Python before version 2.6 always creates .pyc files, so if you develop
-# with such an older version then you're out of luck.
 PYTHONDONTWRITEBYTECODE=yes
 export PYTHONDONTWRITEBYTECODE
 
@@ -40,15 +42,6 @@ case `pwd | tr -d ' -~'` in
     *) non_ascii_cwd=true
 esac
 
-if test $HAVE_PYTHON = yes; then
-    if python -m argparse 2>/dev/null; then
-        :
-    else
-        PYTHONPATH=$PYTHONPATH:$abs_top_srcdir/python/compat
-        export PYTHONPATH
-    fi
-fi
-
 # Enable malloc debugging features.
 case `uname` in
 Linux)
@@ -109,9 +102,30 @@ FreeBSD|NetBSD)
     ;;
 esac
 
+# Check whether to run IPv6 tests.
+if perl -e 'use Socket; socket(FH, PF_INET6, SOCK_STREAM, 0) || exit 1;'; then
+    HAVE_IPV6=yes
+else
+    HAVE_IPV6=no
+fi
+
 # XXX: Disable Python related tests on Windows because Open vSwitch code
 # written in Python has not been ported to the Windows platform. We will
 # need to remove the next block after porting is complete.
 if test "$IS_WIN32" = "yes"; then
     HAVE_PYTHON="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