Skip to content

Commit c77f6d4

Browse files
authored
Merge pull request #24626 from dcci/prtesting-cmake-51
[5.1] Switch lldb PR testing to cmake
2 parents d390299 + 38777ac commit c77f6d4

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

utils/build-presets.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ assertions
528528
test
529529
validation-test
530530

531-
llvm-targets-to-build=X86;AArch64;PowerPC
531+
llvm-targets-to-build=X86;ARM;AArch64;PowerPC
532532

533533
# Set the vendor to apple
534534
compiler-vendor=apple

utils/build-script-impl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ KNOWN_SETTINGS=(
7474
swift-stdlib-enable-assertions "1" "enable assertions in Swift"
7575
swift-stdlib-use-nonatomic-rc "0" "build the Swift stdlib and overlays with nonatomic reference count operations enabled"
7676
lldb-build-type "Debug" "the CMake build variant for LLDB"
77-
lldb-build-with-xcode "1" "Use xcodebuild to build LLDB, instead of CMake"
77+
lldb-build-with-xcode "0" "Use xcodebuild to build LLDB, instead of CMake"
7878
llbuild-build-type "Debug" "the CMake build variant for llbuild"
7979
foundation-build-type "Debug" "the build variant for Foundation"
8080
libdispatch-build-type "Debug" "the build variant for libdispatch"
@@ -3111,6 +3111,12 @@ for host in "${ALL_HOSTS[@]}"; do
31113111
LLVM_LIT_ARGS="${LLVM_LIT_ARGS} --threads=$(sysctl hw.physicalcpu | awk '{ print $2 }')"
31123112
fi
31133113

3114+
if [[ "$(true_false ${LLDB_TEST_SWIFT_ONLY})" == "TRUE" ]]; then
3115+
LLVM_LIT_ARGS="${LLVM_LIT_ARGS} --filter=[sS]wift"
3116+
fi
3117+
3118+
# Record the times test took and report the slowest.
3119+
LLVM_LIT_ARGS="${LLVM_LIT_ARGS} -v --time-tests"
31143120
if [[ "$using_xcodebuild" == "FALSE" ]] ; then
31153121
with_pushd ${lldb_build_dir} \
31163122
call ${NINJA_BIN} unittests/LLDBUnitTests

utils/build_swift/driver_arguments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def _apply_default_arguments(args):
7777
args.lldb_build_variant = args.build_variant
7878

7979
if args.lldb_build_with_xcode is None:
80-
args.lldb_build_with_xcode = '1'
80+
args.lldb_build_with_xcode = '0'
8181

8282
if args.foundation_build_variant is None:
8383
args.foundation_build_variant = args.build_variant

utils/build_swift/tests/expected_options.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
'llbuild_assertions': True,
152152
'lldb_assertions': True,
153153
'lldb_build_variant': 'Debug',
154-
'lldb_build_with_xcode': '1',
154+
'lldb_build_with_xcode': '0',
155155
'llvm_assertions': True,
156156
'llvm_build_variant': 'Debug',
157157
'llvm_max_parallel_lto_link_jobs':

0 commit comments

Comments
 (0)