Skip to content

Commit d491f00

Browse files
authored
Merge pull request #41665 from apple/add-no-assertions-linux-preset
Add no-assertions preset for Linux
2 parents d680dec + f20ca16 commit d491f00

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

test/AutoDiff/validation-test/differentiable_protocol_requirements.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %target-run-simple-swift
22
// REQUIRES: executable_test
3-
3+
// REQUIRES: rdar89860761
44
// Disabled due to test failure with `-O`: SR-13250.
55
// SR-13250 is tracking the fix for compiling this test with optimizations.
66
// XFAIL: swift_test_mode_optimize

utils/build-presets.ini

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,6 @@ llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-h
812812

813813
[preset: mixin_linux_installation]
814814
mixin-preset=
815-
mixin_lightweight_assertions,no-stdlib-asserts
816815
mixin_linux_install_components_with_clang
817816

818817
llbuild
@@ -861,8 +860,9 @@ installable-package=%(installable_package)s
861860
relocate-xdg-cache-home-under-build-subdir
862861

863862

864-
[preset: buildbot_linux]
865-
mixin-preset=mixin_linux_installation
863+
[preset: buildbot_linux_base]
864+
mixin-preset=
865+
mixin_linux_installation
866866
build-subdir=buildbot_linux
867867
lldb
868868
release
@@ -885,6 +885,17 @@ install-foundation
885885
install-libdispatch
886886
reconfigure
887887

888+
[preset: buildbot_linux]
889+
mixin-preset=
890+
mixin_lightweight_assertions,no-stdlib-asserts
891+
buildbot_linux_base
892+
893+
[preset: buildbot_linux,no_assertions]
894+
mixin-preset=buildbot_linux_base
895+
896+
no-assertions
897+
898+
888899
[preset: mixin_buildbot_linux,no_test]
889900
skip-test-cmark
890901
skip-test-lldb
@@ -999,7 +1010,9 @@ mixin-preset=
9991010
mixin_buildbot_linux,no_test
10001011

10011012
[preset: buildbot_linux,smoketest]
1002-
mixin-preset=mixin_linux_installation
1013+
mixin-preset=
1014+
mixin_lightweight_assertions,no-stdlib-asserts
1015+
mixin_linux_installation
10031016
build-subdir=buildbot_linux
10041017
lldb
10051018
release

0 commit comments

Comments
 (0)