From 70065ab63a90787c49f714c6e39fa1b112b5c8af Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Fri, 4 Jan 2019 16:25:41 +0100 Subject: tests: shell: remove RETURNCODE_SEPARATOR test files are located via find + a pattern search that looks for _[0-9]. Previous change makes all test scripts return 0 when the test case is supposed to pass, so the foo_$retval name is no longer needed. Update script to look for all executeables in the 'testcases' directory. This makes it necessary to make two dump-files non-executeable. Signed-off-by: Florian Westphal --- tests/shell/run-tests.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'tests/shell/run-tests.sh') diff --git a/tests/shell/run-tests.sh b/tests/shell/run-tests.sh index 6b693cc1..81ee0cdd 100755 --- a/tests/shell/run-tests.sh +++ b/tests/shell/run-tests.sh @@ -1,8 +1,7 @@ #!/bin/bash # Configuration -TESTDIR="./$(dirname $0)/" -RETURNCODE_SEPARATOR="_" +TESTDIR="./$(dirname $0)/testcases" SRC_NFT="$(dirname $0)/../../src/nft" DIFF=$(which diff) @@ -55,12 +54,8 @@ if [ "$1" == "-g" ] ; then fi for arg in "$@"; do - if grep ^.*${RETURNCODE_SEPARATOR}[0-9]\\+$ <<< $arg >/dev/null ; then - SINGLE+=" $arg" - VERBOSE=y - else - msg_error "unknown parameter '$arg'" - fi + SINGLE+=" $arg" + VERBOSE=y done kernel_cleanup() { @@ -90,8 +85,7 @@ find_tests() { echo $SINGLE return fi - ${FIND} ${TESTDIR} -executable -regex \ - .*${RETURNCODE_SEPARATOR}[0-9]+ | sort + ${FIND} ${TESTDIR} -type f -executable | sort } echo "" -- cgit v1.2.3