diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index adbe476..7dfc44a 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -57,7 +57,7 @@ jobs: - name: Test run: | parallel echo Running {}\; sh -c "_build/tests/{}" <<_EOT_ - all_tests + all_tests -l message bloom_test -- README.md ecc_test README.md hmac_test @@ -116,7 +116,7 @@ jobs: - name: Test run: | parallel echo Running {}\; sh -c "_build/tests/{}" <<_EOT_ - all_tests + all_tests -l message bloom_test -- README.md ecc_test README.md hmac_test diff --git a/.travis.yml b/.travis.yml index 6aca7d5..327d519 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ script: - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON . - 'which build-wrapper-linux-x86-64 && build-wrapper-linux-x86-64 --out-dir bw-output make -j 2 || make -j 2' - set -o pipefail - - tests/run-parallel-tests.sh tests/all_tests + - tests/run-parallel-tests.sh tests/all_tests -l message - tests/hmac_test 2>&1 | cat - tests/ecc_test README.md 2>&1 | cat - 'find CMakeFiles/fc.dir -type d | while read d; do gcov -o "$d" "${d/CMakeFiles*.dir/./}"/*.cpp; done >/dev/null' diff --git a/tests/run-parallel-tests.sh b/tests/run-parallel-tests.sh index adc3eb2..61bf5be 100755 --- a/tests/run-parallel-tests.sh +++ b/tests/run-parallel-tests.sh @@ -1,7 +1,7 @@ #!/bin/sh -if [ "$#" != 1 ]; then - echo "Usage: $0 " 1>&2 +if [ "$#" -lt 1 ]; then + echo "Usage: $0 [arguments]" 1>&2 exit 1 fi @@ -15,7 +15,7 @@ fi if [ "$BOOST_VERSION" = "" -o "$BOOST_VERSION" -lt 105900 ]; then echo "Boost version '$BOOST_VERSION' - executing tests serially" - "$1" + "$@" else "$1" --list_content 2>&1 \ | grep '\*$' \ @@ -26,5 +26,5 @@ else *) pre="$t"; ;; esac done \ - | parallel echo Running {}\; "$1" -t {} + | parallel echo Running {}\; "$@" -t {} fi