From d162ebfa35b8ae2902ef92290bdcea77d62e6e90 Mon Sep 17 00:00:00 2001 From: kcbanner Date: Sat, 21 Jan 2023 16:16:09 -0500 Subject: [PATCH] ci: update windows debug ci as well --- ci/x86_64-windows-debug.ps1 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/ci/x86_64-windows-debug.ps1 b/ci/x86_64-windows-debug.ps1 index b7cde7d4f9..b6a078430c 100644 --- a/ci/x86_64-windows-debug.ps1 +++ b/ci/x86_64-windows-debug.ps1 @@ -67,24 +67,26 @@ Write-Output "Testing Autodocs..." -fno-emit-bin CheckLastExitCode -Write-Output "Build behavior tests using the C backend..." -& "stage3-debug\bin\zig.exe" test ` +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-debug\bin\zig.exe" build-obj ` +& "stage3-release\bin\zig.exe" build-obj ` ..\lib\compiler_rt.zig ` --zig-lib-dir "$ZIG_LIB_DIR" ` -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