diff options
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 15 | ||||
| -rwxr-xr-x | tools/valgrind/chrome_tests.sh | 2 |
2 files changed, 3 insertions, 14 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index a14b5f6..af2a4a0 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -17,16 +17,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 valgrind_test @@ -100,9 +90,8 @@ class ChromeTests: # relative to the top of the tree. 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('\\', '/') valgrind_test_script = os.path.join(script_dir, "valgrind_test.py") self._command_preamble = [valgrind_test_script, "--source_dir=%s" % (self._source_dir)] diff --git a/tools/valgrind/chrome_tests.sh b/tools/valgrind/chrome_tests.sh index dd3a6b3..da56954 100755 --- a/tools/valgrind/chrome_tests.sh +++ b/tools/valgrind/chrome_tests.sh @@ -22,4 +22,4 @@ PATH="${CHROME_VALGRIND}/bin:$PATH" export VALGRIND_LIB="$CHROME_VALGRIND/lib/valgrind" export VALGRIND_LIB_INNER="$CHROME_VALGRIND/lib/valgrind" -PYTHONPATH=$THISDIR/../../webkit/tools/layout_tests/webkitpy/layout_tests:$THISDIR/../python "$THISDIR/chrome_tests.py" "$@" +PYTHONPATH=$THISDIR/../python "$THISDIR/chrome_tests.py" "$@" |