Flip the run_webkit_tests scripts to use the upstream versions of the test

harness (WebKit/WebKitTools/Scripts/new-run-webkit-tests).

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

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=40679
Review URL: http://codereview.chromium.org/669037

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

5 files changed, 42 insertions, 20 deletions

diff --git a/webkit/tools/layout_tests/old_run_webkit_tests.py b/webkit/tools/layout_tests/old_run_webkit_tests.py
new file mode 100755
index 0000000..8449764
--- /dev/null
+++ b/webkit/tools/layout_tests/old_run_webkit_tests.py
@@ -0,0 +1,16 @@
+#!/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 25ca06f..ba9d079 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\webkitpy\layout_tests\rebaseline_chromium_webkit_tests.py %*
+%~dp0..\..\..\third_party\python_24\python.exe %~dp0\..\..\..\third_party\WebKit\WebKitTools\Scripts\rebaseline-chromium-webkit-tests %*

diff --git a/webkit/tools/layout_tests/rebaseline.sh b/webkit/tools/layout_tests/rebaseline.sh
index 771169d..a00f6ac 100755
--- a/webkit/tools/layout_tests/rebaseline.sh
+++ b/webkit/tools/layout_tests/rebaseline.sh
@@ -1,16 +1,11 @@
 #!/bin/sh
 
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# 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.
 
 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/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py" "$@"
+"$PYTHON_PROG" "$exec_dir/../../../third_party/WebKit/WebKitTools/Scripts/rebaseline-chromium-webkit-tests" "$@"
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index eeebfa9..11cfeb9c 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -1,16 +1,27 @@
 #!/usr/bin/env python
-# Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+# 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"""
+"""Wrapper around
+   third_party/WebKit/WebKitTools/Scripts/new-run-webkit-tests"""
 import os
+import subprocess
 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
+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[1:])
+    return subprocess.call(cmd)
 
 if __name__ == '__main__':
-    options, args = run_chromium_webkit_tests.parse_args()
-    run_chromium_webkit_tests.main(options, args)
+    main()
+
diff --git a/webkit/tools/layout_tests/run_webkit_tests.sh b/webkit/tools/layout_tests/run_webkit_tests.sh
index 4dcb3fc..c45afc7 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.sh
+++ b/webkit/tools/layout_tests/run_webkit_tests.sh
@@ -10,13 +10,13 @@ if [ "$OSTYPE" = "cygwin" ]; then
   system_root=`cygpath "$SYSTEMROOT"`
   PATH="/usr/bin:$system_root/system32:$system_root:$system_root/system32/WBEM"
   export PATH
+  unset PYTHONPATH
   PYTHON_PROG="$exec_dir/../../../third_party/python_24/python.exe"
+  SCRIPT=$(cygpath -wa "$exec_dir/run_webkit_tests.py")
 else
   PYTHON_PROG=python
-  # 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
+  unset PYTHONPATH
+  SCRIPT="$exec_dir/run_webkit_tests.py"
 fi
 
-"$PYTHON_PROG" "$exec_dir/run_webkit_tests.py" "$@"
+"$PYTHON_PROG" "$SCRIPT" "$@"