Commit b7174dde7cd819fb0c956f368e8eb09656906dd0
2018-10-26T14:59:50
Merge pull request #4867 from libgit2/ethomson/ci ci: Fix some minor issues
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 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126
diff --git a/azure-pipelines/nightly.yml b/azure-pipelines/nightly.yml
index 098ea14..5de949a 100644
--- a/azure-pipelines/nightly.yml
+++ b/azure-pipelines/nightly.yml
@@ -7,7 +7,7 @@ jobs:
pool:
vmImage: 'Ubuntu 16.04'
steps:
- - template: azure-pipelines/docker.yml
+ - template: docker.yml
parameters:
imageName: 'libgit2/trusty-amd64:latest'
environmentVariables: |
@@ -20,7 +20,7 @@ jobs:
pool:
vmImage: 'Ubuntu 16.04'
steps:
- - template: azure-pipelines/docker.yml
+ - template: docker.yml
parameters:
imageName: 'libgit2/trusty-amd64:latest'
environmentVariables: |
@@ -33,7 +33,7 @@ jobs:
pool:
vmImage: 'Ubuntu 16.04'
steps:
- - template: azure-pipelines/docker.yml
+ - template: docker.yml
parameters:
imageName: 'libgit2/trusty-amd64:latest'
environmentVariables: |
@@ -46,7 +46,7 @@ jobs:
pool:
vmImage: 'Ubuntu 16.04'
steps:
- - template: azure-pipelines/docker.yml
+ - template: docker.yml
parameters:
imageName: 'libgit2/trusty-amd64:latest'
environmentVariables: |
@@ -61,7 +61,7 @@ jobs:
steps:
- bash: . '$(Build.SourcesDirectory)/ci/setup-osx.sh'
displayName: Setup
- - template: azure-pipelines/bash.yml
+ - template: bash.yml
parameters:
environmentVariables:
TMPDIR: $(Agent.TempDirectory)
@@ -73,7 +73,7 @@ jobs:
displayName: 'Windows (amd64; Visual Studio)'
pool: Hosted
steps:
- - template: azure-pipelines/powershell.yml
+ - template: powershell.yml
parameters:
environmentVariables:
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64"
@@ -82,7 +82,7 @@ jobs:
displayName: 'Windows (x86; Visual Studio)'
pool: Hosted
steps:
- - template: azure-pipelines/powershell.yml
+ - template: powershell.yml
parameters:
environmentVariables:
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013"
@@ -96,7 +96,7 @@ jobs:
env:
TEMP: $(Agent.TempDirectory)
ARCH: amd64
- - template: azure-pipelines/powershell.yml
+ - template: powershell.yml
parameters:
environmentVariables:
CMAKE_OPTIONS: -G"MinGW Makefiles"
@@ -112,7 +112,7 @@ jobs:
env:
TEMP: $(Agent.TempDirectory)
ARCH: x86
- - template: azure-pipelines/powershell.yml
+ - template: powershell.yml
parameters:
environmentVariables:
CMAKE_OPTIONS: -G"MinGW Makefiles"
diff --git a/ci/test.ps1 b/ci/test.ps1
index 1cf0211..fdfa1fe 100644
--- a/ci/test.ps1
+++ b/ci/test.ps1
@@ -19,12 +19,17 @@ if ($Env:SKIP_TESTS) { exit }
function run_test {
$TestName = $args[0]
+ $TestCommand = (ctest -N -V -R "^$TestName$") -join "`n"
+
+ if (-Not ($TestCommand -match "(?ms).*\n^[0-9]*: Test command: ")) {
+ echo "Could not find tests: $TestName"
+ exit
+ }
+
$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) { $global:Success = $false }
}
diff --git a/ci/test.sh b/ci/test.sh
index 5d7c913..1bc710a 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -44,6 +44,12 @@ failure() {
# JUnit-style XML files.
run_test() {
TEST_CMD=$(ctest -N -V -R "^${1}$" | sed -n 's/^[0-9]*: Test command: //p')
+
+ if [ -z "$TEST_CMD" ]; then
+ echo "Could not find tests: $1"
+ exit 1
+ fi
+
TEST_CMD="${TEST_CMD} -r${BUILD_DIR}/results_${1}.xml"
if [ "$LEAK_CHECK" = "valgrind" ]; then