From 5ae84696536ac184e6882f5c698b4a35e0e40d44 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 22 Sep 2023 15:07:03 -0700 Subject: [PATCH] CI: let's not start using --skip-oom-steps quite yet --- ci/aarch64-macos-release.sh | 1 - ci/x86_64-windows-debug.ps1 | 1 - ci/x86_64-windows-release.ps1 | 1 - test/tests.zig | 1 - 4 files changed, 4 deletions(-) diff --git a/ci/aarch64-macos-release.sh b/ci/aarch64-macos-release.sh index 9effc1535810cc030c78146a671bb8f74321c3bf..22dae5b4a22f9fc102f6769781d9bfe3c8ef705d 100755 --- a/ci/aarch64-macos-release.sh +++ b/ci/aarch64-macos-release.sh @@ -46,7 +46,6 @@ $HOME/local/bin/ninja install stage3-release/bin/zig build test docs \ --zig-lib-dir "$(pwd)/../lib" \ - --skip-oom-steps \ -Denable-macos-sdk \ -Dstatic-llvm \ -Dskip-non-native \ diff --git a/ci/x86_64-windows-debug.ps1 b/ci/x86_64-windows-debug.ps1 index 95b19e06a383fb4b9fb020ba083fdfec6ef6f6ac..1b98219de36876ca0f86373661a50a196741728e 100644 --- a/ci/x86_64-windows-debug.ps1 +++ b/ci/x86_64-windows-debug.ps1 @@ -57,7 +57,6 @@ Write-Output "Main test suite..." & "stage3-debug\bin\zig.exe" build test docs ` --zig-lib-dir "$ZIG_LIB_DIR" ` --search-prefix "$PREFIX_PATH" ` - --skip-oom-steps ` -Dstatic-llvm ` -Dskip-non-native ` -Denable-symlinks-windows diff --git a/ci/x86_64-windows-release.ps1 b/ci/x86_64-windows-release.ps1 index 87aa3e6dc021665eb40cde37fdcaecf41dba5d9b..8a3ddafb73692b589c38acca07d6f3c99b28dca9 100644 --- a/ci/x86_64-windows-release.ps1 +++ b/ci/x86_64-windows-release.ps1 @@ -57,7 +57,6 @@ Write-Output "Main test suite..." & "stage3-release\bin\zig.exe" build test docs ` --zig-lib-dir "$ZIG_LIB_DIR" ` --search-prefix "$PREFIX_PATH" ` - --skip-oom-steps ` -Dstatic-llvm ` -Dskip-non-native ` -Denable-symlinks-windows diff --git a/test/tests.zig b/test/tests.zig index 71144db036756c6c7cea40d09d286c22f080a83a..6f863bae8d97b2ecc97c104e3893fc777c8ba85f 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -1052,7 +1052,6 @@ pub fn addModuleTests(b: *std.Build, options: ModuleTestOptions) *Step { .link_libc = test_target.link_libc, .target = altered_target, .zig_lib_dir = .{ .path = "lib" }, - .max_rss = if (mem.eql(u8, options.name, "std")) 11199083316 else 0, }); compile_c.addCSourceFile(.{ .file = these_tests.getEmittedBin(), -- 2.54.0