Commit 2b2920f5998fc464c7ebd342c36879a17e76e4b4 | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-04-15 16:20:43-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-04-15 16:20:43-07:00
log	2b2920f5998fc464c7ebd342c36879a17e76e4b4
tree	0e420e18febee1a143a17df5173ad251eff68cbf
parent	c795e82cbccaa4c68272c7891841526c00f0db90

ci: drone: disable stage2 tests

See #8545

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

build.zig
ci
- drone
  - linux_script

build.zig+4-1

...	@@ -52,6 +52,7 @@ pub fn build(b: *Builder) !void {	...	@@ -52,6 +52,7 @@ pub fn build(b: *Builder) !void {
52	const skip_libc = b.option(bool, "skip-libc", "Main test suite skips tests that link libc") orelse false;	52	const skip_libc = b.option(bool, "skip-libc", "Main test suite skips tests that link libc") orelse false;
53	const skip_compile_errors = b.option(bool, "skip-compile-errors", "Main test suite skips compile error tests") orelse false;	53	const skip_compile_errors = b.option(bool, "skip-compile-errors", "Main test suite skips compile error tests") orelse false;
54	const skip_run_translated_c = b.option(bool, "skip-run-translated-c", "Main test suite skips run-translated-c tests") orelse false;	54	const skip_run_translated_c = b.option(bool, "skip-run-translated-c", "Main test suite skips run-translated-c tests") orelse false;
		55	const skip_stage2_tests = b.option(bool, "skip-stage2-tests", "Main test suite skips self-hosted compiler tests") orelse false;
55		56
56	const only_install_lib_files = b.option(bool, "lib-files-only", "Only install library files") orelse false;	57	const only_install_lib_files = b.option(bool, "lib-files-only", "Only install library files") orelse false;
57	const is_stage1 = b.option(bool, "stage1", "Build the stage1 compiler, put stage2 behind a feature flag") orelse false;	58	const is_stage1 = b.option(bool, "stage1", "Build the stage1 compiler, put stage2 behind a feature flag") orelse false;
...	@@ -230,7 +231,9 @@ pub fn build(b: *Builder) !void {	...	@@ -230,7 +231,9 @@ pub fn build(b: *Builder) !void {
230		231
231	const test_stage2_step = b.step("test-stage2", "Run the stage2 compiler tests");	232	const test_stage2_step = b.step("test-stage2", "Run the stage2 compiler tests");
232	test_stage2_step.dependOn(&test_stage2.step);	233	test_stage2_step.dependOn(&test_stage2.step);
233	test_step.dependOn(test_stage2_step);	234	if (!skip_stage2_tests) {
		235	test_step.dependOn(test_stage2_step);
		236	}
234		237
235	var chosen_modes: [4]builtin.Mode = undefined;	238	var chosen_modes: [4]builtin.Mode = undefined;
236	var chosen_mode_index: usize = 0;	239	var chosen_mode_index: usize = 0;

ci/drone/linux_script+4-1

 @@ -22,11 +22,14 @@ cd build
 cmake .. -DCMAKE_BUILD_TYPE=Release "-DCMAKE_INSTALL_PREFIX=$DISTDIR" -DZIG_STATIC=ON -DCMAKE_PREFIX_PATH=/deps/local -GNinja
 samu install
+# run-translated-c tests are skipped due to: https://github.com/ziglang/zig/issues/8537
+# stage2 tests are skipped due to: https://github.com/ziglang/zig/issues/8545
 ./zig build test \
     -Dskip-release \
     -Dskip-non-native \
     -Dskip-compile-errors \
-    -Dskip-run-translated-c # https://github.com/ziglang/zig/issues/8537
+    -Dskip-run-translated-c \
+    -Dskip-stage2-tests
 if [ -z "$DRONE_PULL_REQUEST" ]; then
   mv ../LICENSE "$DISTDIR/"