|
 |
bb602c |
From e43c0e73a869d6f229890568e4ef4ed949f7e9f3 Mon Sep 17 00:00:00 2001
|
|
|
bb602c |
From: Eric Garver <eric@garver.life>
|
|
|
bb602c |
Date: Thu, 31 Oct 2019 12:52:51 -0400
|
|
|
bb602c |
Subject: [PATCH 119/122] fix: tests: convert probe of nft numeric args to
|
|
|
bb602c |
runtime
|
|
|
bb602c |
|
|
|
bb602c |
(cherry picked from commit c38a7cc0cf0eafc9258610e2ed476faed8a29907)
|
|
|
bb602c |
(cherry picked from commit 00879f66684c9d2332da4f38f1174d5f2f2101aa)
|
|
|
bb602c |
---
|
|
|
bb602c |
src/tests/atlocal.in | 2 ++
|
|
|
bb602c |
src/tests/functions.at | 6 ++----
|
|
|
bb602c |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
bb602c |
|
|
|
bb602c |
diff --git a/src/tests/atlocal.in b/src/tests/atlocal.in
|
|
|
bb602c |
index 474685515437..989dc270d419 100644
|
|
|
bb602c |
--- a/src/tests/atlocal.in
|
|
|
bb602c |
+++ b/src/tests/atlocal.in
|
|
|
bb602c |
@@ -4,3 +4,5 @@ export IPTABLES=@IPTABLES@
|
|
|
bb602c |
export IPTABLES_RESTORE=@IPTABLES_RESTORE@
|
|
|
bb602c |
export IP6TABLES=@IP6TABLES@
|
|
|
bb602c |
export IP6TABLES_RESTORE=@IP6TABLES_RESTORE@
|
|
|
bb602c |
+
|
|
|
bb602c |
+export NFT_NUMERIC_ARGS="$(nft -h |grep numeric-protocol >/dev/null && echo -n '' || { echo -n '-' && echo -n 'nn'; })"
|
|
|
bb602c |
diff --git a/src/tests/functions.at b/src/tests/functions.at
|
|
|
bb602c |
index fb68388776c9..97506cc1396f 100644
|
|
|
bb602c |
--- a/src/tests/functions.at
|
|
|
bb602c |
+++ b/src/tests/functions.at
|
|
|
bb602c |
@@ -279,7 +279,7 @@ m4_define([NFT_LIST_RULES_ALWAYS], [
|
|
|
bb602c |
])
|
|
|
bb602c |
|
|
|
bb602c |
m4_ifdef([TESTING_FIREWALL_OFFLINE_CMD], [], [
|
|
|
bb602c |
- NS_CHECK([nft NFT_NUMERIC_ARGS list chain $1 firewalld $2 | TRIM_WHITESPACE | NFT_LIST_RULES_NORMALIZE], [$3], [m4_strip([$4])], [m4_strip([$5])], [$6], [$7])
|
|
|
bb602c |
+ NS_CHECK([nft $NFT_NUMERIC_ARGS list chain $1 firewalld $2 | TRIM_WHITESPACE | NFT_LIST_RULES_NORMALIZE], [$3], [m4_strip([$4])], [m4_strip([$5])], [$6], [$7])
|
|
|
bb602c |
])
|
|
|
bb602c |
m4_undefine([NFT_LIST_RULES_NORMALIZE])
|
|
|
bb602c |
])
|
|
|
bb602c |
@@ -301,7 +301,7 @@ m4_define([IPSET_LIST_SET], [
|
|
|
bb602c |
|
|
|
bb602c |
m4_define([NFT_LIST_SET_ALWAYS], [
|
|
|
bb602c |
m4_ifdef([TESTING_FIREWALL_OFFLINE_CMD], [], [
|
|
|
bb602c |
- NS_CHECK([nft NFT_NUMERIC_ARGS list set inet firewalld $1 | TRIM_WHITESPACE], [$2], [m4_strip([$3])], [m4_strip([$4])], [$5], [$6])
|
|
|
bb602c |
+ NS_CHECK([nft $NFT_NUMERIC_ARGS list set inet firewalld $1 | TRIM_WHITESPACE], [$2], [m4_strip([$3])], [m4_strip([$4])], [$5], [$6])
|
|
|
bb602c |
])
|
|
|
bb602c |
])
|
|
|
bb602c |
|
|
|
bb602c |
@@ -422,8 +422,6 @@ m4_define([IF_HOST_SUPPORTS_NFT_FIB], [
|
|
|
bb602c |
fi
|
|
|
bb602c |
])
|
|
|
bb602c |
|
|
|
bb602c |
-m4_define([NFT_NUMERIC_ARGS], m4_esyscmd([nft -h |grep "numeric-protocol" >/dev/null && echo -n "" || { echo -n "-" && echo -n "nn"; } ]))
|
|
|
bb602c |
-
|
|
|
bb602c |
m4_define([HOST_SUPPORTS_IP6TABLES], m4_esyscmd(
|
|
|
bb602c |
if $IP6TABLES -L >/dev/null 2>&1; then
|
|
|
bb602c |
echo -n "yes"
|
|
|
bb602c |
--
|
|
|
bb602c |
2.23.0
|
|
|
bb602c |
|