Changeset 128164 in webkit
- Timestamp:
- Sep 11, 2012 3:10:06 AM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r128162 r128164 1 2012-09-11 Peter Beverloo <peter@chromium.org> 2 3 Recognize the "--chromium-android" argument in run-webkit-tests 4 https://bugs.webkit.org/show_bug.cgi?id=96369 5 6 Reviewed by Jochen Eisinger. 7 8 Chromium for the Android platform cannot determine the platform based on 9 the host itself, so we'll use the --chromium-android argument as the build 10 master passes to run-webkit-tests. Make sure the layout test runner 11 can pick the right port when doing so. 12 13 * Scripts/run-webkit-tests: 14 * Scripts/webkitpy/layout_tests/port/factory.py: 15 (port_options): 16 1 17 2012-09-11 Simon Hausmann <simon.hausmann@nokia.com> 2 18 -
trunk/Tools/Scripts/run-webkit-tests
r124795 r128164 113 113 } elsif (isEfl()) { 114 114 push(@ARGV, "--efl"); 115 } elsif (isChromiumAndroid()) { 116 push(@ARGV, "--chromium-android"); 115 117 } elsif (isChromium()) { 116 push(@ARGV, "--chromium") 118 push(@ARGV, "--chromium"); 117 119 } elsif (isWinCairo()) { 118 push(@ARGV, "--wincairo") 120 push(@ARGV, "--wincairo"); 119 121 } 120 122 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/factory.py
r121816 r128164 47 47 optparse.make_option('--platform', action='store', 48 48 help=help_strings.get('platform', 'Platform/Port being tested (e.g., "mac-lion")')), 49 optparse.make_option( "--chromium", action="store_const", const='chromium', dest='platform',49 optparse.make_option('--chromium', action='store_const', const='chromium', dest='platform', 50 50 help='Alias for --platform=chromium'), 51 optparse.make_option('--chromium-android', action='store_const', const='chromium-android', dest='platform', 52 help='Alias for --platform=chromium-android'), 51 53 optparse.make_option('--efl', action='store_const', const='efl', dest="platform", 52 54 help='Alias for --platform=efl'), -
trunk/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py
r126247 r128164 32 32 from webkitpy.common.system.systemhost_mock import MockSystemHost 33 33 34 from webkitpy.layout_tests.port import chromium_android 34 35 from webkitpy.layout_tests.port import chromium_linux 35 36 from webkitpy.layout_tests.port import chromium_mac … … 86 87 cls=chromium_linux.ChromiumLinuxPort) 87 88 89 def test_chromium_android(self): 90 self.assert_port(port_name='chromium-android', cls=chromium_android.ChromiumAndroidPort) 91 # NOTE: We can't check for port_name=chromium here, as this will append the host's 92 # operating system, whereas host!=target for Android. 93 88 94 def test_chromium_win(self): 89 95 self.assert_port(port_name='chromium-win-xp', cls=chromium_win.ChromiumWinPort)
Note: See TracChangeset
for help on using the changeset viewer.