---

yaml
---
r: 344287
b: refs/heads/master-rebranch
c: 3f669d1
h: refs/heads/master
i:
  344285: 02a0527
  344283: 65b2bbe
  344279: ecbc153
  344271: b647dcd
  344255: cb65fda

Author: JDevlieghere

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: f08ec432ccc2a431be1163639bb23ad3d2ba6f93
+refs/heads/master-rebranch: 3f669d1b868563f87decd32758c029160c9b7d62
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/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=(