Skip to content

Commit d2862dd

Browse files
committed
[build-script] Factor out and reuse the lldb smoketest logic
1 parent 2707fef commit d2862dd

File tree

1 file changed

+20
-12
lines changed

1 file changed

+20
-12
lines changed

utils/build-presets.ini

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,20 @@ build-subdir=Ninja-ReleaseAssert+stdlib-RelWithDebInfo+sil-ownership
280280
enable-sil-ownership
281281
dash-dash
282282

283+
# This is a mixin preset which builds and smoke-tests lldb.
284+
[preset: lldb-smoketest,tools=RA]
285+
# Build LLDB
286+
lldb
287+
288+
dash-dash
289+
290+
# Use the system debugserver to run the lldb swift tests
291+
lldb-no-debugserver
292+
lldb-use-system-debugserver
293+
lldb-build-type=Release
294+
lldb-test-swift-only
295+
lldb-assertions
296+
283297
#===------------------------------------------------------------------------===#
284298
# Incremental buildbots for Darwin OSes
285299
#===------------------------------------------------------------------------===#
@@ -500,7 +514,9 @@ swift-stdlib-build-type=RelWithDebInfo
500514

501515

502516
[preset: buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx]
503-
mixin-preset=buildbot_incremental_base
517+
mixin-preset=
518+
buildbot_incremental_base
519+
lldb-smoketest,tools=RA
504520
build-subdir=buildbot_incremental
505521

506522
# We build release+asserts.
@@ -516,9 +532,6 @@ llvm-targets-to-build=X86
516532
# Set the vendor to apple
517533
compiler-vendor=apple
518534

519-
# Build LLDB
520-
lldb
521-
522535
dash-dash
523536

524537
# Always reconfigure cmake
@@ -548,13 +561,6 @@ stdlib-deployment-targets=macosx-x86_64
548561
swift-primary-variant-sdk=OSX
549562
swift-primary-variant-arch=x86_64
550563

551-
# Use the system debugserver to run the lldb swift tests
552-
lldb-no-debugserver
553-
lldb-use-system-debugserver
554-
lldb-build-type=Release
555-
lldb-test-swift-only
556-
lldb-assertions
557-
558564
# Don't build the benchmarks
559565
skip-build-benchmarks
560566

@@ -1127,7 +1133,9 @@ build-swift-static-sdk-overlay
11271133
#===------------------------------------------------------------------------===#
11281134

11291135
[preset: buildbot_all_platforms,tools=RA,stdlib=RA]
1130-
mixin-preset=buildbot_incremental_base_all_platforms
1136+
mixin-preset=
1137+
buildbot_incremental_base_all_platforms
1138+
lldb-smoketest,tools=RA
11311139

11321140
build-subdir=buildbot_incremental
11331141

0 commit comments

Comments
 (0)