From 16d88ff0456411bed5d894a4269295ad018a950f Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Mon, 31 Oct 2011 23:27:06 +0000
Subject: [PATCH] tests: Improve Makefile/dotest to properly set LLDB_HERE
 variable used in some tests.

llvm-svn: 143394
---
 lldb/test/Makefile  | 1 +
 lldb/test/dotest.py | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lldb/test/Makefile b/lldb/test/Makefile
index dea699231167..4658a076eb79 100644
--- a/lldb/test/Makefile
+++ b/lldb/test/Makefile
@@ -32,5 +32,6 @@ check-local::
 	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
diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py
index fee6b8967281..ae5d6f34d6ae 100755
--- a/lldb/test/dotest.py
+++ b/lldb/test/dotest.py
@@ -663,6 +663,8 @@ def setupSysPath():
         lldbHere = baiExec
     elif is_exe(baiExec2):
         lldbHere = baiExec2
+    elif lldbExec:
+        lldbHere = lldbExec
 
     if lldbHere:
         os.environ["LLDB_HERE"] = lldbHere