---

yaml
---
r: 348647
b: refs/heads/master
c: 3f669d1
h: refs/heads/master
i:
  348645: 8738ab6
  348643: c2257f7
  348639: 958e277

Author: JDevlieghere

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f08ec432ccc2a431be1163639bb23ad3d2ba6f93
+refs/heads/master: 3f669d1b868563f87decd32758c029160c9b7d62
 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

@@ -2495,8 +2495,8 @@ for host in "${ALL_HOSTS[@]}"; do
                 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}\\\""
+                if [[ -n "${DOTEST_EXTRA}" ]]; then
+                    DOTEST_ARGS="${DOTEST_ARGS};-E;${DOTEST_EXTRA}"
                 fi
 
                 cmake_options=(