diff options
| author | Ehsan <ehsann@google.com> | 2018-08-21 21:34:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-21 21:34:44 +0300 |
| commit | 8bed44622a40d30c0630ef8d647fd16db316a6d1 (patch) | |
| tree | 4139955eb5cebea22bf14b15f2a0a3be57561589 /kokoro | |
| parent | d91d34e150b9c686e191a9a7fb0d03a813b98d3f (diff) | |
[kokoro] Stop building and running tests for VS2013 (#1852)
Diffstat (limited to 'kokoro')
| -rw-r--r-- | kokoro/scripts/windows/build.bat | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/kokoro/scripts/windows/build.bat b/kokoro/scripts/windows/build.bat index d40db880f..a2472fb4f 100644 --- a/kokoro/scripts/windows/build.bat +++ b/kokoro/scripts/windows/build.bat @@ -57,7 +57,14 @@ if "%KOKORO_GITHUB_COMMIT%." == "." ( ) else ( set BUILD_SHA=%KOKORO_GITHUB_COMMIT% ) -cmake -GNinja -DSPIRV_BUILD_COMPRESSION=ON -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_INSTALL_PREFIX=install -DRE2_BUILD_TESTING=OFF -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe .. + +:: Skip building tests for VS2013 +if %VS_VERSION% == 2013 ( + cmake -GNinja -DSPIRV_SKIP_TESTS=ON -DSPIRV_BUILD_COMPRESSION=ON -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_INSTALL_PREFIX=install -DRE2_BUILD_TESTING=OFF -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe .. +) else ( + cmake -GNinja -DSPIRV_BUILD_COMPRESSION=ON -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_INSTALL_PREFIX=install -DRE2_BUILD_TESTING=OFF -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe .. +) + if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL% echo "Build everything... %DATE% %TIME%" @@ -65,13 +72,15 @@ ninja if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL% echo "Build Completed %DATE% %TIME%" -:: ######################################### -:: Run the tests. -:: ######################################### -echo "Running Tests... %DATE% %TIME%" -ctest -C %BUILD_TYPE% --output-on-failure --timeout 300 -if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL% -echo "Tests Completed %DATE% %TIME%" +:: ################################################ +:: Run the tests (We no longer run tests on VS2013) +:: ################################################ +if NOT %VS_VERSION% == 2013 ( + echo "Running Tests... %DATE% %TIME%" + ctest -C %BUILD_TYPE% --output-on-failure --timeout 300 + if %ERRORLEVEL% GEQ 1 exit /b %ERRORLEVEL% + echo "Tests Completed %DATE% %TIME%" +) :: Clean up some directories. rm -rf %SRC%\build |