From 9891d1332d9ed388701a2f662354a5aa283220ea Mon Sep 17 00:00:00 2001 From: Jarno Rajahalme Date: Fri, 4 Dec 2015 15:01:05 -0800 Subject: [PATCH] tests: Check for NAT modules in system testsuite. 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 Signed-off-by: Jarno Rajahalme Acked-by: Daniele Di Proietto --- tests/system-kmod-macros.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 7253d2bb2..3ef38e11a 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -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' ]) -- 2.20.1