Merge remote-tracking branch 'origin/master' into master-next

Author: bob-wilson

utils/build-script-impl

@@ -2527,10 +2527,6 @@ for host in "${ALL_HOSTS[@]}"; do
                       -DLLDB_BUILD_FRAMEWORK:BOOL=TRUE
                       -DLLDB_CODESIGN_IDENTITY=""
                     )
-                    if [[ "${ENABLE_ASAN}" ]] ; then
-                      # Limit the number of parallel tests
-                      LLVM_LIT_ARGS="${LLVM_LIT_ARGS} --threads=$(sysctl hw.physicalcpu | awk '{ print $2 }')"
-                    fi
                   fi
                 fi
                 ;;
@@ -3134,6 +3130,12 @@ for host in "${ALL_HOSTS[@]}"; do
                 # Prefer to use lldb-dotest, as building it guarantees that we build all
                 # test dependencies. Ultimately we want to delete as much lldb-specific logic
                 # from this file as possible and just have a single call to lldb-dotest.
+
+                if [[ "${ENABLE_ASAN}" ]] ; then
+                    # Limit the number of parallel tests
+                    LLVM_LIT_ARGS="${LLVM_LIT_ARGS} --threads=$(sysctl hw.physicalcpu | awk '{ print $2 }')"
+                fi
+
                 if [[ "$using_xcodebuild" == "FALSE" ]] ; then
                     with_pushd ${lldb_build_dir} \
                         call ${NINJA_BIN} unittests/LLDBUnitTests