Commit 821e260

authored

Merge pull request swiftlang#66880 from Michael137/bugfix/build-script-configure-lldb-tests

[Build] Introduce --lldb-configure-tests option

2 parents e9ff334 + 511c344 commit 821e260Copy full SHA for 821e260

File tree

-1

lines changed

-1

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1416,6 +1416,10 @@ mixin-preset=`
`1416`	`1416`	`skip-test-lldb`
`1417`	`1417`	`skip-test-playgroundsupport`
`1418`	`1418`
	`1419`	`+# Don't configure LLDB tests either since that`
	`1420`	`+# would require us to build libcxx (rdar://109774179)`
	`1421`	`+lldb-configure-tests=0`
	`1422`	`+`
`1419`	`1423`	`[preset: buildbot_osx_package,use_os_runtime]`
`1420`	`1424`	`mixin-preset=`
`1421`	`1425`	`buildbot_osx_package`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ KNOWN_SETTINGS=(`
`174`	`174`	`lldb-test-swift-compatibility "" "specify additional Swift compilers to test lldb with"`
`175`	`175`	`lldb-test-swift-only "0" "when running lldb tests, only include Swift-specific tests"`
`176`	`176`	`lldb-use-system-debugserver "" "don't try to codesign debugserver, and use the system's debugserver instead"`
	`177`	`+ lldb-configure-tests "1" "if set, will make sure we configure LLDB's test target without running the tests"`
`177`	`178`
`178`	`179`	`## LLVM Options`
`179`	`180`	`llvm-enable-lto "" "Must be set to one of 'thin' or 'full'"`
`@@ -2197,7 +2198,7 @@ for host in "${ALL_HOSTS[@]}"; do`
`2197`	`2198`	`DOTEST_ARGS="${DOTEST_ARGS};-E;${DOTEST_EXTRA}"`
`2198`	`2199`	`fi`
`2199`	`2200`
`2200`		`- if [[ "${SKIP_TEST_LLDB}" ]]; then`
	`2201`	`+ if [[ $(true_false "${LLDB_CONFIGURE_TESTS}")=="FALSE" ]]; then`
`2201`	`2202`	`should_configure_tests="FALSE"`
`2202`	`2203`	`else`
`2203`	`2204`	`should_configure_tests=$(false_true ${BUILD_TOOLCHAIN_ONLY})`

Comments

(0)