Remove obsolete rebaseline, test-webkitpy wrappers, stop passing --chromium

R=ojan@chromium.org, abarth@chromium.org
BUG=245504

Review URL: https://chromiumcodereview.appspot.com/17239011

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

4 files changed, 1 insertions, 57 deletions

diff --git a/webkit/tools/layout_tests/rebaseline.bat b/webkit/tools/layout_tests/rebaseline.bat
deleted file mode 100755
index 1d63ac5..0000000
--- a/webkit/tools/layout_tests/rebaseline.bat
+++ /dev/null
@@ -1 +0,0 @@
-%~dp0..\..\..\third_party\python_24\python.exe %~dp0\..\..\..\third_party\WebKit\Tools\Scripts\rebaseline-chromium-webkit-tests %*

diff --git a/webkit/tools/layout_tests/rebaseline.sh b/webkit/tools/layout_tests/rebaseline.sh
deleted file mode 100755
index 3ae4ff2..0000000
--- a/webkit/tools/layout_tests/rebaseline.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# 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)
-
-if grep -q REBASELINE $exec_dir/test_expectations.txt ; then
-  echo "test_expectations.txt has been moved upstream! The test_expectations.txt"
-  echo "here is just a set of local overrides. You have to put the REBASELINE "
-  echo "tags in the upstream version and commit the new baselines into the WebKit"
-  echo "tree."
-  echo
-  echo "Try:"
-  echo "cd ../../../third_party/WebKit"
-  echo "\$EDITOR LayoutTests/platform/chromium/test_expectations.txt"
-  echo "./Tools/Scripts/rebaseline-chromium-webkit-tests"
-  echo
-  echo "See also https://trac.webkit.org/wiki/Rebaseline"
-  exit 1
-fi
-
-PYTHON_PROG=python
-
-"$PYTHON_PROG" "$exec_dir/../../../third_party/WebKit/Tools/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 ac26a9c..4cce11a 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -10,15 +10,11 @@ import subprocess
 import sys
 
 def main():
-    cmd = [sys.executable]
     src_dir = os.path.abspath(os.path.join(sys.path[0], '..', '..', '..'))
     script_dir=os.path.join(src_dir, "third_party", "WebKit", "Tools",
                             "Scripts")
     script = os.path.join(script_dir, 'run-webkit-tests')
-    cmd.append(script)
-    if '--chromium' not in sys.argv:
-        cmd.append('--chromium')
-    cmd.extend(sys.argv[1:])
+    cmd = [sys.executable, script] + sys.argv[1:]
     return subprocess.call(cmd)
 
 if __name__ == '__main__':
diff --git a/webkit/tools/layout_tests/test-webkitpy b/webkit/tools/layout_tests/test-webkitpy
deleted file mode 100755
index f21963b5..0000000
--- a/webkit/tools/layout_tests/test-webkitpy
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) 2013 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/Tools/Scripts/test-webkitpy"""
-import os
-import subprocess
-import sys
-
-def main():
-    cmd = [sys.executable]
-    src_dir = os.path.abspath(os.path.join(sys.path[0], '..', '..', '..'))
-    script_dir=os.path.join(src_dir, "third_party", "WebKit", "Tools",
-                            "Scripts")
-    script = os.path.join(script_dir, 'test-webkitpy')
-    cmd.append(script)
-    cmd.extend(sys.argv[1:])
-    # TODO(jochen): enable the tests once they reliably pass.
-    #return subprocess.call(cmd)
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main())