From 2b2920f5998fc464c7ebd342c36879a17e76e4b4 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Thu, 15 Apr 2021 16:20:43 -0700
Subject: [PATCH] ci: drone: disable stage2 tests

See #8545
---
 build.zig             | 5 ++++-
 ci/drone/linux_script | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.zig b/build.zig
index 6ea2d5157d..080c6b418b 100644
--- a/build.zig
+++ b/build.zig
@@ -52,6 +52,7 @@ pub fn build(b: *Builder) !void {
     const skip_libc = b.option(bool, "skip-libc", "Main test suite skips tests that link libc") orelse false;
     const skip_compile_errors = b.option(bool, "skip-compile-errors", "Main test suite skips compile error tests") orelse false;
     const skip_run_translated_c = b.option(bool, "skip-run-translated-c", "Main test suite skips run-translated-c tests") orelse false;
+    const skip_stage2_tests = b.option(bool, "skip-stage2-tests", "Main test suite skips self-hosted compiler tests") orelse false;
 
     const only_install_lib_files = b.option(bool, "lib-files-only", "Only install library files") orelse false;
     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 {
 
     const test_stage2_step = b.step("test-stage2", "Run the stage2 compiler tests");
     test_stage2_step.dependOn(&test_stage2.step);
-    test_step.dependOn(test_stage2_step);
+    if (!skip_stage2_tests) {
+        test_step.dependOn(test_stage2_step);
+    }
 
     var chosen_modes: [4]builtin.Mode = undefined;
     var chosen_mode_index: usize = 0;
diff --git a/ci/drone/linux_script b/ci/drone/linux_script
index 415ffc01c4..fe7cc6a5d0 100755
--- a/ci/drone/linux_script
+++ b/ci/drone/linux_script
@@ -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/"