From 98768a99217303bacdb40ea322ab06478df3b3f7 Mon Sep 17 00:00:00 2001
From: kcbanner <kcbanner@gmail.com>
Date: Sat, 21 Jan 2023 16:14:52 -0500
Subject: [PATCH] ci: explicitly test the CBE tests with the -msvc abi, as this
 is the path users will use when bootstrapping

---
 ci/x86_64-windows-release.ps1 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ci/x86_64-windows-release.ps1 b/ci/x86_64-windows-release.ps1
index f2b3d84a26..bcb50a7ed9 100644
--- a/ci/x86_64-windows-release.ps1
+++ b/ci/x86_64-windows-release.ps1
@@ -67,14 +67,15 @@ Write-Output "Testing Autodocs..."
   -fno-emit-bin
 CheckLastExitCode
 
-Write-Output "Build behavior tests using the C backend..."
+Write-Output "Build x86_64-windows-msvc behavior tests using the C backend..."
 & "stage3-release\bin\zig.exe" test `
   ..\test\behavior.zig `
   --zig-lib-dir "$ZIG_LIB_DIR" `
   -I..\test `
   -I..\lib `
   -ofmt=c `
-  -femit-bin="test_behavior.c"
+  -femit-bin="test-x86_64-windows-msvc.c" `
+  -target x86_64-windows-msvc
 CheckLastExitCode
 
 & "stage3-release\bin\zig.exe" build-obj `
@@ -83,8 +84,9 @@ CheckLastExitCode
   -ofmt=c `
   -OReleaseSmall `
   --name compiler_rt `
-  -femit-bin="compiler_rt.c" `
+  -femit-bin="compiler_rt-x86_64-windows-msvc.c" `
   --pkg-begin build_options config.zig --pkg-end
+  -target x86_64-windows-msvc
 CheckLastExitCode
 
 Import-Module "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
@@ -96,8 +98,8 @@ Enter-VsDevShell -VsInstallPath "C:\Program Files\Microsoft Visual Studio\2022\E
 CheckLastExitCode
 
 Write-Output "Build and run behavior tests with msvc..."
-& cl.exe -I..\lib test_behavior.c compiler_rt.c /W3 /Z7 -link -nologo -debug -subsystem:console -entry:wWinMainCRTStartup kernel32.lib ntdll.lib vcruntime.lib libucrt.lib
+& cl.exe -I..\lib test-x86_64-windows-msvc.c compiler_rt-x86_64-windows-msvc.c /W3 /Z7 -link -nologo -debug -subsystem:console -entry:wWinMainCRTStartup kernel32.lib ntdll.lib vcruntime.lib libucrt.lib
 CheckLastExitCode
 
-& .\test_behavior.exe
+& .\test-x86_64-windows-msvc.exe
 CheckLastExitCode