Changeset 128164 in webkit

Timestamp:

Sep 11, 2012 3:10:06 AM (12 years ago)

Author:

peter@chromium.org

Message:

Recognize the "--chromium-android" argument in run-webkit-tests
​https://bugs.webkit.org/show_bug.cgi?id=96369

Reviewed by Jochen Eisinger.

Chromium for the Android platform cannot determine the platform based on
the host itself, so we'll use the --chromium-android argument as the build
master passes to run-webkit-tests. Make sure the layout test runner
can pick the right port when doing so.

• Scripts/run-webkit-tests:
• Scripts/webkitpy/layout_tests/port/factory.py:

(port_options):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-webkit-tests (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/factory.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/factory_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-11  Peter Beverloo  <peter@chromium.org>
+
+        Recognize the "--chromium-android" argument in run-webkit-tests
+        https://bugs.webkit.org/show_bug.cgi?id=96369
+
+        Reviewed by Jochen Eisinger.
+
+        Chromium for the Android platform cannot determine the platform based on
+        the host itself, so we'll use the --chromium-android argument as the build
+        master passes to run-webkit-tests. Make sure the layout test runner
+        can pick the right port when doing so.
+
+        * Scripts/run-webkit-tests:
+        * Scripts/webkitpy/layout_tests/port/factory.py:
+        (port_options):
+
 2012-09-11  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/Tools/Scripts/run-webkit-tests

@@ -113 +113 @@
 } elsif (isEfl()) {
     push(@ARGV, "--efl");
+} elsif (isChromiumAndroid()) {
+    push(@ARGV, "--chromium-android");
 } elsif (isChromium()) {
-    push(@ARGV, "--chromium")
+    push(@ARGV, "--chromium");
 } elsif (isWinCairo()) {
-    push(@ARGV, "--wincairo")
+    push(@ARGV, "--wincairo");
 }
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py

@@ -47 +47 @@
         optparse.make_option('--platform', action='store',
             help=help_strings.get('platform', 'Platform/Port being tested (e.g., "mac-lion")')),
-        optparse.make_option("--chromium", action="store_const", const='chromium', dest='platform',
+        optparse.make_option('--chromium', action='store_const', const='chromium', dest='platform',
             help='Alias for --platform=chromium'),
+        optparse.make_option('--chromium-android', action='store_const', const='chromium-android', dest='platform',
+            help='Alias for --platform=chromium-android'),
         optparse.make_option('--efl', action='store_const', const='efl', dest="platform",
             help='Alias for --platform=efl'),

trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py

@@ -32 +32 @@
 from webkitpy.common.system.systemhost_mock import MockSystemHost
 
+from webkitpy.layout_tests.port import chromium_android
 from webkitpy.layout_tests.port import chromium_linux
 from webkitpy.layout_tests.port import chromium_mac
@@ -86 +87 @@
                          cls=chromium_linux.ChromiumLinuxPort)
 
+    def test_chromium_android(self):
+        self.assert_port(port_name='chromium-android', cls=chromium_android.ChromiumAndroidPort)
+        # NOTE: We can't check for port_name=chromium here, as this will append the host's
+        # operating system, whereas host!=target for Android.
+
     def test_chromium_win(self):
         self.assert_port(port_name='chromium-win-xp', cls=chromium_win.ChromiumWinPort)