tests: Improve Makefile/dotest to properly set LLDB_HERE variable used in some

tests.

llvm-svn: 143394

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

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