Skip to content

Commit 848c220

Browse files
authored
Merge branch 'master' into fix-switch-capture
2 parents 572c919 + 5bbbc8d commit 848c220

19 files changed

+2
-350
lines changed

ci/loongarch64-linux-debug.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ unset CXX
4444
ninja install
4545

4646
# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
47-
stage3-debug/bin/zig build test \
47+
stage3-debug/bin/zig build test docs \
4848
--maxrss 60129542144 \
4949
-Dstatic-llvm \
5050
-Dskip-non-native \

ci/loongarch64-linux-release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ unset CXX
4444
ninja install
4545

4646
# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts.
47-
stage3-release/bin/zig build test \
47+
stage3-release/bin/zig build test docs \
4848
--maxrss 60129542144 \
4949
-Dstatic-llvm \
5050
-Dskip-non-native \

test/cases.zig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ pub const BuildOptions = struct {
1212
pub fn addCases(cases: *Cases, build_options: BuildOptions, b: *std.Build) !void {
1313
try @import("compile_errors.zig").addCases(cases, b);
1414
try @import("llvm_targets.zig").addCases(cases, build_options, b);
15-
try @import("nvptx.zig").addCases(cases, b);
1615
}

test/cases/pic_freestanding.zig

Lines changed: 0 additions & 14 deletions
This file was deleted.

test/cases/pic_linux.zig

Lines changed: 0 additions & 14 deletions
This file was deleted.

test/cases/pie_freestanding.zig

Lines changed: 0 additions & 16 deletions
This file was deleted.

test/cases/pie_linux.zig

Lines changed: 0 additions & 10 deletions
This file was deleted.

test/nvptx.zig

Lines changed: 0 additions & 105 deletions
This file was deleted.

test/standalone/build.zig.zon

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
.test_runner_module_imports = .{
1616
.path = "test_runner_module_imports",
1717
},
18-
// https://github.com/ziglang/zig/issues/17483
19-
//.issue_13970 = .{
20-
// .path = "issue_13970",
21-
//},
2218
.shared_library = .{
2319
.path = "shared_library",
2420
},
@@ -142,15 +138,6 @@
142138
.issue_12706 = .{
143139
.path = "issue_12706",
144140
},
145-
// TODO This test is disabled for doing naughty things in the build script.
146-
// The logic needs to get moved to a child process instead of build.zig.
147-
//.sigpipe = .{
148-
// .path = "sigpipe",
149-
//},
150-
// TODO restore this test
151-
//.options = .{
152-
// .path = "options",
153-
//},
154141
.strip_empty_loop = .{
155142
.path = "strip_empty_loop",
156143
},
@@ -193,9 +180,6 @@
193180
.empty_global_error_set = .{
194181
.path = "empty_global_error_set",
195182
},
196-
.omit_cfi = .{
197-
.path = "omit_cfi",
198-
},
199183
.config_header = .{
200184
.path = "config_header",
201185
},

test/standalone/issue_13970/build.zig

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)