From 3a56ea30acb41358742a94f088f12bd4f1ba1f80 Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Tue, 31 Jan 2023 09:24:56 -0500 Subject: [PATCH 27/30] v2.0.0: test(atlocal): pass EBTABLES to testsuite (cherry picked from commit a5adb26a5eebdaa6e978c580d4fb73f7aa06802f) --- src/tests/atlocal.in | 1 + src/tests/functions.at | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tests/atlocal.in b/src/tests/atlocal.in index 8c5493ac38df..595a96f0f5c9 100644 --- a/src/tests/atlocal.in +++ b/src/tests/atlocal.in @@ -1,5 +1,6 @@ export PYTHON="@PYTHON@" +export EBTABLES="@EBTABLES@" export IPTABLES="@IPTABLES@" export IPTABLES_RESTORE="@IPTABLES_RESTORE@" export IP6TABLES="@IP6TABLES@" diff --git a/src/tests/functions.at b/src/tests/functions.at index a2989c6345da..35e3271ce68d 100644 --- a/src/tests/functions.at +++ b/src/tests/functions.at @@ -368,7 +368,7 @@ m4_define([EBTABLES_LIST_RULES_NORMALIZE], [dnl m4_define([EBTABLES_LIST_RULES], [ dnl ebtables commit 5f508b76a0ce change list output for inversion. m4_ifdef([TESTING_FIREWALL_OFFLINE_CMD], [], [ - NS_CHECK([PIPESTATUS0([ebtables --concurrent -t $1 -L $2], [EBTABLES_LIST_RULES_NORMALIZE])], + NS_CHECK([PIPESTATUS0([$EBTABLES --concurrent -t $1 -L $2], [EBTABLES_LIST_RULES_NORMALIZE])], [$3], [m4_strip([$4])], [m4_strip([$5])], [$6], [$7]) ]) ]) -- 2.43.0