Skip to content

Commit cf6bb76

Browse files
committed
[build-script] Use lldb-dotest when testing lldb on Linux
... and pass the build directory explicitly, so the bot knows where to look to package up test results.
1 parent ca6be13 commit cf6bb76

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

utils/build-script-impl

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2744,9 +2744,15 @@ for host in "${ALL_HOSTS[@]}"; do
27442744
fi
27452745
lldb_build_dir=$(build_directory ${host} lldb)
27462746

2747+
using_xcodebuild="FALSE"
2748+
if [[ "$(uname -s)" == "Darwin" && "$(true_false ${LLDB_BUILD_WITH_XCODE})" == "TRUE" ]] ; then
2749+
using_xcodebuild="TRUE"
2750+
fi
2751+
2752+
27472753
# Run the unittests.
27482754
# FIXME: The xcode build project currently doesn't know how to run the lit style tests.
2749-
if [[ "$(uname -s)" == "Darwin" && "$(true_false ${LLDB_BUILD_WITH_XCODE})" == "TRUE" ]] ; then
2755+
if [[ "$using_xcodebuild" == "TRUE" ]] ; then
27502756
set_lldb_xcodebuild_options
27512757
# Run the LLDB unittests (gtests).
27522758
with_pushd ${LLDB_SOURCE_DIR} \
@@ -2763,7 +2769,7 @@ for host in "${ALL_HOSTS[@]}"; do
27632769

27642770
swift_build_dir=$(build_directory ${host} swift)
27652771
# Setup lldb executable path
2766-
if [[ "$(uname -s)" == "Darwin" && "$(true_false ${LLDB_BUILD_WITH_XCODE})" == "TRUE" ]] ; then
2772+
if [[ "$using_xcodebuild" == "TRUE" ]] ; then
27672773
lldb_executable="${lldb_build_dir}"/${LLDB_BUILD_MODE}/lldb
27682774
else
27692775
lldb_executable="${lldb_build_dir}"/bin/lldb
@@ -2842,7 +2848,7 @@ for host in "${ALL_HOSTS[@]}"; do
28422848
if [[ ! -z "${DOTEST_EXTRA}" ]] ; then
28432849
dotest_extra_args="-E ${DOTEST_EXTRA}"
28442850
fi
2845-
if [[ "$(true_false ${LLDB_BUILD_WITH_XCODE})" == "FALSE" ]] ; then
2851+
if [[ "$using_xcodebuild" == "FALSE" ]] ; then
28462852
with_pushd ${lldb_build_dir} \
28472853
${NINJA_BIN} lldb-dotest
28482854

@@ -2854,6 +2860,7 @@ for host in "${ALL_HOSTS[@]}"; do
28542860
${LLDB_TEST_SUBDIR_CLAUSE} \
28552861
${LLDB_TEST_CATEGORIES} \
28562862
${LLDB_FORMATTER_OPTS} \
2863+
--build-dir "${lldb_build_dir}/lldb-test-build.noindex" \
28572864
${dotest_extra_args}
28582865
else
28592866
with_pushd "${results_dir}" \

0 commit comments

Comments
 (0)