From: Daniele Di Proietto <diproiettod@vmware.com>
Date: Mon, 2 Nov 2015 22:44:30 +0000 (-0800)
Subject: system-kmod-macros: Do not require the 'conntrack' tool.
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=ef0c5ffaa6680992b7c5c33572c68659647bd4c3

system-kmod-macros: Do not require the 'conntrack' tool.

We can use 'ovstest test-netlink-conntrack' instead.  Now that it is
not required anymore, we can remove the HAVE_CONNTRACK macro in the
build system.

Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
Acked-by: Joe Stringer <joe@ovn.org>
---

diff --git a/tests/atlocal.in b/tests/atlocal.in
index b234c5209..5815c6c8c 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -111,13 +111,6 @@ if test "$IS_WIN32" = "yes"; then
     HAVE_PYTHON="no"
 fi
 
-# Conntrack test requirements
-if test x`which conntrack 2>/dev/null` != 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"
diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at
index 3ef38e11a..20ee7bf07 100644
--- a/tests/system-kmod-macros.at
+++ b/tests/system-kmod-macros.at
@@ -50,12 +50,11 @@ m4_define([OVS_TRAFFIC_VSWITCHD_STOP],
 # kernel conntrack tables when the test is finished.
 #
 m4_define([CHECK_CONNTRACK],
-    [AT_SKIP_IF([test $HAVE_CONNTRACK = no])
-     AT_SKIP_IF([test $HAVE_PYTHON = no])
+    [AT_SKIP_IF([test $HAVE_PYTHON = no])
      m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6], [nf_nat_ftp]],
                 [modprobe mod || echo "Module mod not loaded."
                  on_exit 'modprobe -r mod'
                 ])
-     on_exit 'conntrack -F'
+     on_exit 'ovstest test-netlink-conntrack flush'
     ]
 )