From e2d4709779d23c83edf26db2d92f4a326b790825 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Tue, 26 Jul 2022 14:51:45 -0700
Subject: [PATCH] C ABI tests no longer apply to only stage1

---
 test/{stage1 => }/c_abi/build.zig      | 0
 test/{stage1 => }/c_abi/build_wasm.zig | 0
 test/{stage1 => }/c_abi/cfuncs.c       | 0
 test/{stage1 => }/c_abi/main.zig       | 0
 test/standalone.zig                    | 4 ++--
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename test/{stage1 => }/c_abi/build.zig (100%)
 rename test/{stage1 => }/c_abi/build_wasm.zig (100%)
 rename test/{stage1 => }/c_abi/cfuncs.c (100%)
 rename test/{stage1 => }/c_abi/main.zig (100%)

diff --git a/test/stage1/c_abi/build.zig b/test/c_abi/build.zig
similarity index 100%
rename from test/stage1/c_abi/build.zig
rename to test/c_abi/build.zig
diff --git a/test/stage1/c_abi/build_wasm.zig b/test/c_abi/build_wasm.zig
similarity index 100%
rename from test/stage1/c_abi/build_wasm.zig
rename to test/c_abi/build_wasm.zig
diff --git a/test/stage1/c_abi/cfuncs.c b/test/c_abi/cfuncs.c
similarity index 100%
rename from test/stage1/c_abi/cfuncs.c
rename to test/c_abi/cfuncs.c
diff --git a/test/stage1/c_abi/main.zig b/test/c_abi/main.zig
similarity index 100%
rename from test/stage1/c_abi/main.zig
rename to test/c_abi/main.zig
diff --git a/test/standalone.zig b/test/standalone.zig
index 2b24fe686d..c0b5b804e2 100644
--- a/test/standalone.zig
+++ b/test/standalone.zig
@@ -41,11 +41,11 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
     // C ABI compatibility issue: https://github.com/ziglang/zig/issues/1481
     if (builtin.cpu.arch == .x86_64) {
         if (builtin.zig_backend == .stage1) { // https://github.com/ziglang/zig/issues/12222
-            cases.addBuildFile("test/stage1/c_abi/build.zig", .{});
+            cases.addBuildFile("test/c_abi/build.zig", .{});
         }
     }
     // C ABI tests only pass for the Wasm target when using stage2
-    cases.addBuildFile("test/stage1/c_abi/build_wasm.zig", .{
+    cases.addBuildFile("test/c_abi/build_wasm.zig", .{
         .requires_stage2 = true,
         .use_emulation = true,
     });