From a226aef36cc441be4af675e24b3e672fe3fe2d5a Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Wed, 7 Sep 2022 19:16:54 +0200
Subject: [PATCH] test-cases: enable stage2 tests on Windows

---
 ci/azure/pipelines.yml | 3 +--
 src/test.zig           | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ci/azure/pipelines.yml b/ci/azure/pipelines.yml
index 633c6389d03521304b128c7478d3b46104873e23..86f92f5ef625fb638783adabe4670b7e3b8d5f9e 100644
--- a/ci/azure/pipelines.yml
+++ b/ci/azure/pipelines.yml
@@ -73,8 +73,7 @@ jobs:
       & "$ZIGINSTALLDIR\bin\zig.exe" build test docs `
         --search-prefix "$ZIGPREFIXPATH" `
         -Dstatic-llvm `
-        -Dskip-non-native `
-        -Dskip-stage2-tests
+        -Dskip-non-native
       CheckLastExitCode
     name: test
     displayName: 'Test'
diff --git a/src/test.zig b/src/test.zig
index babded13f9d71d7324eba4eb0afc34240c804ddb..dfe5f5c866a08c10a02a673282710136534bb1c3 100644
--- a/src/test.zig
+++ b/src/test.zig
@@ -177,6 +177,8 @@ const TestManifestConfigDefaults = struct {
                 inline for (&[_][]const u8{ "x86_64", "aarch64" }) |arch| {
                     defaults = defaults ++ arch ++ "-macos" ++ ",";
                 }
+                // Windows
+                defaults = defaults ++ "x86_64-windows" ++ ",";
                 // Wasm
                 defaults = defaults ++ "wasm32-wasi";
                 return defaults;
@@ -1546,6 +1548,13 @@ pub const TestContext = struct {
             .self_exe_path = std.testing.zig_exe_path,
             // TODO instead of turning off color, pass in a std.Progress.Node
             .color = .off,
+            // TODO: We set these to no so that we don't fallback to LLD for incremental linking context. This is because
+            // our own COFF linker doesn't yet support these options.
+            .want_unwind_tables = switch (case.backend) {
+                .stage2 => if (target.os.tag == .windows) false else null,
+                else => null,
+            },
+            .emit_implib = null,
         });
         defer comp.destroy();
 
-- 
2.54.0