authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-08-31 14:54:05-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-08-31 14:54:05-07:00
log26140678a5c72604f2baac3cb9d1e5f7b37b6b8d
treea1ea4317a1d797bfbfcd49c6bf03f3b5f1b532b9
parent2148336a8145c5db66bb0ea11ad02dd0813942f0

ci: skip compile error tests on Windows

We're up against the 6 hour limit so this is a time-saving workaround. Compile error tests are generally not OS-specific so the coverage from the other platforms should be sufficient.

2 files changed, 5 insertions(+), 2 deletions(-)

build.zig+4-1
...@@ -49,6 +49,7 @@ pub fn build(b: *Builder) !void {...@@ -49,6 +49,7 @@ pub fn build(b: *Builder) !void {
49 const skip_release_safe = b.option(bool, "skip-release-safe", "Main test suite skips release-safe builds") orelse skip_release;49 const skip_release_safe = b.option(bool, "skip-release-safe", "Main test suite skips release-safe builds") orelse skip_release;
50 const skip_non_native = b.option(bool, "skip-non-native", "Main test suite skips non-native builds") orelse false;50 const skip_non_native = b.option(bool, "skip-non-native", "Main test suite skips non-native builds") orelse false;
51 const skip_libc = b.option(bool, "skip-libc", "Main test suite skips tests that link libc") orelse false;51 const skip_libc = b.option(bool, "skip-libc", "Main test suite skips tests that link libc") orelse false;
52 const skip_compile_errors = b.option(bool, "skip-compile-errors", "Main test suite skips compile error tests") orelse false;
5253
53 const only_install_lib_files = b.option(bool, "lib-files-only", "Only install library files") orelse false;54 const only_install_lib_files = b.option(bool, "lib-files-only", "Only install library files") orelse false;
54 const enable_llvm = b.option(bool, "enable-llvm", "Build self-hosted compiler with LLVM backend enabled") orelse false;55 const enable_llvm = b.option(bool, "enable-llvm", "Build self-hosted compiler with LLVM backend enabled") orelse false;
...@@ -184,7 +185,9 @@ pub fn build(b: *Builder) !void {...@@ -184,7 +185,9 @@ pub fn build(b: *Builder) !void {
184 test_step.dependOn(tests.addRunTranslatedCTests(b, test_filter));185 test_step.dependOn(tests.addRunTranslatedCTests(b, test_filter));
185 // tests for this feature are disabled until we have the self-hosted compiler available186 // tests for this feature are disabled until we have the self-hosted compiler available
186 // test_step.dependOn(tests.addGenHTests(b, test_filter));187 // test_step.dependOn(tests.addGenHTests(b, test_filter));
187 test_step.dependOn(tests.addCompileErrorTests(b, test_filter, modes));188 if (!skip_compile_errors) {
189 test_step.dependOn(tests.addCompileErrorTests(b, test_filter, modes));
190 }
188 test_step.dependOn(docs_step);191 test_step.dependOn(docs_step);
189}192}
190193
ci/azure/windows_msvc_script.bat+1-1
...@@ -24,7 +24,7 @@ cd %ZIGBUILDDIR%...@@ -24,7 +24,7 @@ cd %ZIGBUILDDIR%
24cmake.exe .. -Thost=x64 -G"Visual Studio 16 2019" -A x64 "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release || exit /b24cmake.exe .. -Thost=x64 -G"Visual Studio 16 2019" -A x64 "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release || exit /b
25msbuild /maxcpucount /p:Configuration=Release INSTALL.vcxproj || exit /b25msbuild /maxcpucount /p:Configuration=Release INSTALL.vcxproj || exit /b
2626
27"%ZIGINSTALLDIR%\bin\zig.exe" build test || exit /b27"%ZIGINSTALLDIR%\bin\zig.exe" build test -Dskip-compile-errors || exit /b
2828
29set "PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem"29set "PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem"
30SET "MSYSTEM=MINGW64"30SET "MSYSTEM=MINGW64"