diff options
Diffstat (limited to 'tests/shell/testcases/json')
| -rwxr-xr-x | tests/shell/testcases/json/0001set_statements_0 | 2 | ||||
| -rwxr-xr-x | tests/shell/testcases/json/0002table_map_0 | 2 | ||||
| -rwxr-xr-x | tests/shell/testcases/json/0003json_schema_version_0 | 2 | ||||
| -rwxr-xr-x | tests/shell/testcases/json/0004json_schema_version_1 | 2 | ||||
| -rwxr-xr-x | tests/shell/testcases/json/0005secmark_objref_0 | 2 | ||||
| -rwxr-xr-x | tests/shell/testcases/json/0006obj_comment_0 | 2 | ||||
| -rwxr-xr-x | tests/shell/testcases/json/netdev | 9 |
7 files changed, 20 insertions, 1 deletions
diff --git a/tests/shell/testcases/json/0001set_statements_0 b/tests/shell/testcases/json/0001set_statements_0 index 1c72d35b..fc4941f4 100755 --- a/tests/shell/testcases/json/0001set_statements_0 +++ b/tests/shell/testcases/json/0001set_statements_0 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_json) + set -e $NFT flush ruleset diff --git a/tests/shell/testcases/json/0002table_map_0 b/tests/shell/testcases/json/0002table_map_0 index 4b54527b..b375e996 100755 --- a/tests/shell/testcases/json/0002table_map_0 +++ b/tests/shell/testcases/json/0002table_map_0 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_json) + set -e $NFT flush ruleset diff --git a/tests/shell/testcases/json/0003json_schema_version_0 b/tests/shell/testcases/json/0003json_schema_version_0 index 0ccf94c8..43f387a1 100755 --- a/tests/shell/testcases/json/0003json_schema_version_0 +++ b/tests/shell/testcases/json/0003json_schema_version_0 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_json) + set -e $NFT flush ruleset diff --git a/tests/shell/testcases/json/0004json_schema_version_1 b/tests/shell/testcases/json/0004json_schema_version_1 index bc451ae7..0f8d586f 100755 --- a/tests/shell/testcases/json/0004json_schema_version_1 +++ b/tests/shell/testcases/json/0004json_schema_version_1 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_json) + set -e $NFT flush ruleset diff --git a/tests/shell/testcases/json/0005secmark_objref_0 b/tests/shell/testcases/json/0005secmark_objref_0 index ae967435..992d1b00 100755 --- a/tests/shell/testcases/json/0005secmark_objref_0 +++ b/tests/shell/testcases/json/0005secmark_objref_0 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_json) + set -e $NFT flush ruleset diff --git a/tests/shell/testcases/json/0006obj_comment_0 b/tests/shell/testcases/json/0006obj_comment_0 index 76d8fe16..4c2a0e8c 100755 --- a/tests/shell/testcases/json/0006obj_comment_0 +++ b/tests/shell/testcases/json/0006obj_comment_0 @@ -1,5 +1,7 @@ #!/bin/bash +# NFT_TEST_REQUIRES(NFT_TEST_HAVE_json) + set -e $NFT flush ruleset diff --git a/tests/shell/testcases/json/netdev b/tests/shell/testcases/json/netdev index 9f603381..dad7afcd 100755 --- a/tests/shell/testcases/json/netdev +++ b/tests/shell/testcases/json/netdev @@ -16,4 +16,11 @@ $NFT flush ruleset RULESET='{"nftables":[{"flush":{"ruleset":null}},{"add":{"table":{"family":"netdev","name":"test_table"}}},{"add":{"chain":{"family":"netdev","table":"test_table","name":"test_chain","type":"filter","hook":"ingress","prio":0,"dev":"d0","policy":"accept"}}}]}' -$NFT -j -f - <<< $RULESET +if [ "$NFT_TEST_HAVE_json" != n ]; then + $NFT -j -f - <<< $RULESET +fi + +if [ "$NFT_TEST_HAVE_json" = n ]; then + echo "Test partially skipped due to missing JSON support." + exit 77 +fi |