From a4ec2fcff966d56e7a428cbfb37a615a55fa9808 Mon Sep 17 00:00:00 2001
From: Todd Fiala <todd.fiala@gmail.com>
Date: Mon, 2 Jun 2014 17:49:35 +0000
Subject: [PATCH] Add executable extension to debugger name, run dotest via
 binary.

See http://reviews.llvm.org/D3904 for details.

Change by Scott Graham.

llvm-svn: 210036
---
 lldb/test/CMakeLists.txt | 2 +-
 lldb/test/dosep.ty       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt
index 1c5afb5..c1eab92 100644
--- a/lldb/test/CMakeLists.txt
+++ b/lldb/test/CMakeLists.txt
@@ -27,7 +27,7 @@ set(LLDB_TRACE_DIR "${CMAKE_BINARY_DIR}/lldb-test-traces"
 
 set(LLDB_COMMON_TEST_ARGS
   --executable
-  ${CMAKE_BINARY_DIR}/bin/lldb
+  ${CMAKE_BINARY_DIR}/bin/lldb${CMAKE_EXECUTABLE_SUFFIX}
   -s
   ${LLDB_TRACE_DIR}
   -u CXXFLAGS
diff --git a/lldb/test/dosep.ty b/lldb/test/dosep.ty
index 944da41..0a7976f 100755
--- a/lldb/test/dosep.ty
+++ b/lldb/test/dosep.ty
@@ -11,7 +11,7 @@ import multiprocessing
 from optparse import OptionParser
 
 # Command template of the invocation of the test driver.
-template = '%s/dotest.py %s -p %s %s'
+template = '%s %s/dotest.py %s -p %s %s'
 
 def process_dir(root, files, test_root, dotest_options):
     """Examine a directory for tests, and invoke any found within it."""
@@ -28,7 +28,7 @@ def process_dir(root, files, test_root, dotest_options):
         if os.path.islink(path):
             continue
 
-        command = template % (test_root, dotest_options if dotest_options else "", name, root)
+        command = template % (sys.executable, test_root, dotest_options if dotest_options else "", name, root)
         if 0 != os.system(command):
             failed.append(name)
         else:
-- 
2.7.4