From 3367e0a14a81f823a2f1fc75a0ef57f7791be6c4 Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Sun, 20 May 2018 22:04:34 +0200 Subject: [PATCH 1/3] Snoop travis parallel defaults --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 041134a..341726a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,10 @@ addons: secure: "aJ1aXr7JCsd7EwN0GQDJibKK24SW27AYrc5RDS7+MIJ5CCSX8e/cZ8v0Se6JmaXqt4t/VKAuVtv9JW2HZMMv2c2ACDpGWysKftS0Nb3JJCDHth+NZKGWhl9rFGQ90BigL3qQu2c9haJ77uCXko2BudcSqd9ejfSpQLA0tLrT7QGr/iS+pdmEQOVAsNWF4157hYSSxwz1WIHX2uxci2y9zCiE0ckmkpxwmI6qFiIExC6Y7LAATBeE1fT4KocPYZSAbeYx6D0C1llaWnw0ICf1jVF9ZEG79GDlnM9Uqj9rAAWIhgJFie15gYFvsfsv/W1R7u4xh0204/86HEfHCaV5JLUKGuxWRvtHhMmOC4LRf4siscT52R28AUq+QIak4dgL1H4QL6AvhpCK4SeeZj644XA8VJUp7skjpk2cNJ6RZA4TdOY/qSAGSSf/wHizftRdjb7oPn0nHgadr3biDI2LrhGI4N4lAZdxrBjUODkzENsgR4vQ4RtFw62gpxvUpqMwFkNIEYxWo9bVNXmqYzBKJqqL/lHsm7QZHJgpOcn/jFow+R9n73LjKGGDbJcCZ7TUbWWFzhaGiw7aDyYFuZgGVkEuT81KQdxaLjG6X5hMrLGaB8No9T8Vj+4121rcCxX3r8MK0uvVzcaKt9Md51zCJ6GoF4FcQbI8TkOj2O7i4ZM=" script: + - ls -l /etc/parallel + - cat /etc/parallel/config + - ls -l $HOME/.parallel + - cat $HOME/.parallel/config - 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 From 6bec48a579d6debda32f8d85f0a070ff3d76cb2a Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Fri, 22 Jun 2018 22:39:23 +0200 Subject: [PATCH 2/3] Allow multiple test suites in one parallel run --- tests/run-parallel-tests.sh | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/tests/run-parallel-tests.sh b/tests/run-parallel-tests.sh index d7a6986..dff4d2e 100755 --- a/tests/run-parallel-tests.sh +++ b/tests/run-parallel-tests.sh @@ -1,17 +1,19 @@ #!/bin/sh -if [ "$#" != 1 ]; then - echo "Usage: $0 " 1>&2 +if [ "$#" -lt 1 -o "$1" = '--help' -o "$1" = '-h' ]; then + echo "Usage: $0 [...]" 1>&2 exit 1 fi -"$1" --list_content 2>&1 \ - | grep '\*$' \ - | sed 's=\*$==;s=^ =/=' \ - | while read t; do - case "$t" in - /*) echo "$pre$t"; ;; - *) pre="$t"; ;; - esac - done \ - | parallel -v --group --eta -- "$1" -t {} +for i in "$@"; do + "$i" --list_content 2>&1 \ + | grep '\*$' \ + | sed 's=\*$==;s=^ =/=' \ + | while read t; do + case "$t" in + /*) echo $i; echo "$pre$t"; ;; + *) pre="$t"; ;; + esac + done +done \ + | parallel -v --group --eta -N 2 -- {1} -t {2} From 817845ce0ce692857d21fe44f5bcef545aa59cb6 Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Fri, 22 Jun 2018 22:41:30 +0200 Subject: [PATCH 3/3] Check if --list_content is available --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 341726a..90e0553 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,13 +19,10 @@ addons: secure: "aJ1aXr7JCsd7EwN0GQDJibKK24SW27AYrc5RDS7+MIJ5CCSX8e/cZ8v0Se6JmaXqt4t/VKAuVtv9JW2HZMMv2c2ACDpGWysKftS0Nb3JJCDHth+NZKGWhl9rFGQ90BigL3qQu2c9haJ77uCXko2BudcSqd9ejfSpQLA0tLrT7QGr/iS+pdmEQOVAsNWF4157hYSSxwz1WIHX2uxci2y9zCiE0ckmkpxwmI6qFiIExC6Y7LAATBeE1fT4KocPYZSAbeYx6D0C1llaWnw0ICf1jVF9ZEG79GDlnM9Uqj9rAAWIhgJFie15gYFvsfsv/W1R7u4xh0204/86HEfHCaV5JLUKGuxWRvtHhMmOC4LRf4siscT52R28AUq+QIak4dgL1H4QL6AvhpCK4SeeZj644XA8VJUp7skjpk2cNJ6RZA4TdOY/qSAGSSf/wHizftRdjb7oPn0nHgadr3biDI2LrhGI4N4lAZdxrBjUODkzENsgR4vQ4RtFw62gpxvUpqMwFkNIEYxWo9bVNXmqYzBKJqqL/lHsm7QZHJgpOcn/jFow+R9n73LjKGGDbJcCZ7TUbWWFzhaGiw7aDyYFuZgGVkEuT81KQdxaLjG6X5hMrLGaB8No9T8Vj+4121rcCxX3r8MK0uvVzcaKt9Md51zCJ6GoF4FcQbI8TkOj2O7i4ZM=" script: - - ls -l /etc/parallel - - cat /etc/parallel/config - - ls -l $HOME/.parallel - - cat $HOME/.parallel/config - 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/all_tests --list_content - tests/run-parallel-tests.sh tests/all_tests - tests/api 2>&1 | cat - tests/bip_lock 2>&1 | cat