Fix PYTHONPATH handling for heapchecker according to

http://codereview.chromium.org/1736026/show


Review URL: http://codereview.chromium.org/1910003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46446 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 11 insertions, 11 deletions

diff --git a/tools/heapcheck/chrome_tests.py b/tools/heapcheck/chrome_tests.py
index c71bf99..fbc4174 100755
--- a/tools/heapcheck/chrome_tests.py
+++ b/tools/heapcheck/chrome_tests.py
@@ -17,8 +17,8 @@ import os
 import stat
 import sys
 
-import google.logging_utils
-import google.path_utils
+import logging_utils
+import path_utils
 
 import common
 import heapcheck_test
@@ -101,7 +101,7 @@ class ChromeTests(object):
     self._args = args
     self._test = test
 
-    script_dir = google.path_utils.ScriptDir()
+    script_dir = path_utils.ScriptDir()
 
     # Compute the top of the tree (the "source dir") from the script dir (where
     # this script lives).  We assume that the script dir is in tools/heapcheck/
@@ -131,7 +131,7 @@ class ChromeTests(object):
     # We need multiple data dirs, the current script directory and a module
     # specific one. The global suppression file lives in our directory, and the
     # module specific suppression file lives with the module.
-    self._data_dirs = [google.path_utils.ScriptDir()]
+    self._data_dirs = [path_utils.ScriptDir()]
 
     if module == "chrome":
       # Unfortunately, not all modules have the same directory structure.
@@ -303,7 +303,7 @@ class ChromeTests(object):
     # Store each chunk in its own directory so that we can find the data later
     chunk_dir = os.path.join("layout", "chunk_%05d" % chunk_num)
     test_shell = os.path.join(self._options.build_dir, "test_shell")
-    out_dir = os.path.join(google.path_utils.ScriptDir(), "latest")
+    out_dir = os.path.join(path_utils.ScriptDir(), "latest")
     out_dir = os.path.join(out_dir, chunk_dir)
     if os.path.exists(out_dir):
       old_files = glob.glob(os.path.join(out_dir, "*.txt"))
@@ -415,9 +415,9 @@ def _main(_):
   options, args = parser.parse_args()
 
   if options.verbose:
-    google.logging_utils.config_root(logging.DEBUG)
+    logging_utils.config_root(logging.DEBUG)
   else:
-    google.logging_utils.config_root()
+    logging_utils.config_root()
 
   if not options.test or not len(options.test):
     parser.error("--test not specified")
diff --git a/tools/heapcheck/chrome_tests.sh b/tools/heapcheck/chrome_tests.sh
index a11ec83..3b31f39 100755
--- a/tools/heapcheck/chrome_tests.sh
+++ b/tools/heapcheck/chrome_tests.sh
@@ -5,4 +5,4 @@
 # found in the LICENSE file.
 
 THISDIR=$(dirname "${0}")
-PYTHONPATH="${THISDIR}/../valgrind:${THISDIR}/../python" exec "${THISDIR}/chrome_tests.py" "${@}"
+PYTHONPATH="${THISDIR}/../valgrind:${THISDIR}/../python/google" exec "${THISDIR}/chrome_tests.py" "${@}"
diff --git a/tools/heapcheck/heapcheck_test.py b/tools/heapcheck/heapcheck_test.py
index 7a0132c..a4c27ff 100644
--- a/tools/heapcheck/heapcheck_test.py
+++ b/tools/heapcheck/heapcheck_test.py
@@ -13,7 +13,7 @@ import os
 import re
 
 import common
-import google.path_utils
+import path_utils
 import suppressions
 
 
@@ -40,7 +40,7 @@ class HeapcheckWrapper(object):
   def Execute(self):
     """Executes the app to be tested."""
     logging.info('starting execution...')
-    proc = ['sh', google.path_utils.ScriptDir() + '/heapcheck_std.sh']
+    proc = ['sh', path_utils.ScriptDir() + '/heapcheck_std.sh']
     proc += self._args
     self.PutEnvAndLog('G_SLICE', 'always-malloc')
     self.PutEnvAndLog('NSS_DISABLE_ARENA_FREE_LIST', '1')
@@ -48,7 +48,7 @@ class HeapcheckWrapper(object):
     self.PutEnvAndLog('HEAPCHECK', self._mode)
     self.PutEnvAndLog('HEAP_CHECK_MAX_LEAKS', '-1')
     self.PutEnvAndLog('PPROF_PATH',
-        google.path_utils.ScriptDir() +
+        path_utils.ScriptDir() +
         '/../../third_party/tcmalloc/chromium/src/pprof')
     self.PutEnvAndLog('LD_PRELOAD', '/usr/lib/debug/libstdc++.so')