Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #197 from bitshares/improve-testing

Browse source 
Update run-parallel-tests.sh to support arguments
This commit is contained in:
Abit 2020-04-19 17:42:59 +02:00 committed by GitHub
commit bb4fdb124f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build-and-test.yml vendored
View file

@ -57,7 +57,7 @@ jobs:
- name: Test - name: Test
run: | run: |
parallel echo Running {}\; sh -c "_build/tests/{}" <<_EOT_ parallel echo Running {}\; sh -c "_build/tests/{}" <<_EOT_
all_tests all_tests -l message
bloom_test -- README.md bloom_test -- README.md
ecc_test README.md ecc_test README.md
hmac_test hmac_test
@ -116,7 +116,7 @@ jobs:
- name: Test - name: Test
run: | run: |
parallel echo Running {}\; sh -c "_build/tests/{}" <<_EOT_ parallel echo Running {}\; sh -c "_build/tests/{}" <<_EOT_
all_tests all_tests -l message
bloom_test -- README.md bloom_test -- README.md
ecc_test README.md ecc_test README.md
hmac_test hmac_test

2
.travis.yml
View file

@ -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 . - 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' - 'which build-wrapper-linux-x86-64 && build-wrapper-linux-x86-64 --out-dir bw-output make -j 2 || make -j 2'
- set -o pipefail - 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/hmac_test 2>&1 | cat
- tests/ecc_test README.md 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' - 'find CMakeFiles/fc.dir -type d | while read d; do gcov -o "$d" "${d/CMakeFiles*.dir/./}"/*.cpp; done >/dev/null'

8
tests/run-parallel-tests.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
if [ "$#" != 1 ]; then if [ "$#" -lt 1 ]; then
echo "Usage: $0 <boost-unit-test-executable>" 1>&2 echo "Usage: $0 <boost-unit-test-executable> [arguments]" 1>&2
exit 1 exit 1
fi fi
@ -15,7 +15,7 @@ fi
if [ "$BOOST_VERSION" = "" -o "$BOOST_VERSION" -lt 105900 ]; then if [ "$BOOST_VERSION" = "" -o "$BOOST_VERSION" -lt 105900 ]; then
echo "Boost version '$BOOST_VERSION' - executing tests serially" echo "Boost version '$BOOST_VERSION' - executing tests serially"
"$1" "$@"
else else
"$1" --list_content 2>&1 \ "$1" --list_content 2>&1 \
| grep '\*$' \ | grep '\*$' \
@ -26,5 +26,5 @@ else
*) pre="$t"; ;; *) pre="$t"; ;;
esac esac
done \ done \
| parallel echo Running {}\; "$1" -t {} | parallel echo Running {}\; "$@" -t {}
fi fi