From 137d33a32aceed782cd13e800eccc087f2186c96 Mon Sep 17 00:00:00 2001 From: "victorw@chromium.org" Date: Mon, 13 Jul 2009 17:37:24 +0000 Subject: When using rebaseline tool in cygwin, svn related shell commands fail due to directory format. Fixing the problem by using cygwin python instead of the included python for windows. TEST=rebaselining tool BUG=none Review URL: http://codereview.chromium.org/155239 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20502 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/layout_tests/rebaseline.sh | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'webkit') diff --git a/webkit/tools/layout_tests/rebaseline.sh b/webkit/tools/layout_tests/rebaseline.sh index 1499bc5..0af97d1 100755 --- a/webkit/tools/layout_tests/rebaseline.sh +++ b/webkit/tools/layout_tests/rebaseline.sh @@ -2,18 +2,11 @@ exec_dir=$(dirname $0) -if [ "$OSTYPE" = "cygwin" ]; then - system_root=`cygpath "$SYSTEMROOT"` - PATH="/usr/bin:$system_root/system32:$system_root:$system_root/system32/WBEM" - export PATH - PYTHON_PROG="$exec_dir/../../../third_party/python_24/python.exe" -else - PYTHON_PROG=python - # When not using the included python, we don't get automatic site.py paths. - # Specifically, run_webkit_tests needs the paths in: - # third_party/python_24/Lib/site-packages/google.pth - PYTHONPATH="${exec_dir}/../../../tools/python:$PYTHONPATH" - export PYTHONPATH -fi +PYTHON_PROG=python +# When not using the included python, we don't get automatic site.py paths. +# Specifically, rebaseline.py needs the paths in: +# third_party/python_24/Lib/site-packages/google.pth +PYTHONPATH="${exec_dir}/../../../tools/python:$PYTHONPATH" +export PYTHONPATH "$PYTHON_PROG" "$exec_dir/rebaseline.py" "$@" -- cgit v1.1