tests: Check for NAT modules in system testsuite.
authorJarno Rajahalme <jarno@ovn.org>
Fri, 4 Dec 2015 23:01:05 +0000 (15:01 -0800)
committerJarno Rajahalme <jarno@ovn.org>
Fri, 4 Dec 2015 23:01:05 +0000 (15:01 -0800)
FTP NAT system tests fail if the corresponding modules are not loaded.
Add a probe for nf_nat_ftp module to make sure it is loaded before the
tests.

Reported-by: Daniele Di Proietto <diproiettod@vmware.com>
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Daniele Di Proietto <diproiettod@vmware.com>
tests/system-kmod-macros.at

index 7253d2b..3ef38e1 100644 (file)
@@ -52,7 +52,7 @@ m4_define([OVS_TRAFFIC_VSWITCHD_STOP],
 m4_define([CHECK_CONNTRACK],
     [AT_SKIP_IF([test $HAVE_CONNTRACK = no])
      AT_SKIP_IF([test $HAVE_PYTHON = no])
-     m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6]],
+     m4_foreach([mod], [[nf_conntrack_ipv4], [nf_conntrack_ipv6], [nf_nat_ftp]],
                 [modprobe mod || echo "Module mod not loaded."
                  on_exit 'modprobe -r mod'
                 ])