Skip to content

Commit 6622761

Browse files
committed
[toolchain-stdlib-build] Make sure to run only tests under stdlib/ and add rel-debuginfo/debug versions.
1 parent e9d4687 commit 6622761

File tree

1 file changed

+50
-7
lines changed

1 file changed

+50
-7
lines changed

utils/build-presets.ini

Lines changed: 50 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2031,10 +2031,7 @@ mixin-preset=buildbot_linux
20312031
# Standalone Stdlib
20322032
#===------------------------------------------------------------------------===#
20332033

2034-
[preset: stdlib_RA,standalone,notest]
2035-
release
2036-
assertions
2037-
2034+
[preset: stdlib_base_standalone]
20382035
# We do not want to build llvm, cmark, or benchmarks. We will still build a
20392036
# small part of llvm and configure both llvm/cmark.
20402037
skip-build-llvm
@@ -2051,9 +2048,55 @@ native-swift-tools-path=%(toolchain_path)s
20512048
native-llvm-tools-path=%(toolchain_path)s
20522049
native-clang-tools-path=%(toolchain_path)s
20532050

2054-
[preset: stdlib_RA,standalone]
2055-
mixin-preset=stdlib_RA,standalone,notest
2051+
build-ninja
2052+
2053+
[preset: stdlib_RA_standalone,build]
2054+
mixin-preset=stdlib_base_standalone
2055+
2056+
build-subdir=stdlib_RA_standalone
2057+
release
2058+
assertions
2059+
2060+
reconfigure
2061+
verbose-build
2062+
2063+
[preset: stdlib_RA_standalone,build,test]
2064+
mixin-preset=stdlib_RA_standalone,build
2065+
2066+
test
2067+
validation-test
2068+
lit-args=-v --filter=stdlib/
2069+
2070+
[preset: stdlib_RDA_standalone,build]
2071+
mixin-preset=stdlib_base_standalone
2072+
2073+
build-subdir=stdlib_RDA_standalone
2074+
release-debuginfo
2075+
assertions
2076+
2077+
reconfigure
2078+
verbose-build
2079+
2080+
[preset: stdlib_RDA_standalone,build,test]
2081+
mixin-preset=stdlib_RDA_standalone,build
2082+
2083+
test
2084+
validation-test
2085+
lit-args=-v --filter=stdlib/
2086+
2087+
[preset: stdlib_DA_standalone,build]
2088+
mixin-preset=stdlib_base_standalone
2089+
2090+
build-subdir=stdlib_DA_standalone
2091+
debug
2092+
assertions
2093+
2094+
reconfigure
2095+
verbose-build
2096+
2097+
[preset: stdlib_DA_standalone,build,test]
2098+
mixin-preset=stdlib_DA_standalone,build
20562099

20572100
test
20582101
validation-test
2059-
only-executable-test
2102+
lit-args=-v --filter=stdlib/

0 commit comments

Comments
 (0)