We can use 'test-ovs 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 <diproiet...@vmware.com>
---
tests/atlocal.in | 7 -------
tests/system-kmod-macros.at | 5 ++---
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/tests/atlocal.in b/tests/atlocal.in
index b234c52..5815c6c 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 a48e8d9..3b8edbc 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]],
[modprobe mod || echo "Module mod not loaded."
on_exit 'modprobe -r mod'
])
- on_exit 'conntrack -F'
+ on_exit 'ovstest test-netlink-conntrack flush'
]
)
--
2.1.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
