[Lldb-commits] [lldb] r210036 - Add executable extension to debugger name, run dotest via binary.

[Todd Fiala]

Author: tfiala
Date: Mon Jun  2 12:49:35 2014
New Revision: 210036

URL: http://llvm.org/viewvc/llvm-project?rev=210036&view=rev
Log:
Add executable extension to debugger name, run dotest via binary.

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

Change by Scott Graham.


Modified:
    lldb/trunk/test/CMakeLists.txt
    lldb/trunk/test/dosep.ty

Modified: lldb/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/CMakeLists.txt?rev=210036&r1=210035&r2=210036&view=diff
==============================================================================
--- lldb/trunk/test/CMakeLists.txt (original)
+++ lldb/trunk/test/CMakeLists.txt Mon Jun  2 12:49:35 2014
@@ -27,7 +27,7 @@ set(LLDB_TRACE_DIR "${CMAKE_BINARY_DIR}/
 
 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

Modified: lldb/trunk/test/dosep.ty
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dosep.ty?rev=210036&r1=210035&r2=210036&view=diff
==============================================================================
--- lldb/trunk/test/dosep.ty (original)
+++ lldb/trunk/test/dosep.ty Mon Jun  2 12:49:35 2014
@@ -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,
         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: