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>
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"
# 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'
]
)