[Lldb-commits] [lldb] r167250 - /lldb/trunk/test/dotest.py

[Sean Callanan]

Author: spyffe
Date: Thu Nov  1 16:23:21 2012
New Revision: 167250

URL: http://llvm.org/viewvc/llvm-project?rev=167250&view=rev
Log:
Fixes to make the test suite work better when
explicitly pointed at an LLDB framework and
executable.

Modified:
    lldb/trunk/test/dotest.py

Modified: lldb/trunk/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest.py?rev=167250&r1=167249&r2=167250&view=diff
==============================================================================
--- lldb/trunk/test/dotest.py (original)
+++ lldb/trunk/test/dotest.py Thu Nov  1 16:23:21 2012
@@ -749,6 +749,7 @@
     if lldbExecutablePath:
         if is_exe(lldbExecutablePath):
             lldbExec = lldbExecutablePath
+            lldbHere = lldbExec
         else:
             print lldbExecutablePath + " is not an executable"
             sys.exit(-1)
@@ -790,20 +791,19 @@
             lldbHere = baiExec2
         elif lldbExec:
             lldbHere = lldbExec
-    
-        if lldbHere:
-            os.environ["LLDB_HERE"] = lldbHere
-            os.environ["LLDB_BUILD_DIR"] = os.path.split(lldbHere)[0]
-            if not noHeaders:
-                print "LLDB build dir:", os.environ["LLDB_BUILD_DIR"]
-                os.system('%s -v' % lldbHere)
-    
+
         # One last chance to locate the 'lldb' executable.
         if not lldbExec:
             lldbExec = which('lldb')
             if lldbHere and not lldbExec:
                 lldbExec = lldbHere
-
+    
+    if lldbHere:
+        os.environ["LLDB_HERE"] = lldbHere
+        os.environ["LLDB_BUILD_DIR"] = os.path.split(lldbHere)[0]
+        if not noHeaders:
+            print "LLDB build dir:", os.environ["LLDB_BUILD_DIR"]
+            os.system('%s -v' % lldbHere)
 
     if not lldbExec:
         print "The 'lldb' executable cannot be located.  Some of the tests may not be run as a result."