From 4e2229f750cd6a3a117873eb8c62ac4c2215997b Mon Sep 17 00:00:00 2001 From: "glider@chromium.org" Date: Mon, 22 Mar 2010 17:33:32 +0000 Subject: Remove the dependency on layout_package.path utils from the heapcheck runner (see http://codereview.chromium.org/669031) TBR=timurrrr,dpranke Review URL: http://codereview.chromium.org/1167001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42232 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/heapcheck/chrome_tests.py | 16 +++------------- tools/heapcheck/chrome_tests.sh | 2 +- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/tools/heapcheck/chrome_tests.py b/tools/heapcheck/chrome_tests.py index 4e7f904..c71bf99 100755 --- a/tools/heapcheck/chrome_tests.py +++ b/tools/heapcheck/chrome_tests.py @@ -20,16 +20,6 @@ import sys import google.logging_utils import google.path_utils -# Import the platform_utils up in the layout tests which have been modified to -# work under non-Windows platforms instead of the ones that are in the -# tools/python/google directory. (See chrome_tests.sh which sets PYTHONPATH -# correctly.) -# -# TODO(erg): Copy/Move the relevant functions from the layout_package version -# of platform_utils back up to google.platform_utils -# package. http://crbug.com/6164 -import layout_package.path_utils - import common import heapcheck_test @@ -119,9 +109,9 @@ class ChromeTests(object): self._source_dir = os.path.dirname(os.path.dirname(script_dir)) # Since this path is used for string matching, make sure it's always - # an absolute Windows-style path. - self._source_dir = layout_package.path_utils.get_absolute_path( - self._source_dir) + # an absolute Unix-style path. + self._source_dir = os.path.abspath(self._source_dir).replace('\\', '/') + heapcheck_test_script = os.path.join(script_dir, "heapcheck_test.py") self._command_preamble = [heapcheck_test_script] diff --git a/tools/heapcheck/chrome_tests.sh b/tools/heapcheck/chrome_tests.sh index dc96b31..a11ec83 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}/../../webkit/tools/layout_tests/webkitpy/layout_tests:${THISDIR}/../valgrind:${THISDIR}/../python" exec "${THISDIR}/chrome_tests.py" "${@}" +PYTHONPATH="${THISDIR}/../valgrind:${THISDIR}/../python" exec "${THISDIR}/chrome_tests.py" "${@}" -- cgit v1.1