diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 12:57:32 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 12:57:32 +0000 |
| commit | 9ecf9ebdca87a4f9eaa4c1af526738258c23d6ce (patch) | |
| tree | 5208eead969ac625347b220e0315cad460976df3 | |
| parent | bee1128b24606065d7f62d49544119424bb51a2b (diff) | |
| download | chromium_src-9ecf9ebdca87a4f9eaa4c1af526738258c23d6ce.zip chromium_src-9ecf9ebdca87a4f9eaa4c1af526738258c23d6ce.tar.gz chromium_src-9ecf9ebdca87a4f9eaa4c1af526738258c23d6ce.tar.bz2 | |
Do not override LD_LIBRARY_PATH
BUG=none
TEST=Compile chrome with shared libraries and execute chrome_tests
Review URL: http://codereview.chromium.org/652223
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39889 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index ab0ff66..a7019e8 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -220,7 +220,11 @@ class ChromeTests: # Sets LD_LIBRARY_PATH to the build folder so external libraries can be # loaded. - os.putenv("LD_LIBRARY_PATH", self._options.build_dir) + if (os.getenv("LD_LIBRARY_PATH")): + os.putenv("LD_LIBRARY_PATH", "%s:%s" % (os.getenv("LD_LIBRARY_PATH"), + self._options.build_dir)) + else: + os.putenv("LD_LIBRARY_PATH", self._options.build_dir) return valgrind_test.RunTool(cmd, module) def TestBase(self): |