- Revision
- 128164
- Author
- [email protected]
- Date
- 2012-09-11 03:10:06 -0700 (Tue, 11 Sep 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128163 => 128164)
--- trunk/Tools/ChangeLog 2012-09-11 10:06:58 UTC (rev 128163)
+++ trunk/Tools/ChangeLog 2012-09-11 10:10:06 UTC (rev 128164)
@@ -1,3 +1,19 @@
+2012-09-11 Peter Beverloo <[email protected]>
+
+ 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 <[email protected]>
[QT] Fix build with newer qmake from Qt 5
Modified: trunk/Tools/Scripts/run-webkit-tests (128163 => 128164)
--- trunk/Tools/Scripts/run-webkit-tests 2012-09-11 10:06:58 UTC (rev 128163)
+++ trunk/Tools/Scripts/run-webkit-tests 2012-09-11 10:10:06 UTC (rev 128164)
@@ -112,10 +112,12 @@
push(@ARGV, "--gtk");
} 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");
}
my $harnessPath = File::Spec->catfile(relativeScriptsDir(), $harnessName);
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py (128163 => 128164)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py 2012-09-11 10:06:58 UTC (rev 128163)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py 2012-09-11 10:10:06 UTC (rev 128164)
@@ -46,8 +46,10 @@
help='Set the configuration to Release'),
optparse.make_option('--platform', action='',
help=help_strings.get('platform', 'Platform/Port being tested (e.g., "mac-lion")')),
- optparse.make_option("--chromium", action="" const='chromium', dest='platform',
+ optparse.make_option('--chromium', action='', const='chromium', dest='platform',
help='Alias for --platform=chromium'),
+ optparse.make_option('--chromium-android', action='', const='chromium-android', dest='platform',
+ help='Alias for --platform=chromium-android'),
optparse.make_option('--efl', action='', const='efl', dest="platform",
help='Alias for --platform=efl'),
optparse.make_option('--gtk', action='', const='gtk', dest="platform",
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py (128163 => 128164)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py 2012-09-11 10:06:58 UTC (rev 128163)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py 2012-09-11 10:10:06 UTC (rev 128164)
@@ -31,6 +31,7 @@
from webkitpy.tool.mocktool import MockOptions
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
from webkitpy.layout_tests.port import chromium_win
@@ -85,6 +86,11 @@
self.assert_port(port_name='chromium', os_name='linux', os_version='lucid',
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)
self.assert_port(port_name='chromium-win', os_name='win', os_version='xp',
