summaryrefslogtreecommitdiff
path: root/chromium/blink
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@theqtcompany.com>2014-12-05 15:04:29 +0100
committerAndras Becsi <andras.becsi@theqtcompany.com>2014-12-09 10:49:28 +0100
commitaf6588f8d723931a298c995fa97259bb7f7deb55 (patch)
tree060ca707847ba1735f01af2372e0d5e494dc0366 /chromium/blink
parent2fff84d821cc7b1c785f6404e0f8091333283e74 (diff)
downloadqtwebengine-chromium-af6588f8d723931a298c995fa97259bb7f7deb55.tar.gz
BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.
Change-Id: I759465284fd64d59ad120219cbe257f7402c4181 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/blink')
-rw-r--r--chromium/blink/tools/OWNERS3
-rwxr-xr-xchromium/blink/tools/run_layout_tests.bat1
-rwxr-xr-xchromium/blink/tools/run_layout_tests.py21
-rwxr-xr-xchromium/blink/tools/run_layout_tests.sh18
4 files changed, 43 insertions, 0 deletions
diff --git a/chromium/blink/tools/OWNERS b/chromium/blink/tools/OWNERS
new file mode 100644
index 00000000000..4fc050a95b0
--- /dev/null
+++ b/chromium/blink/tools/OWNERS
@@ -0,0 +1,3 @@
+ojan@chromium.org
+dpranke@chromium.org
+*
diff --git a/chromium/blink/tools/run_layout_tests.bat b/chromium/blink/tools/run_layout_tests.bat
new file mode 100755
index 00000000000..9613b38a7cd
--- /dev/null
+++ b/chromium/blink/tools/run_layout_tests.bat
@@ -0,0 +1 @@
+@python %~dp0\run_layout_tests.py %*
diff --git a/chromium/blink/tools/run_layout_tests.py b/chromium/blink/tools/run_layout_tests.py
new file mode 100755
index 00000000000..46d8ad016d9
--- /dev/null
+++ b/chromium/blink/tools/run_layout_tests.py
@@ -0,0 +1,21 @@
+#!/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
+ third_party/WebKit/Tools/Scripts/run-webkit-tests"""
+import os
+import subprocess
+import sys
+
+def main():
+ 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 = [sys.executable, script] + sys.argv[1:]
+ return subprocess.call(cmd)
+
+if __name__ == '__main__':
+ sys.exit(main())
diff --git a/chromium/blink/tools/run_layout_tests.sh b/chromium/blink/tools/run_layout_tests.sh
new file mode 100755
index 00000000000..f2d707e41ed
--- /dev/null
+++ b/chromium/blink/tools/run_layout_tests.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# 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)
+
+if [ "$OSTYPE" = "cygwin" ]; then
+ SCRIPT=$(cygpath -wa "$exec_dir/run_layout_tests.py")
+else
+ SCRIPT="$exec_dir/run_layout_tests.py"
+fi
+
+PYTHON_PROG=python
+unset PYTHONPATH
+
+"$PYTHON_PROG" "$SCRIPT" "$@"