---

yaml
---
r: 346854
b: refs/heads/master
c: d0786b8
h: refs/heads/master

Author: bob-wilson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5e0427a9b526713753b798a22cad42ec0467eb8f
+refs/heads/master: d0786b835943f32e2e46581b3e48cb0155199119
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/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