From f5aaac9ce64cc36c17fbb06757e59465e0af1f02 Mon Sep 17 00:00:00 2001 From: "dpranke@chromium.org" Date: Tue, 23 Feb 2010 00:15:46 +0000 Subject: Revert 39662 - Update various test scripts to use the upstream version of runchromiumwebkittests and rebaselinechromiumwebkittests BUG=23099 TBR=victorw TEST=bots don't explode Review URL: http://codereview.chromium.org/639001 TBR=dpranke@chromium.org Review URL: http://codereview.chromium.org/650189 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39678 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/layout_tests/rebaseline.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'webkit/tools/layout_tests/rebaseline.sh') diff --git a/webkit/tools/layout_tests/rebaseline.sh b/webkit/tools/layout_tests/rebaseline.sh index bac48c4..771169d 100755 --- a/webkit/tools/layout_tests/rebaseline.sh +++ b/webkit/tools/layout_tests/rebaseline.sh @@ -1,11 +1,16 @@ #!/bin/sh -# Copyright (c) 2009, 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2009 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. exec_dir=$(dirname $0) 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/../../../third_party/WebKit/WebKitTools/Scripts/rebaseline-chromium-webkit-tests" "$@" +"$PYTHON_PROG" "$exec_dir/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py" "$@" -- cgit v1.1