@@ -2744,9 +2744,15 @@ for host in "${ALL_HOSTS[@]}"; do
2744
2744
fi
2745
2745
lldb_build_dir=$( build_directory ${host} lldb)
2746
2746
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
+
2747
2753
# Run the unittests.
2748
2754
# 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
2750
2756
set_lldb_xcodebuild_options
2751
2757
# Run the LLDB unittests (gtests).
2752
2758
with_pushd ${LLDB_SOURCE_DIR} \
@@ -2763,7 +2769,7 @@ for host in "${ALL_HOSTS[@]}"; do
2763
2769
2764
2770
swift_build_dir=$( build_directory ${host} swift)
2765
2771
# Setup lldb executable path
2766
- if [[ " $( uname -s ) " == " Darwin " && " $( true_false ${LLDB_BUILD_WITH_XCODE} ) " == " TRUE" ]] ; then
2772
+ if [[ " $using_xcodebuild " == " TRUE" ]] ; then
2767
2773
lldb_executable=" ${lldb_build_dir} " /${LLDB_BUILD_MODE} /lldb
2768
2774
else
2769
2775
lldb_executable=" ${lldb_build_dir} " /bin/lldb
@@ -2842,7 +2848,7 @@ for host in "${ALL_HOSTS[@]}"; do
2842
2848
if [[ ! -z " ${DOTEST_EXTRA} " ]] ; then
2843
2849
dotest_extra_args=" -E ${DOTEST_EXTRA} "
2844
2850
fi
2845
- if [[ " $( true_false ${LLDB_BUILD_WITH_XCODE} ) " == " FALSE" ]] ; then
2851
+ if [[ " $using_xcodebuild " == " FALSE" ]] ; then
2846
2852
with_pushd ${lldb_build_dir} \
2847
2853
${NINJA_BIN} lldb-dotest
2848
2854
@@ -2854,6 +2860,7 @@ for host in "${ALL_HOSTS[@]}"; do
2854
2860
${LLDB_TEST_SUBDIR_CLAUSE} \
2855
2861
${LLDB_TEST_CATEGORIES} \
2856
2862
${LLDB_FORMATTER_OPTS} \
2863
+ --build-dir " ${lldb_build_dir} /lldb-test-build.noindex" \
2857
2864
${dotest_extra_args}
2858
2865
else
2859
2866
with_pushd " ${results_dir} " \
0 commit comments