From 333eff73b2f60874a70d42d5412f97d65faef5d5 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 28 Dec 2018 10:25:44 -0600 Subject: [PATCH] tools/run_tests.sh: run all test programs in exec_tests.sh --- tools/exec_tests.sh | 4 +++- tools/run_tests.sh | 10 +++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/exec_tests.sh b/tools/exec_tests.sh index 6d06b6e..c7acb3f 100644 --- a/tools/exec_tests.sh +++ b/tools/exec_tests.sh @@ -9,7 +9,9 @@ run_cmd() { $WRAPPER "$@" > /dev/null } -run_cmd ./test_checksums +for prog in ./test_*; do + run_cmd $prog +done for format in '' '-g' '-z'; do for ref_impl in '' '-Y' '-Z'; do diff --git a/tools/run_tests.sh b/tools/run_tests.sh index 565199e..ab72fac 100755 --- a/tools/run_tests.sh +++ b/tools/run_tests.sh @@ -43,7 +43,7 @@ fi NDKDIR="${NDKDIR:=/opt/android-ndk}" -FILES=("$SMOKEDATA" ./tools/exec_tests.sh benchmark test_checksums) +FILES=("$SMOKEDATA" ./tools/exec_tests.sh benchmark 'test_*') EXEC_TESTS_CMD="WRAPPER= SMOKEDATA=\"$(basename $SMOKEDATA)\" sh exec_tests.sh" NPROC=$(grep -c processor /proc/cpuinfo) VALGRIND="valgrind --quiet --error-exitcode=100 --leak-check=full --errors-for-leak-kinds=all" @@ -174,7 +174,7 @@ checksum_benchmarks() { android_build_and_test() { run_cmd ./tools/android_build.sh --ndkdir="$NDKDIR" "$@" - run_cmd adb push "${FILES[@]}" /data/local/tmp/ + run_cmd adb push ${FILES[@]} /data/local/tmp/ # Note: adb shell always returns 0, even if the shell command fails... log "adb shell \"cd /data/local/tmp && $EXEC_TESTS_CMD\"" @@ -231,7 +231,7 @@ mips_tests() { return 0 fi run_cmd ./tools/mips_build.sh - run_cmd scp "${FILES[@]}" root@dd-wrt: + run_cmd scp ${FILES[@]} root@dd-wrt: run_cmd ssh root@dd-wrt "$EXEC_TESTS_CMD" log "Checking that compression on big endian CPU produces same output" @@ -341,10 +341,6 @@ EOF run_cmd ./benchmark -6 "$TMPFILE" run_cmd ./benchmark -12 "$TMPFILE" fi - - # Check worst-case decompression speed - run_cmd make -j$NPROC test_slow_decompression - run_cmd ./test_slow_decompression } ###############################################################################