Index: lldb/trunk/test/CMakeLists.txt
===================================================================
--- lldb/trunk/test/CMakeLists.txt
+++ lldb/trunk/test/CMakeLists.txt
@@ -137,16 +137,19 @@
 string (REPLACE ";" " " LLDB_DOTEST_ARGS_STR  "${LLDB_DOTEST_ARGS}")
 # We need this to substitute variables.
 configure_file(
-  llvm-dotest.in
-  ${CMAKE_CURRENT_BINARY_DIR}/llvm-dotest.configured
+  lldb-dotest.in
+  ${CMAKE_CURRENT_BINARY_DIR}/lldb-dotest.configured
   )
 # We need this to expand the generator expressions.
 file(GENERATE
   OUTPUT
-  $<TARGET_FILE_DIR:lldb>/llvm-dotest
+  $<TARGET_FILE_DIR:lldb>/lldb-dotest
   INPUT
-  ${CMAKE_CURRENT_BINARY_DIR}/llvm-dotest.configured
+  ${CMAKE_CURRENT_BINARY_DIR}/lldb-dotest.configured
   )
+# Make this a custom target.
+add_custom_target(lldb-dotest)
+add_dependencies(lldb-dotest ${LLDB_TEST_DEPS})
 
 # If we're building with an in-tree clang, then list clang as a dependency
 # to run tests.
Index: lldb/trunk/test/lldb-dotest.in
===================================================================
--- lldb/trunk/test/lldb-dotest.in
+++ lldb/trunk/test/lldb-dotest.in
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+import sys
+import os
+
+dotest_path = '@LLDB_SOURCE_DIR@/test/dotest.py'
+dotest_args = '@LLDB_DOTEST_ARGS_STR@'
+
+if __name__ == '__main__':
+    # FIXME: It would be nice if we can mimic the approach taken by llvm-lit
+    # and pass a python configuration straight to dotest, rather than going
+    # through the operating system.
+    command = '{} -q {} {}'.format(dotest_path, dotest_args, ' '.join(
+        sys.argv[1:]))
+    os.system(command)
Index: lldb/trunk/test/llvm-dotest.in
===================================================================
--- lldb/trunk/test/llvm-dotest.in
+++ lldb/trunk/test/llvm-dotest.in
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-import sys
-import os
-
-dotest_path = '@LLDB_SOURCE_DIR@/test/dotest.py'
-dotest_args = '@LLDB_DOTEST_ARGS_STR@'
-
-if __name__ == '__main__':
-    # FIXME: It would be nice if we can mimic the approach taken by llvm-lit
-    # and pass a python configuration straight to dotest, rather than going
-    # through the operating system.
-    command = '{} -q {} {}'.format(dotest_path, dotest_args, ' '.join(
-        sys.argv[1:]))
-    os.system(command)