@@ -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 ""
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 <fw@strlen.de> --- tests/shell/run-tests.sh | 14 ++++---------- .../testcases/flowtable/dumps/0001flowtable_0.nft | 0 .../testcases/nft-f/dumps/0017ct_timeout_obj_0.nft | 0 3 files changed, 4 insertions(+), 10 deletions(-) mode change 100755 => 100644 tests/shell/testcases/flowtable/dumps/0001flowtable_0.nft mode change 100755 => 100644 tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft diff --git a/tests/shell/testcases/flowtable/dumps/0001flowtable_0.nft b/tests/shell/testcases/flowtable/dumps/0001flowtable_0.nft old mode 100755 new mode 100644 diff --git a/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft b/tests/shell/testcases/nft-f/dumps/0017ct_timeout_obj_0.nft old mode 100755 new mode 100644