Skip to content

Commit d07ff7f

Browse files
authored
Merge pull request #5451 from tfiala/lldb-test-swift-only
add --lldb-test-swift-only flag to build script
2 parents 33d64db + 871668b commit d07ff7f

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

utils/build-script-impl

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ KNOWN_SETTINGS=(
5454
lldb-extra-xcodebuild-args "" "extra command line args to pass to lldb xcodebuild"
5555
lldb-test-cc "" "CC to use for building LLDB testsuite test inferiors. Defaults to just-built, in-tree clang. If set to 'host-toolchain', sets it to same as host-cc."
5656
lldb-test-with-curses "" "run test lldb test runner using curses terminal control"
57+
lldb-test-swift-only "" "when running lldb tests, only include Swift-specific tests"
5758
lldb-no-debugserver "" "delete debugserver after building it, and don't try to codesign it"
5859
lldb-use-system-debugserver "" "don't try to codesign debugserver, and use the system's debugserver instead"
5960
llvm-build-type "Debug" "the CMake build variant for LLVM and Clang (Debug, RelWithDebInfo, Release, MinSizeRel). Defaults to Debug."
@@ -2628,6 +2629,13 @@ for host in "${ALL_HOSTS[@]}"; do
26282629
fi
26292630
fi
26302631

2632+
# Handle test subdirectory clause
2633+
if [[ "${LLDB_TEST_SWIFT_ONLY}" ]]; then
2634+
LLDB_TEST_SUBDIR_CLAUSE="--test-subdir lang/swift"
2635+
else
2636+
LLDB_TEST_SUBDIR_CLAUSE=""
2637+
fi
2638+
26312639
# figure out which C/C++ compiler we should use for building test inferiors.
26322640
if [[ "${LLDB_TEST_CC}" == "host-toolchain" ]]; then
26332641
# Use the host toolchain: i.e. the toolchain specified by HOST_CC
@@ -2642,7 +2650,14 @@ for host in "${ALL_HOSTS[@]}"; do
26422650

26432651
call mkdir -p "${results_dir}"
26442652
with_pushd "${results_dir}" \
2645-
call env SWIFTCC="$(build_directory $LOCAL_HOST swift)/bin/swiftc" SWIFTLIBS="${swift_build_dir}/lib/swift" "${LLDB_SOURCE_DIR}"/test/dotest.py --executable "${lldb_executable}" --rerun-all-issues ${LLDB_DOTEST_CC_OPTS} ${LLDB_FORMATTER_OPTS}
2653+
call env SWIFTCC="$(build_directory $LOCAL_HOST swift)/bin/swiftc" \
2654+
SWIFTLIBS="${swift_build_dir}/lib/swift" \
2655+
"${LLDB_SOURCE_DIR}"/test/dotest.py \
2656+
--executable "${lldb_executable}" \
2657+
--rerun-all-issues \
2658+
${LLDB_TEST_SUBDIR_CLAUSE} \
2659+
${LLDB_DOTEST_CC_OPTS} \
2660+
${LLDB_FORMATTER_OPTS}
26462661
continue
26472662
;;
26482663
llbuild)

0 commit comments

Comments
 (0)