Modify TestHelp to search for LLDB-Info.plist in the correct place

This is required to run the test suite outside of the source tree
or on a case sensitive file system.

llvm-svn: 133460

2 files changed, 6 insertions, 1 deletions

diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py
index 6cfade47dce..ac6060daf90 100755
--- a/lldb/test/dotest.py
+++ b/lldb/test/dotest.py
@@ -531,6 +531,11 @@ def setupSysPath():
             os.environ["LLDB_TEST"] = rdir
     else:
         os.environ["LLDB_TEST"] = scriptPath
+
+    # Set up the LLDB_SRC environment variable, so that the tests can locate
+    # the LLDB source code.
+    os.environ["LLDB_SRC"] = os.path.join(sys.path[0], os.pardir)
+
     pluginPath = os.path.join(scriptPath, 'plugins')
     pexpectPath = os.path.join(scriptPath, 'pexpect-2.4')
 
diff --git a/lldb/test/help/TestHelp.py b/lldb/test/help/TestHelp.py
index 77142e19dbe..999fa40e2fc 100644
--- a/lldb/test/help/TestHelp.py
+++ b/lldb/test/help/TestHelp.py
@@ -20,7 +20,7 @@ class HelpCommandTestCase(TestBase):
 
     def version_number_string(self):
         """Helper function to find the version number string of lldb."""
-        plist = os.path.join(os.getcwd(), os.pardir, os.pardir, "resources", "LLDB-info.plist")
+        plist = os.path.join(os.environ["LLDB_SRC"], "resources", "LLDB-Info.plist")
         try:
             CFBundleVersionSegFound = False
             with open(plist, 'r') as f: