From 17c66a50608864e114766fb16731bad4cfdb558e Mon Sep 17 00:00:00 2001 From: Arushi Singhal Date: Sat, 7 Jul 2018 14:08:38 +0530 Subject: [PATCH] iptables: tests: shell: Add README 1) README is added to run test suite. 2) Rename two test-case scripts to follow proper numerical order. 3) "echo -en "\033[1A\033[K" # clean the [EXECUTING] foobar line" command should only used when verbose("-v") option is not there else instead of clearing "[EXECUTING]" prompt it is clearing last prompt of the test file. Signed-off-by: Arushi Singhal Signed-off-by: Florian Westphal --- iptables/tests/shell/README | 17 +++++++++++++++++ iptables/tests/shell/run-tests.sh | 2 +- .../chain/{0004newchain_0 => 0002newchain_0} | 0 .../chain/{0005rename_1 => 0003rename_1} | 0 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 iptables/tests/shell/README rename iptables/tests/shell/testcases/chain/{0004newchain_0 => 0002newchain_0} (100%) rename iptables/tests/shell/testcases/chain/{0005rename_1 => 0003rename_1} (100%) diff --git a/iptables/tests/shell/README b/iptables/tests/shell/README new file mode 100644 index 00000000..08da4869 --- /dev/null +++ b/iptables/tests/shell/README @@ -0,0 +1,17 @@ +To run the test suite (as root): + $ cd iptables/tests/shell + # ./run-tests.sh + +Test files are executable files with the pattern <> , where N is the +expected return code of the executable. Since they are located with `find', +test-files can be spreaded in any sub-directories. + +You can turn on a verbose execution by calling: + # ./run-tests.sh -v + +And to run test suite for pariticular test files: + # ./run-tests.sh + +Also, test-files will receive the environment variable $XT_MULTI which contains +the path to the old iptables (xtables-legacy-multi) or new iptables (xtables-nft-multi) +binary being tested. diff --git a/iptables/tests/shell/run-tests.sh b/iptables/tests/shell/run-tests.sh index a984a457..a39aecb6 100755 --- a/iptables/tests/shell/run-tests.sh +++ b/iptables/tests/shell/run-tests.sh @@ -67,10 +67,10 @@ do_test() { XT_MULTI=$xtables_multi unshare -n ${testfile} else XT_MULTI=$xtables_multi unshare -n ${testfile} > /dev/null 2>&1 + echo -en "\033[1A\033[K" # clean the [EXECUTING] foobar line fi rc_got=$? - echo -en "\033[1A\033[K" # clean the [EXECUTING] foobar line if [ "$rc_got" == "$rc_spec" ] ; then msg_info "[OK] $testfile" diff --git a/iptables/tests/shell/testcases/chain/0004newchain_0 b/iptables/tests/shell/testcases/chain/0002newchain_0 similarity index 100% rename from iptables/tests/shell/testcases/chain/0004newchain_0 rename to iptables/tests/shell/testcases/chain/0002newchain_0 diff --git a/iptables/tests/shell/testcases/chain/0005rename_1 b/iptables/tests/shell/testcases/chain/0003rename_1 similarity index 100% rename from iptables/tests/shell/testcases/chain/0005rename_1 rename to iptables/tests/shell/testcases/chain/0003rename_1 -- 2.47.3