[Lldb-commits] [lldb] r143394 - in /lldb/trunk/test: Makefile dotest.py

[Daniel Dunbar]

Author: ddunbar
Date: Mon Oct 31 18:27:06 2011
New Revision: 143394

URL: http://llvm.org/viewvc/llvm-project?rev=143394&view=rev
Log:
tests: Improve Makefile/dotest to properly set LLDB_HERE variable used in some
tests.

Modified:
    lldb/trunk/test/Makefile
    lldb/trunk/test/dotest.py

Modified: lldb/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/Makefile?rev=143394&r1=143393&r2=143394&view=diff
==============================================================================
--- lldb/trunk/test/Makefile (original)
+++ lldb/trunk/test/Makefile Mon Oct 31 18:27:06 2011
@@ -32,5 +32,6 @@
 	rm -rf ../test-rdir
 	env PATH="$(ToolDir):$(PATH)" \
 	    PYTHONPATH=$(ToolDir) \
+	    LLDB_EXEC=$(ToolDir)/lldb \
 	    $(SHLIBPATH_VAR)=$(LibDir):$($(SHLIBPATH_VAR)) \
 	     python $(PROJ_SRC_DIR)/dotest.py -i -v -r ../test-rdir

Modified: lldb/trunk/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest.py?rev=143394&r1=143393&r2=143394&view=diff
==============================================================================
--- lldb/trunk/test/dotest.py (original)
+++ lldb/trunk/test/dotest.py Mon Oct 31 18:27:06 2011
@@ -663,6 +663,8 @@
         lldbHere = baiExec
     elif is_exe(baiExec2):
         lldbHere = baiExec2
+    elif lldbExec:
+        lldbHere = lldbExec
 
     if lldbHere:
         os.environ["LLDB_HERE"] = lldbHere