---

yaml
---
r: 349530
b: refs/heads/master-next
c: ed30b9f
h: refs/heads/master

Author: JDevlieghere

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: b4977801b812a81f36c0b6cfecb519f187f8f814
+refs/heads/master-next: ed30b9f2477018676e68afd486291be42d0ef4ec
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/utils/build-script-impl

@@ -2464,14 +2464,6 @@ for host in "${ALL_HOSTS[@]}"; do
                   cmake_cache="Apple-lldb-Linux.cmake"
                 fi
 
-                # Watchpoint testing is currently disabled: see rdar://38566150.
-                LLDB_TEST_CATEGORIES="--skip-category=watchpoint"
-
-                # Skip DWO to speed up swift testing.
-                if [[ "$(true_false ${LLDB_TEST_SWIFT_ONLY})" == "TRUE" ]]; then
-                    LLDB_TEST_CATEGORIES="${LLDB_TEST_CATEGORIES} --skip-category=dwo"
-                fi
-
                 # Options to find the just-built libddispatch and Foundation.
                 if [[ "$(uname -s)" == "Darwin" || "${SKIP_BUILD_FOUNDATION}" ]] ; then
                     DOTEST_EXTRA=""
@@ -2491,11 +2483,21 @@ for host in "${ALL_HOSTS[@]}"; do
                     DOTEST_EXTRA="${DOTEST_EXTRA} -Xlinker -rpath -Xlinker ${FOUNDATION_BUILD_DIR}"
                 fi
 
-                # Construct dotest arguments.
-                DOTEST_ARGS="--build-dir ${lldb_build_dir}/lldb-test-build.noindex \
-                             ${LLDB_TEST_CATEGORIES} \
-                             -t \
-                             -E \"${DOTEST_EXTRA}\""
+                # Watchpoint testing is currently disabled: see rdar://38566150.
+                LLDB_TEST_CATEGORIES="--skip-category=watchpoint"
+
+                # Skip DWO to speed up swift testing.
+                if [[ "$(true_false ${LLDB_TEST_SWIFT_ONLY})" == "TRUE" ]]; then
+                    LLDB_TEST_CATEGORIES="${LLDB_TEST_CATEGORIES};--skip-category=dwo"
+                fi
+
+                # Construct dotest arguments. We use semicolons so CMake interprets this as a list.
+                DOTEST_ARGS="--build-dir;${lldb_build_dir}/lldb-test-build.noindex;${LLDB_TEST_CATEGORIES};-t"
+
+                # Only set the extra arguments if they're not empty.
+                if [[ -z "${results_targets[@]}" ]]; then
+                    DOTEST_ARGS="${DOTEST_ARGS};-E;\"${DOTEST_EXTRA}\""
+                fi
 
                 cmake_options=(
                     "${cmake_options[@]}"