[Lldb-commits] [lldb] r133460 - in /lldb/trunk/test: dotest.py help/TestHelp.py

[Peter Collingbourne]

Author: pcc
Date: Mon Jun 20 14:06:45 2011
New Revision: 133460

URL: http://llvm.org/viewvc/llvm-project?rev=133460&view=rev
Log:
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.

Modified:
    lldb/trunk/test/dotest.py
    lldb/trunk/test/help/TestHelp.py

Modified: lldb/trunk/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest.py?rev=133460&r1=133459&r2=133460&view=diff
==============================================================================
--- lldb/trunk/test/dotest.py (original)
+++ lldb/trunk/test/dotest.py Mon Jun 20 14:06:45 2011
@@ -531,6 +531,11 @@
             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')
 

Modified: lldb/trunk/test/help/TestHelp.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/help/TestHelp.py?rev=133460&r1=133459&r2=133460&view=diff
==============================================================================
--- lldb/trunk/test/help/TestHelp.py (original)
+++ lldb/trunk/test/help/TestHelp.py Mon Jun 20 14:06:45 2011
@@ -20,7 +20,7 @@
 
     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: