aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-04-17 16:36:13 +0800
committerGitHub <noreply@github.com>2018-04-17 16:36:13 +0800
commit08b0ed4116c9266a52b5d9606f2e1529b2683291 (patch)
tree420e9d9d581238848fca1ab900c1a8ff1bc97dfd /scripts
parent5499db01ee2faff06ed6517602dd91d9b268055e (diff)
parent797ce727bb7284cd4fa99fab677ca24d16f51a02 (diff)
downloaddexon-solidity-08b0ed4116c9266a52b5d9606f2e1529b2683291.tar
dexon-solidity-08b0ed4116c9266a52b5d9606f2e1529b2683291.tar.gz
dexon-solidity-08b0ed4116c9266a52b5d9606f2e1529b2683291.tar.bz2
dexon-solidity-08b0ed4116c9266a52b5d9606f2e1529b2683291.tar.lz
dexon-solidity-08b0ed4116c9266a52b5d9606f2e1529b2683291.tar.xz
dexon-solidity-08b0ed4116c9266a52b5d9606f2e1529b2683291.tar.zst
dexon-solidity-08b0ed4116c9266a52b5d9606f2e1529b2683291.zip
Merge pull request #3905 from ethereum/reportCmdline
Report failed commandline tests.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/tests.sh20
1 files changed, 16 insertions, 4 deletions
diff --git a/scripts/tests.sh b/scripts/tests.sh
index 425a4ff4..38073bf3 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -42,13 +42,21 @@ else
log_directory=""
fi
-echo "Running commandline tests..."
+function printError() { echo "$(tput setaf 1)$1$(tput sgr0)"; }
+function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; }
+
+
+printTask "Running commandline tests..."
"$REPO_ROOT/test/cmdlineTests.sh" &
CMDLINE_PID=$!
# Only run in parallel if this is run on CI infrastructure
if [ -z "$CI" ]
then
- wait $CMDLINE_PID
+ if ! wait $CMDLINE_PID
+ then
+ printError "Commandline tests FAILED"
+ exit 1
+ fi
fi
function download_eth()
@@ -112,7 +120,7 @@ for optimize in "" "--optimize"
do
for vm in $EVM_VERSIONS
do
- echo "--> Running tests using "$optimize" --evm-version "$vm"..."
+ printTask "--> Running tests using "$optimize" --evm-version "$vm"..."
log=""
if [ -n "$log_directory" ]
then
@@ -127,7 +135,11 @@ do
done
done
-wait $CMDLINE_PID
+if ! wait $CMDLINE_PID
+then
+ printError "Commandline tests FAILED"
+ exit 1
+fi
pkill "$ETH_PID" || true
sleep 4