summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2023-10-16 15:30:10 +0200
committerFlorian Westphal <fw@strlen.de>2023-10-16 22:34:46 +0200
commitbfb22bbf0f03a3f3ce0ab71d4a2dce7516bc23a0 (patch)
tree420374c1b0d267139a9f10669bdc4ca5b5414583
parent5fcbe57949d67e15e8f88fffe906a25587cc84b4 (diff)
tests/shell: use bash instead of /bin/sh for tests
All tests under "tests/shell" are shell scripts with shebang /bin/bash or /bin/sh. This may seem expected, since these tests are under "tests/shell" directory, but any executable file would work. Anyway. The vast majority of the tests has "#!/bin/bash" as shebang. A few tests had "#!/bin/sh" or "#!/bin/sh -e". Unify this and always use bash. Since we anyway require bash, this is not a limitation. Also, if we know that this is a bash script (by parsing the shebang), we can let the test wrapper pass "-x" to the script. The next commit will do that, and it is nicer if the shebangs are all uniform. Signed-off-by: Thomas Haller <thaller@redhat.com> Signed-off-by: Florian Westphal <fw@strlen.de>
-rwxr-xr-xtests/shell/testcases/chains/0014rename_02
-rwxr-xr-xtests/shell/testcases/chains/0044chain_destroy_02
-rwxr-xr-xtests/shell/testcases/flowtable/0015destroy_02
-rwxr-xr-xtests/shell/testcases/maps/0014destroy_02
-rwxr-xr-xtests/shell/testcases/rule_management/0010replace_02
-rwxr-xr-xtests/shell/testcases/rule_management/0012destroy_02
-rwxr-xr-xtests/shell/testcases/sets/0043concatenated_ranges_02
-rwxr-xr-xtests/shell/testcases/sets/0043concatenated_ranges_12
-rwxr-xr-xtests/shell/testcases/sets/0044interval_overlap_02
-rwxr-xr-xtests/shell/testcases/sets/0044interval_overlap_12
-rwxr-xr-xtests/shell/testcases/sets/0072destroy_02
-rwxr-xr-xtests/shell/testcases/transactions/bad_expression2
12 files changed, 12 insertions, 12 deletions
diff --git a/tests/shell/testcases/chains/0014rename_0 b/tests/shell/testcases/chains/0014rename_0
index bebe48d6..bd84e957 100755
--- a/tests/shell/testcases/chains/0014rename_0
+++ b/tests/shell/testcases/chains/0014rename_0
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
$NFT add table t || exit 1
$NFT add chain t c1 || exit 1
diff --git a/tests/shell/testcases/chains/0044chain_destroy_0 b/tests/shell/testcases/chains/0044chain_destroy_0
index 1763d802..5c5a10a7 100755
--- a/tests/shell/testcases/chains/0044chain_destroy_0
+++ b/tests/shell/testcases/chains/0044chain_destroy_0
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
# NFT_TEST_REQUIRES(NFT_TEST_HAVE_destroy)
diff --git a/tests/shell/testcases/flowtable/0015destroy_0 b/tests/shell/testcases/flowtable/0015destroy_0
index 9e91ef50..d2a87da0 100755
--- a/tests/shell/testcases/flowtable/0015destroy_0
+++ b/tests/shell/testcases/flowtable/0015destroy_0
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
# NFT_TEST_REQUIRES(NFT_TEST_HAVE_destroy)
diff --git a/tests/shell/testcases/maps/0014destroy_0 b/tests/shell/testcases/maps/0014destroy_0
index b17d0021..ee81e3cd 100755
--- a/tests/shell/testcases/maps/0014destroy_0
+++ b/tests/shell/testcases/maps/0014destroy_0
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
# NFT_TEST_REQUIRES(NFT_TEST_HAVE_destroy)
diff --git a/tests/shell/testcases/rule_management/0010replace_0 b/tests/shell/testcases/rule_management/0010replace_0
index 251cebb2..cd69a89d 100755
--- a/tests/shell/testcases/rule_management/0010replace_0
+++ b/tests/shell/testcases/rule_management/0010replace_0
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# test for kernel commit ca08987885a147643817d02bf260bc4756ce8cd4
# ("netfilter: nf_tables: deactivate expressions in rule replecement routine")
diff --git a/tests/shell/testcases/rule_management/0012destroy_0 b/tests/shell/testcases/rule_management/0012destroy_0
index 46a906cf..a058150f 100755
--- a/tests/shell/testcases/rule_management/0012destroy_0
+++ b/tests/shell/testcases/rule_management/0012destroy_0
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
# NFT_TEST_REQUIRES(NFT_TEST_HAVE_destroy)
diff --git a/tests/shell/testcases/sets/0043concatenated_ranges_0 b/tests/shell/testcases/sets/0043concatenated_ranges_0
index 4165b2f5..83d74350 100755
--- a/tests/shell/testcases/sets/0043concatenated_ranges_0
+++ b/tests/shell/testcases/sets/0043concatenated_ranges_0
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
#
# NFT_TEST_SKIP(NFT_TEST_SKIP_slow)
#
diff --git a/tests/shell/testcases/sets/0043concatenated_ranges_1 b/tests/shell/testcases/sets/0043concatenated_ranges_1
index bab189c5..1be28893 100755
--- a/tests/shell/testcases/sets/0043concatenated_ranges_1
+++ b/tests/shell/testcases/sets/0043concatenated_ranges_1
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
#
# 0043concatenated_ranges_1 - Insert and list subnets of different sizes
diff --git a/tests/shell/testcases/sets/0044interval_overlap_0 b/tests/shell/testcases/sets/0044interval_overlap_0
index 19aa6f5e..71bf3345 100755
--- a/tests/shell/testcases/sets/0044interval_overlap_0
+++ b/tests/shell/testcases/sets/0044interval_overlap_0
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
#
# NFT_TEST_SKIP(NFT_TEST_SKIP_slow)
#
diff --git a/tests/shell/testcases/sets/0044interval_overlap_1 b/tests/shell/testcases/sets/0044interval_overlap_1
index 905e6d5a..cdd0c844 100755
--- a/tests/shell/testcases/sets/0044interval_overlap_1
+++ b/tests/shell/testcases/sets/0044interval_overlap_1
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
#
# NFT_TEST_SKIP(NFT_TEST_SKIP_slow)
#
diff --git a/tests/shell/testcases/sets/0072destroy_0 b/tests/shell/testcases/sets/0072destroy_0
index 6399dd0f..9886a9b0 100755
--- a/tests/shell/testcases/sets/0072destroy_0
+++ b/tests/shell/testcases/sets/0072destroy_0
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
# NFT_TEST_REQUIRES(NFT_TEST_HAVE_destroy)
diff --git a/tests/shell/testcases/transactions/bad_expression b/tests/shell/testcases/transactions/bad_expression
index a820c2b9..794b6258 100755
--- a/tests/shell/testcases/transactions/bad_expression
+++ b/tests/shell/testcases/transactions/bad_expression
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# table with invalid expression (masquerade called from filter table).
# nft must return an error. Also catch nfnetlink retry loops that