Commit 7c9769d94799c7bc6341d64e18bbd13bc8993ad6
2018-09-17T19:57:26
ci: append -r flag to clar on windows Similar to the way we parse the ctest output on POSIX systems, do the same on Windows. This allows us to append the `-r` flag to clar after we've identified the command to run.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
diff --git a/ci/test.ps1 b/ci/test.ps1
index 89301d4..5f75c0b 100644
--- a/ci/test.ps1
+++ b/ci/test.ps1
@@ -5,8 +5,28 @@ $PSDefaultParameterValues['*:ErrorAction'] = 'Stop'
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$SourceDir = Split-Path (Split-Path (Get-Variable MyInvocation).Value.MyCommand.Path)
+$BuildDir = Get-Location
+
if ($Env:SKIP_TESTS) { exit }
+# Ask ctest what it would run if we were to invoke it directly. This lets
+# us manage the test configuration in a single place (tests/CMakeLists.txt)
+# instead of running clar here as well. But it allows us to wrap our test
+# harness with a leak checker like valgrind. Append the option to write
+# JUnit-style XML files.
+function run_test {
+ $TestName = $args[0]
+
+ $TestCommand = (ctest -N -V -R "^$TestName$") -join "`n" -replace "(?ms).*\n^[0-9]*: Test command: ","" -replace "\n.*",""
+ $TestCommand += " -r${BuildDir}\results_${TestName}.xml"
+
+ Write-Host $TestCommand
+ Invoke-Expression $TestCommand
+
+ if ($LastExitCode -ne 0) { [Environment]::Exit($LastExitCode) }
+}
+
Write-Host "##############################################################################"
Write-Host "## Configuring test environment"
Write-Host "##############################################################################"
@@ -23,8 +43,7 @@ Write-Host "####################################################################
Write-Host "## Running (offline) tests"
Write-Host "##############################################################################"
-ctest -V -R offline
-if ($LastExitCode -ne 0) { [Environment]::Exit($LastExitCode) }
+run_test offline
if (-not $Env:SKIP_ONLINE_TESTS) {
Write-Host ""
@@ -32,8 +51,7 @@ if (-not $Env:SKIP_ONLINE_TESTS) {
Write-Host "## Running (online) tests"
Write-Host "##############################################################################"
- ctest -V -R online
- if ($LastExitCode -ne 0) { [Environment]::Exit($LastExitCode) }
+ run_test online
}
if (-not $Env:SKIP_PROXY_TESTS) {
@@ -44,9 +62,8 @@ if (-not $Env:SKIP_PROXY_TESTS) {
$Env:GITTEST_REMOTE_PROXY_URL="localhost:8080"
$Env:GITTEST_REMOTE_PROXY_USER="foo"
$Env:GITTEST_REMOTE_PROXY_PASS="bar"
- ctest -V -R proxy
- if ($LastExitCode -ne 0) { [Environment]::Exit($LastExitCode) }
+
+ run_test proxy
taskkill /F /IM javaw.exe
}
-