diff options
author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 08:12:00 +0000 |
---|---|---|
committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 08:12:00 +0000 |
commit | af804e131b09b6e9c9a4476b676e9ed8b2135611 (patch) | |
tree | 84908708a1342348f512363195b6add71bafc989 /tools | |
parent | 734296c930bc61f4e13f1eb6a3c2f80782a1a1b9 (diff) | |
download | chromium_src-af804e131b09b6e9c9a4476b676e9ed8b2135611.zip chromium_src-af804e131b09b6e9c9a4476b676e9ed8b2135611.tar.gz chromium_src-af804e131b09b6e9c9a4476b676e9ed8b2135611.tar.bz2 |
Append to LD_LIBRARY_PATH when running the heap checker.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3028014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/heapcheck/chrome_tests.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/heapcheck/chrome_tests.py b/tools/heapcheck/chrome_tests.py index f225e64..d6b3783 100755 --- a/tools/heapcheck/chrome_tests.py +++ b/tools/heapcheck/chrome_tests.py @@ -239,7 +239,11 @@ class ChromeTests(object): # 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 heapcheck_test.RunTool(cmd, supp, module) def TestBase(self): |