Author: chaoren
Date: Tue Mar  3 14:11:48 2015
New Revision: 231120

URL: http://llvm.org/viewvc/llvm-project?rev=231120&view=rev
Log:
[TestGlobalVariables] LD_LIBRARY_PATH should be process working directory.

Summary:
The inferior can load the library now, but the remote test is still failing
because of a module loading problem in LLDB.

Reviewers: ovyalov, sivachandra, clayborg

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D8038

Modified:
    lldb/trunk/test/lang/c/global_variables/TestGlobalVariables.py

Modified: lldb/trunk/test/lang/c/global_variables/TestGlobalVariables.py
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/c/global_variables/TestGlobalVariables.py?rev=231120&r1=231119&r2=231120&view=diff
==============================================================================
--- lldb/trunk/test/lang/c/global_variables/TestGlobalVariables.py (original)
+++ lldb/trunk/test/lang/c/global_variables/TestGlobalVariables.py Tue Mar  3 
14:11:48 2015
@@ -34,9 +34,14 @@ class GlobalVariablesTestCase(TestBase):
         if sys.platform.startswith("freebsd") or 
sys.platform.startswith("linux"):
             # LD_LIBRARY_PATH must be set so the shared libraries are found on 
startup
             if "LD_LIBRARY_PATH" in os.environ:
-                self.runCmd("settings set target.env-vars " + self.dylibPath + 
"=" + os.environ["LD_LIBRARY_PATH"] + ":" + os.getcwd())
+                self.runCmd("settings set target.env-vars " +
+                            self.dylibPath + "=" +
+                            os.environ["LD_LIBRARY_PATH"] + ":" +
+                            self.get_process_working_directory())
             else:
-                self.runCmd("settings set target.env-vars " + self.dylibPath + 
"=" + os.getcwd())
+                self.runCmd("settings set target.env-vars " +
+                            self.dylibPath + "=" +
+                            self.get_process_working_directory())
             self.addTearDownHook(lambda: self.runCmd("settings remove 
target.env-vars " + self.dylibPath))
 
     def global_variables(self):


_______________________________________________
lldb-commits mailing list
lldb-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits

Reply via email to