Skip to content
This repository was archived by the owner on Dec 8, 2021. It is now read-only.

Commit 5cf58c0

Browse files
author
Takashi Matsuo
authored
Fix integration tests on Windows CMake builds. (#615)
Also enable the integration tests by default
1 parent aa66987 commit 5cf58c0

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

ci/kokoro/windows/build-project.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if ($LastExitCode) {
5353
throw "cmake failed with exit code $LastExitCode"
5454
}
5555

56-
if (Test-Path env:RUN_INTEGRATION_TESTS ) {
56+
if ($env:RUN_INTEGRATION_TESTS -eq "true") {
5757
Write-Host "================================================================"
5858
Write-Host "Run integration tests $(Get-Date -Format o)."
5959
cd cmake-out\w\build\g-c-spanner\src\g-c-spanner-build

ci/kokoro/windows/build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cmd /c gcloud auth activate-service-account --key-file "%KOKORO_GFILE_DIR%/build
2525
call "%KOKORO_GFILE_DIR%/spanner-integration-tests-config.bat"
2626
set GOOGLE_APPLICATION_CREDENTIALS=%KOKORO_GFILE_DIR%\spanner-credentials.json
2727
set GOOGLE_CLOUD_CPP_AUTO_RUN_EXAMPLES=yes
28-
set GRPC_DEFAULT_SSL_ROOTS_FILE_PATH=T:\src\github\vcpkg\packages\grpc_x64-windows-static\share\grpc\roots.pem
28+
set GRPC_DEFAULT_SSL_ROOTS_FILE_PATH=T:\src\github\vcpkg\installed\x64-windows-static\share\grpc\roots.pem
2929

3030
echo %date% %time%
3131
powershell -exec bypass ci\kokoro\windows\build-dependencies.ps1

ci/kokoro/windows/common.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,8 @@ env_vars {
2424
key: "BUILD_CACHE"
2525
value: "gs://cloud-cpp-kokoro-results/build-artifacts/spanner-vcpkg-installed.zip"
2626
}
27+
28+
env_vars {
29+
key: "RUN_INTEGRATION_TESTS"
30+
value: "true"
31+
}

0 commit comments

Comments
 (0)