Revert 40679 - Flip the run_webkit_tests scripts to use the upstream versions of the test

harness (WebKit/WebKitTools/Scripts/newrunwebkittests).

This also adds an old_run_webkit_tests for the moment for testing purposes.
I will remove this file when I obsolete everything under
webkit/tools/layout_tests/webkitpy.

    BUG=23099
    TEST=bots stay green
    R=tony@chromium.org

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

TBR=dpranke@chromium.org
Review URL: http://codereview.chromium.org/668121

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

4 files changed, 15 insertions, 37 deletions

diff --git a/webkit/tools/layout_tests/old_run_webkit_tests.py b/webkit/tools/layout_tests/old_run_webkit_tests.py
deleted file mode 100755
index 8449764..0000000
--- a/webkit/tools/layout_tests/old_run_webkit_tests.py
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2010 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.
-
-"""Wrapper around webkitpy/layout_tests/run-chromium-webkit-tests.py"""
-import os
-import sys
-
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])),
-                             "webkitpy", "layout_tests"))
-import run_chromium_webkit_tests
-
-if __name__ == '__main__':
-    options, args = run_chromium_webkit_tests.parse_args()
-    run_chromium_webkit_tests.main(options, args)
diff --git a/webkit/tools/layout_tests/rebaseline.bat b/webkit/tools/layout_tests/rebaseline.bat
index ea8d68f..25ca06f 100644
--- a/webkit/tools/layout_tests/rebaseline.bat
+++ b/webkit/tools/layout_tests/rebaseline.bat
@@ -1 +1 @@
-%~dp0..\..\..\third_party\python_24\python.exe %~dp0\..\..\..\third_party\WebKit\WebKitTools\Scripts\rebaseline-chromium-webkit-tests %*
+%~dp0..\..\..\third_party\python_24\python.exe %~dp0\webkitpy\layout_tests\rebaseline_chromium_webkit_tests.py %*
diff --git a/webkit/tools/layout_tests/rebaseline.sh b/webkit/tools/layout_tests/rebaseline.sh
index a00f6ac..771169d 100755
--- a/webkit/tools/layout_tests/rebaseline.sh
+++ b/webkit/tools/layout_tests/rebaseline.sh
@@ -1,11 +1,16 @@
 #!/bin/sh
 
-# Copyright (c) 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" "$@"
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index 498c52d..eeebfa9 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -1,27 +1,16 @@
 #!/usr/bin/env python
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Copyright (c) 2006-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.
 
-"""Wrapper around
-   third_party/WebKit/WebKitTools/Scripts/new-run-webkit-tests"""
+"""Wrapper around webkitpy/layout_tests/run-chromium-webkit-tests.py"""
 import os
-import subprocess
 import sys
 
-def main():
-    cmd = [sys.executable]
-    src_dir=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(
-                         os.path.dirname(os.path.abspath(sys.argv[0]))))))
-    script_dir=os.path.join(src_dir, "third_party", "WebKit", "WebKitTools",
-                            "Scripts")
-    script = os.path.join(script_dir, 'new-run-webkit-tests')
-    cmd.append(script)
-    if '--chromium' not in sys.argv:
-        cmd.append('--chromium')
-    cmd.extend(sys.argv)
-    return subprocess.call(cmd)
+sys.path.append(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])),
+                             "webkitpy", "layout_tests"))
+import run_chromium_webkit_tests
 
 if __name__ == '__main__':
-    main()
-
+    options, args = run_chromium_webkit_tests.parse_args()
+    run_chromium_webkit_tests.main(options, args)