Commit a6917dc7 by Edward Thomson Committed by Patrick Steinhardt

ci: don't stop on failure

Don't stop on test failures; run all the tests, even when a test fails.

(cherry picked from commit 429c7f11)
parent 8f4dc529
...@@ -7,6 +7,7 @@ $PSDefaultParameterValues['*:ErrorAction'] = 'Stop' ...@@ -7,6 +7,7 @@ $PSDefaultParameterValues['*:ErrorAction'] = 'Stop'
$SourceDir = Split-Path (Split-Path (Get-Variable MyInvocation).Value.MyCommand.Path) $SourceDir = Split-Path (Split-Path (Get-Variable MyInvocation).Value.MyCommand.Path)
$BuildDir = Get-Location $BuildDir = Get-Location
$Success = $true
if ($Env:SKIP_TESTS) { exit } if ($Env:SKIP_TESTS) { exit }
...@@ -24,7 +25,7 @@ function run_test { ...@@ -24,7 +25,7 @@ function run_test {
Write-Host $TestCommand Write-Host $TestCommand
Invoke-Expression $TestCommand Invoke-Expression $TestCommand
if ($LastExitCode -ne 0) { [Environment]::Exit($LastExitCode) } if ($LastExitCode -ne 0) { $Success = $false }
} }
Write-Host "##############################################################################" Write-Host "##############################################################################"
...@@ -67,3 +68,5 @@ if (-not $Env:SKIP_PROXY_TESTS) { ...@@ -67,3 +68,5 @@ if (-not $Env:SKIP_PROXY_TESTS) {
taskkill /F /IM javaw.exe taskkill /F /IM javaw.exe
} }
if (-not $Success) { exit 1 }
...@@ -11,6 +11,8 @@ BUILD_DIR=$(pwd) ...@@ -11,6 +11,8 @@ BUILD_DIR=$(pwd)
TMPDIR=${TMPDIR:-/tmp} TMPDIR=${TMPDIR:-/tmp}
USER=${USER:-$(whoami)} USER=${USER:-$(whoami)}
SUCCESS=1
VALGRIND="valgrind --leak-check=full --show-reachable=yes --error-exitcode=125 --num-callers=50 --suppressions=\"$SOURCE_DIR/libgit2_clar.supp\"" VALGRIND="valgrind --leak-check=full --show-reachable=yes --error-exitcode=125 --num-callers=50 --suppressions=\"$SOURCE_DIR/libgit2_clar.supp\""
LEAKS="MallocStackLogging=1 MallocScribble=1 leaks -quiet -atExit -- nohup" LEAKS="MallocStackLogging=1 MallocScribble=1 leaks -quiet -atExit -- nohup"
...@@ -30,11 +32,9 @@ cleanup() { ...@@ -30,11 +32,9 @@ cleanup() {
echo "Done." echo "Done."
} }
die() { failure() {
echo "Test exited with code: $1" echo "Test exited with code: $1"
SUCCESS=0
cleanup
exit $1
} }
# Ask ctest what it would run if we were to invoke it directly. This lets # Ask ctest what it would run if we were to invoke it directly. This lets
...@@ -54,7 +54,7 @@ run_test() { ...@@ -54,7 +54,7 @@ run_test() {
RUNNER="$TEST_CMD" RUNNER="$TEST_CMD"
fi fi
eval $RUNNER || die $? eval $RUNNER || failure
} }
# Configure the test environment; run them early so that we're certain # Configure the test environment; run them early so that we're certain
...@@ -187,6 +187,12 @@ if [ -z "$SKIP_SSH_TESTS" ]; then ...@@ -187,6 +187,12 @@ if [ -z "$SKIP_SSH_TESTS" ]; then
unset GITTEST_REMOTE_SSH_FINGERPRINT unset GITTEST_REMOTE_SSH_FINGERPRINT
fi fi
echo "Success."
cleanup cleanup
if [ "$SUCCESS" -ne "1" ]; then
echo "Some tests failed."
exit 1
fi
echo "Success."
exit 0 exit 0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment