Skip to content

Commit fe84e61

Browse files
Merge pull request #71555 from adrian-prantl/explicit-filter
Explicitly pass LLDB test config, so it can be picked up by the filte…
2 parents 8a7fd33 + acc9100 commit fe84e61

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

utils/build-script-impl

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2805,31 +2805,32 @@ for host in "${ALL_HOSTS[@]}"; do
28052805
echo "--- Running LLDB unit tests ---"
28062806
with_pushd ${lldb_build_dir} \
28072807
call ${NINJA_BIN} -j ${BUILD_JOBS} unittests/LLDBUnitTests
2808-
echo "--- Running LLDB tests (Swift Config: Classic/ClangImporter) ---"
2808+
echo "--- Running LLDB tests (Swift Config: Precise/ClangImporter) ---"
28092809
with_pushd ${lldb_build_dir} \
28102810
call ${NINJA_BIN} -j ${BUILD_JOBS} lldb-test-deps
28112811
with_pushd ${results_dir} \
28122812
call "${llvm_build_dir}/bin/llvm-lit" \
28132813
"${lldb_build_dir}/test" \
2814-
${LLVM_LIT_ARGS} ${LLVM_LIT_FILTER_ARG}
2815-
echo "--- Rerun LLDB Swift API tests (Swift Config: Classic/DWARFImporter) ---"
2814+
${LLVM_LIT_ARGS} ${LLVM_LIT_FILTER_ARG} \
2815+
--param dotest-args="--setting symbols.use-swift-clangimporter=true --setting symbols.swift-precise-compiler-invocation=true"
2816+
echo "--- Rerun LLDB Swift API tests (Swift Config: Precise/DWARFImporter) ---"
28162817
with_pushd ${results_dir} \
28172818
call "${llvm_build_dir}/bin/llvm-lit" \
28182819
"${lldb_build_dir}/test" \
28192820
${LLVM_LIT_ARGS} ${FILTER_SWIFT_API_OPTION} \
2820-
--param dotest-args="--setting symbols.use-swift-clangimporter=false"
2821-
echo "--- Rerun LLDB Swift API tests (Swift Config: Precise/ClangImporter) ---"
2821+
--param dotest-args="--setting symbols.use-swift-clangimporter=false --setting symbols.swift-precise-compiler-invocation=true"
2822+
echo "--- Rerun LLDB Swift API tests (Swift Config: Classic/ClangImporter) ---"
28222823
with_pushd ${results_dir} \
28232824
call "${llvm_build_dir}/bin/llvm-lit" \
28242825
"${lldb_build_dir}/test" \
28252826
${LLVM_LIT_ARGS} ${FILTER_SWIFT_API_OPTION} \
2826-
--param dotest-args="--setting symbols.use-swift-clangimporter=true --setting symbols.swift-precise-compiler-invocation=true"
2827-
echo "--- Rerun LLDB Swift API tests (Swift Config: Precise/DWARFImporter) ---"
2827+
--param dotest-args="--setting symbols.use-swift-clangimporter=true --setting symbols.swift-precise-compiler-invocation=false"
2828+
echo "--- Rerun LLDB Swift API tests (Swift Config: Classic/DWARFImporter) ---"
28282829
with_pushd ${results_dir} \
28292830
call "${llvm_build_dir}/bin/llvm-lit" \
28302831
"${lldb_build_dir}/test" \
28312832
${LLVM_LIT_ARGS} ${FILTER_SWIFT_API_OPTION} \
2832-
--param dotest-args="--setting symbols.use-swift-clangimporter=false --setting symbols.swift-precise-compiler-invocation=true"
2833+
--param dotest-args="--setting symbols.use-swift-clangimporter=false --setting symbols.swift-precise-compiler-invocation=false"
28332834

28342835
if [[ -x "${LLDB_TEST_SWIFT_COMPATIBILITY}" ]] ; then
28352836
echo "Running LLDB swift compatibility tests against" \

0 commit comments

Comments
 (0)