Skip to content

Commit ada75dc

Browse files
Merge pull request #21843 from adrian-prantl/lldb-syntax
Fix more shell syntax errors in the LLDB asan configuration
2 parents 167f94f + 622753d commit ada75dc

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

utils/build-script-impl

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2529,9 +2529,7 @@ for host in "${ALL_HOSTS[@]}"; do
25292529

25302530
if [[ "${ENABLE_ASAN}" ]] ; then
25312531
# Limit the number of parallel tests.
2532-
LLVM_LIT_ARGS+=(
2533-
"--threads=$(sysctl hw.physicalcpu | cut -d : -f 2)"
2534-
)
2532+
LLVM_LIT_ARGS="${LLVM_LIT_ARGS} --threads=$(sysctl hw.physicalcpu | awk '{print $2}')"
25352533
fi
25362534
fi
25372535
;;
@@ -3142,7 +3140,7 @@ for host in "${ALL_HOSTS[@]}"; do
31423140
call ${NINJA_BIN} unittests/LLDBUnitTests
31433141
with_pushd ${results_dir} \
31443142
call "${llvm_build_dir}/bin/llvm-lit" \
3145-
"${lldb_build_dir}/lit" -sv \
3143+
"${lldb_build_dir}/lit" \
31463144
${LLVM_LIT_ARGS} \
31473145
--xunit-xml-output=${results_dir}/results.xml \
31483146
--param dotest-args="--build-dir ${lldb_build_dir}/lldb-test-build.noindex ${LLDB_TEST_SUBDIR_CLAUSE} ${LLDB_TEST_CATEGORIES} -t -E \"${DOTEST_EXTRA}\""
@@ -3151,7 +3149,7 @@ for host in "${ALL_HOSTS[@]}"; do
31513149
"${LLDB_TEST_SWIFT_COMPATIBILITY}"
31523150
with_pushd ${results_dir} \
31533151
call "${llvm_build_dir}/bin/llvm-lit" \
3154-
"${lldb_build_dir}/lit" -sv \
3152+
"${lldb_build_dir}/lit" \
31553153
${LLVM_LIT_ARGS} \
31563154
--xunit-xml-output=${results_dir}/results.xml \
31573155
--param dotest-args="--build-dir ${lldb_build_dir}/lldb-test-build.noindex ${LLDB_TEST_SUBDIR_CLAUSE} ${LLDB_TEST_CATEGORIES} -G swift-history --swift-compiler \"${LLDB_TEST_SWIFT_COMPATIBILITY}\" -t -E \"${DOTEST_EXTRA}\""

0 commit comments

Comments
 (0)