authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-08-12 03:51:09-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-08-12 03:51:09-04:00
logfa50e179f7f8d523ff00be4cac90bf7659394140
treebf67fc0f5bbe30bbfd8ba84a48594ae587ef1b90
parent645c396d02b7570d10d4d6b80653e7f9db42234e
parent5e42b0821a5aa6af2327b4380fd796be274cb024
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #12381 from hdorio/12380-fix-reporting-success

ci: windows: stop when exe exits with an error

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

ci/azure/pipelines.yml+27-1
...@@ -27,7 +27,7 @@ jobs:...@@ -27,7 +27,7 @@ jobs:
27 vmImage: 'windows-2019'27 vmImage: 'windows-2019'
28 variables:28 variables:
29 TARGET: 'x86_64-windows-gnu'29 TARGET: 'x86_64-windows-gnu'
30 ZIG_LLVM_CLANG_LLD_NAME: 'zig+llvm+lld+clang-${{ variables.TARGET }}-0.10.0-dev.2931+bdf3fa12f'30 ZIG_LLVM_CLANG_LLD_NAME: 'zig+llvm+lld+clang-${{ variables.TARGET }}-0.10.0-dev.3524+74673b7f6'
31 ZIG_LLVM_CLANG_LLD_URL: 'https://ziglang.org/deps/${{ variables.ZIG_LLVM_CLANG_LLD_NAME }}.zip'31 ZIG_LLVM_CLANG_LLD_URL: 'https://ziglang.org/deps/${{ variables.ZIG_LLVM_CLANG_LLD_NAME }}.zip'
32 steps:32 steps:
33 - pwsh: |33 - pwsh: |
...@@ -41,6 +41,13 @@ jobs:...@@ -41,6 +41,13 @@ jobs:
41 Set-Variable -Name ZIGINSTALLDIR -Value "${ZIGBUILDDIR}\dist"41 Set-Variable -Name ZIGINSTALLDIR -Value "${ZIGBUILDDIR}\dist"
42 Set-Variable -Name ZIGPREFIXPATH -Value "$(Get-Location)\$(ZIG_LLVM_CLANG_LLD_NAME)"42 Set-Variable -Name ZIGPREFIXPATH -Value "$(Get-Location)\$(ZIG_LLVM_CLANG_LLD_NAME)"
4343
44 function CheckLastExitCode {
45 if (!$?) {
46 exit 1
47 }
48 return 0
49 }
50
44 # Make the `zig version` number consistent.51 # Make the `zig version` number consistent.
45 # This will affect the `zig build` command below which uses `git describe`.52 # This will affect the `zig build` command below which uses `git describe`.
46 git config core.abbrev 953 git config core.abbrev 9
...@@ -69,6 +76,7 @@ jobs:...@@ -69,6 +76,7 @@ jobs:
69 -Dstrip `76 -Dstrip `
70 -Duse-zig-libcxx `77 -Duse-zig-libcxx `
71 -Dtarget=$(TARGET)78 -Dtarget=$(TARGET)
79 CheckLastExitCode
7280
73 cd -81 cd -
7482
...@@ -83,19 +91,37 @@ jobs:...@@ -83,19 +91,37 @@ jobs:
83 - pwsh: |91 - pwsh: |
84 Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\build\dist"92 Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\build\dist"
8593
94 function CheckLastExitCode {
95 if (!$?) {
96 exit 1
97 }
98 return 0
99 }
100
86 # Sadly, stage2 is omitted from this build to save memory on the CI server. Once self-hosted is101 # Sadly, stage2 is omitted from this build to save memory on the CI server. Once self-hosted is
87 # built with itself and does not gobble as much memory, we can enable these tests.102 # built with itself and does not gobble as much memory, we can enable these tests.
88 #& "$ZIGINSTALLDIR\bin\zig.exe" test "..\test\behavior.zig" -fno-stage1 -fLLVM -I "..\test" 2>&1103 #& "$ZIGINSTALLDIR\bin\zig.exe" test "..\test\behavior.zig" -fno-stage1 -fLLVM -I "..\test" 2>&1
104 #CheckLastExitCode
89105
90 & "$ZIGINSTALLDIR\bin\zig.exe" build test-toolchain -Dskip-non-native -Dskip-stage2-tests 2>&1106 & "$ZIGINSTALLDIR\bin\zig.exe" build test-toolchain -Dskip-non-native -Dskip-stage2-tests 2>&1
107 CheckLastExitCode
91 & "$ZIGINSTALLDIR\bin\zig.exe" build test-std -Dskip-non-native 2>&1108 & "$ZIGINSTALLDIR\bin\zig.exe" build test-std -Dskip-non-native 2>&1
109 CheckLastExitCode
92 name: test110 name: test
93 displayName: 'Test'111 displayName: 'Test'
94112
95 - pwsh: |113 - pwsh: |
96 Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\build\dist"114 Set-Variable -Name ZIGINSTALLDIR -Value "$(Get-Location)\build\dist"
97115
116 function CheckLastExitCode {
117 if (!$?) {
118 exit 1
119 }
120 return 0
121 }
122
98 & "$ZIGINSTALLDIR\bin\zig.exe" build docs123 & "$ZIGINSTALLDIR\bin\zig.exe" build docs
124 CheckLastExitCode
99 timeoutInMinutes: 60125 timeoutInMinutes: 60
100 name: doc126 name: doc
101 displayName: 'Documentation'127 displayName: 'Documentation'
test/link.zig+5
...@@ -3,6 +3,11 @@ const builtin = @import("builtin");...@@ -3,6 +3,11 @@ const builtin = @import("builtin");
3const tests = @import("tests.zig");3const tests = @import("tests.zig");
44
5pub fn addCases(cases: *tests.StandaloneContext) void {5pub fn addCases(cases: *tests.StandaloneContext) void {
6 if (builtin.os.tag == .windows) {
7 // https://github.com/ziglang/zig/issues/12421
8 return;
9 }
10
6 cases.addBuildFile("test/link/bss/build.zig", .{11 cases.addBuildFile("test/link/bss/build.zig", .{
7 .build_modes = false, // we only guarantee zerofill for undefined in Debug12 .build_modes = false, // we only guarantee zerofill for undefined in Debug
8 });13 });
test/stack_traces.zig+5
...@@ -3,6 +3,11 @@ const os = std.os;...@@ -3,6 +3,11 @@ const os = std.os;
3const tests = @import("tests.zig");3const tests = @import("tests.zig");
44
5pub fn addCases(cases: *tests.StackTracesContext) void {5pub fn addCases(cases: *tests.StackTracesContext) void {
6 if (@import("builtin").os.tag == .windows) {
7 // https://github.com/ziglang/zig/issues/12422
8 return;
9 }
10
6 cases.addCase(.{11 cases.addCase(.{
7 .name = "return",12 .name = "return",
8 .source = 13 .source =
test/standalone.zig+4-1
...@@ -34,7 +34,10 @@ pub fn addCases(cases: *tests.StandaloneContext) void {...@@ -34,7 +34,10 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
34 if (builtin.zig_backend == .stage1) { // https://github.com/ziglang/zig/issues/1219434 if (builtin.zig_backend == .stage1) { // https://github.com/ziglang/zig/issues/12194
35 cases.addBuildFile("test/standalone/issue_9812/build.zig", .{});35 cases.addBuildFile("test/standalone/issue_9812/build.zig", .{});
36 }36 }
37 cases.addBuildFile("test/standalone/issue_11595/build.zig", .{});37 if (builtin.os.tag != .windows) {
38 // https://github.com/ziglang/zig/issues/12419
39 cases.addBuildFile("test/standalone/issue_11595/build.zig", .{});
40 }
38 if (builtin.os.tag != .wasi) {41 if (builtin.os.tag != .wasi) {
39 cases.addBuildFile("test/standalone/load_dynamic_library/build.zig", .{});42 cases.addBuildFile("test/standalone/load_dynamic_library/build.zig", .{});
40 }43 }
test/tests.zig+7
...@@ -641,6 +641,13 @@ pub fn addPkgTests(...@@ -641,6 +641,13 @@ pub fn addPkgTests(
641 } else false;641 } else false;
642 if (!want_this_mode) continue;642 if (!want_this_mode) continue;
643643
644 if (test_target.backend) |backend| {
645 if (backend == .stage2_c and builtin.os.tag == .windows) {
646 // https://github.com/ziglang/zig/issues/12415
647 continue;
648 }
649 }
650
644 const libc_prefix = if (test_target.target.getOs().requiresLibC())651 const libc_prefix = if (test_target.target.getOs().requiresLibC())
645 ""652 ""
646 else if (test_target.link_libc)653 else if (test_target.link_libc)