Index: test/CMakeLists.txt
===================================================================
--- test/CMakeLists.txt
+++ test/CMakeLists.txt
@@ -11,15 +11,10 @@
     )
 endfunction()
 
-string(REGEX REPLACE ".*ccache\ +" "" LLDB_TEST_COMPILER ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1})
+string(REGEX REPLACE ".*ccache\ +" "" LLDB_TEST_COMPILER \"${CMAKE_C_COMPILER}\" ${CMAKE_C_COMPILER_ARG1})
 
 # Users can override LLDB_TEST_ARGS to modify the way LLDB tests are run. See help below.
-set(LLDB_TEST_ARGS
-  -C
-  ${LLDB_TEST_COMPILER}
-  CACHE STRING "Specify compiler(s) and architecture(s) with which run LLDB tests. For example: '-C gcc -C clang -A i386 -A x86_64'"
-  )
-string(REPLACE " " ";" LLDB_TEST_ARGS ${LLDB_TEST_ARGS})
+STRING(REGEX REPLACE "\"" "\\\\\"" LLDB_TEST_ARGS "-C;${LLDB_TEST_COMPILER}")
 
 set(LLDB_TRACE_DIR "${CMAKE_BINARY_DIR}/lldb-test-traces"
   CACHE STRING "Set directory to output LLDB test traces (for tests that do not pass.)"