44483 2010-08-23 19:12:39 -0700 [chromium] fix the platform result fallback order on mac/win 2010-08-24 15:37:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tony tony dpranke eric victorw oldest_to_newest 268268 0 tony 2010-08-23 19:12:39 -0700 [chromium] fix the platform result fallback order on mac/win 268269 1 65206 tony 2010-08-23 19:13:09 -0700 Created attachment 65206 Patch 268271 2 tony 2010-08-23 19:14:13 -0700 The previous code happened to work on Linux because the fallback order on linux was hardcoded. On Mac and Win, it's based on the port name. To match existing behavior, we need to pass in null for port name. 268273 3 tony 2010-08-23 19:16:39 -0700 To clarify some more, the bug was that --platform 'google-chrome-win' wasn't including chromium-win-xp or chromium-win-vista. This fixes it so the port name will still be chromium-win-{xp,vista}, even though we insert the google-chrome-win path in the baseline search path. 268803 4 eric 2010-08-24 14:36:36 -0700 I'm still confused why None is required here. 268809 5 tony 2010-08-24 14:42:58 -0700 (In reply to comment #4) > I'm still confused why None is required here. None causes us to assign the default port name: http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_mac.py#L47 http://trac.webkit.org/browser/trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win.py#L44 For windows, this is important because that's where -xp or -vista comes from. 268816 6 65206 eric 2010-08-24 14:49:02 -0700 Comment on attachment 65206 Patch So these ports end up maskerading as win or mac or whatever? Or I guess they get the chromium through inheriting from the Chromium port? 268825 7 tony 2010-08-24 14:52:10 -0700 (In reply to comment #6) > (From update of attachment 65206 [details]) > So these ports end up maskerading as win or mac or whatever? Or I guess they get the chromium through inheriting from the Chromium port? Yes, these ports are identical to the chromium-win or chromium-mac ports. We just want an extra layout test directory to check first for results. 268844 8 65206 eric 2010-08-24 15:19:36 -0700 Comment on attachment 65206 Patch I'm still a bit confused, but I trust you. 268853 9 65206 dpranke 2010-08-24 15:29:07 -0700 Comment on attachment 65206 Patch Good catch. LGTM (although I'm not a reviewer). 268863 10 65206 tony 2010-08-24 15:37:45 -0700 Comment on attachment 65206 Patch Clearing flags on attachment: 65206 Committed r65944: <http://trac.webkit.org/changeset/65944> 268864 11 tony 2010-08-24 15:37:50 -0700 All reviewed patches have been landed. Closing bug. 65206 2010-08-23 19:13:09 -0700 2010-08-24 15:37:45 -0700 Patch bug-44483-20100823191322.patch text/plain 2978 tony ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBjZTVlNDBkZGM1MGUzYzM0NjRiNjVmNDdhZjU2ZWVlMDRhMDUwNzc1Li43ODUxYmVl NDg2ZTQwYzFlZDc3M2EyZjQxMGQwNmNmMTFiYmVjOWFjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTAtMDgtMjMgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIGZpeCB0aGUg cGxhdGZvcm0gcmVzdWx0IGZhbGxiYWNrIG9yZGVyIG9uIG1hYy93aW4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ0NDgzCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2dvb2dsZV9jaHJvbWUucHk6CisKIDIwMTAt MDgtMjMgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ29vZ2xlX2Nocm9tZS5weSBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ29vZ2xlX2Nocm9tZS5weQppbmRleCAx ZWEwNTNiNDEyOTEzODZmM2U3NWIwYjVjNmQ5YmY5YTMwZmRmNmQzLi40NmFiM2VkNTdhNjQ5MmY5 ZmY5NzgwMzEzMDA3OWRiYmVjZmY3NTFjIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2dvb2dsZV9jaHJvbWUucHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9nb29nbGVfY2hyb21lLnB5 CkBAIC0zNiw5ICszNiwxMCBAQCBkZWYgR2V0R29vZ2xlQ2hyb21lUG9ydChwb3J0X25hbWUsIG9w dGlvbnMpOgogICAgICAgICAgICAgZGVmIGJhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgogICAg ICAgICAgICAgICAgIHBhdGhzID0gY2hyb21pdW1fbGludXguQ2hyb21pdW1MaW51eFBvcnQuYmFz ZWxpbmVfc2VhcmNoX3BhdGgoCiAgICAgICAgICAgICAgICAgICAgIHNlbGYpCi0gICAgICAgICAg ICAgICAgcGF0aHMuaW5zZXJ0KDAsIHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoKHNlbGYuX25h bWUpKQorICAgICAgICAgICAgICAgIHBhdGhzLmluc2VydCgwLCBzZWxmLl93ZWJraXRfYmFzZWxp bmVfcGF0aCgKKyAgICAgICAgICAgICAgICAgICAgJ2dvb2dsZS1jaHJvbWUtbGludXgzMicpKQog ICAgICAgICAgICAgICAgIHJldHVybiBwYXRocwotICAgICAgICByZXR1cm4gR29vZ2xlQ2hyb21l TGludXgzMlBvcnQocG9ydF9uYW1lLCBvcHRpb25zKQorICAgICAgICByZXR1cm4gR29vZ2xlQ2hy b21lTGludXgzMlBvcnQoTm9uZSwgb3B0aW9ucykKICAgICBlbGlmIHBvcnRfbmFtZSA9PSAnZ29v Z2xlLWNocm9tZS1saW51eDY0JzoKICAgICAgICAgaW1wb3J0IGNocm9taXVtX2xpbnV4CiAKQEAg LTQ2LDkgKzQ3LDEwIEBAIGRlZiBHZXRHb29nbGVDaHJvbWVQb3J0KHBvcnRfbmFtZSwgb3B0aW9u cyk6CiAgICAgICAgICAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CiAgICAgICAg ICAgICAgICAgcGF0aHMgPSBjaHJvbWl1bV9saW51eC5DaHJvbWl1bUxpbnV4UG9ydC5iYXNlbGlu ZV9zZWFyY2hfcGF0aCgKICAgICAgICAgICAgICAgICAgICAgc2VsZikKLSAgICAgICAgICAgICAg ICBwYXRocy5pbnNlcnQoMCwgc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoc2VsZi5fbmFtZSkp CisgICAgICAgICAgICAgICAgcGF0aHMuaW5zZXJ0KDAsIHNlbGYuX3dlYmtpdF9iYXNlbGluZV9w YXRoKAorICAgICAgICAgICAgICAgICAgICAnZ29vZ2xlLWNocm9tZS1saW51eDY0JykpCiAgICAg ICAgICAgICAgICAgcmV0dXJuIHBhdGhzCi0gICAgICAgIHJldHVybiBHb29nbGVDaHJvbWVMaW51 eDY0UG9ydChwb3J0X25hbWUsIG9wdGlvbnMpCisgICAgICAgIHJldHVybiBHb29nbGVDaHJvbWVM aW51eDY0UG9ydChOb25lLCBvcHRpb25zKQogICAgIGVsaWYgcG9ydF9uYW1lLnN0YXJ0c3dpdGgo J2dvb2dsZS1jaHJvbWUtbWFjJyk6CiAgICAgICAgIGltcG9ydCBjaHJvbWl1bV9tYWMKIApAQCAt NTksNyArNjEsNyBAQCBkZWYgR2V0R29vZ2xlQ2hyb21lUG9ydChwb3J0X25hbWUsIG9wdGlvbnMp OgogICAgICAgICAgICAgICAgIHBhdGhzLmluc2VydCgwLCBzZWxmLl93ZWJraXRfYmFzZWxpbmVf cGF0aCgKICAgICAgICAgICAgICAgICAgICAgJ2dvb2dsZS1jaHJvbWUtbWFjJykpCiAgICAgICAg ICAgICAgICAgcmV0dXJuIHBhdGhzCi0gICAgICAgIHJldHVybiBHb29nbGVDaHJvbWVNYWNQb3J0 KHBvcnRfbmFtZSwgb3B0aW9ucykKKyAgICAgICAgcmV0dXJuIEdvb2dsZUNocm9tZU1hY1BvcnQo Tm9uZSwgb3B0aW9ucykKICAgICBlbGlmIHBvcnRfbmFtZS5zdGFydHN3aXRoKCdnb29nbGUtY2hy b21lLXdpbicpOgogICAgICAgICBpbXBvcnQgY2hyb21pdW1fd2luCiAKQEAgLTcwLDUgKzcyLDUg QEAgZGVmIEdldEdvb2dsZUNocm9tZVBvcnQocG9ydF9uYW1lLCBvcHRpb25zKToKICAgICAgICAg ICAgICAgICBwYXRocy5pbnNlcnQoMCwgc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoCiAgICAg ICAgICAgICAgICAgICAgICdnb29nbGUtY2hyb21lLXdpbicpKQogICAgICAgICAgICAgICAgIHJl dHVybiBwYXRocwotICAgICAgICByZXR1cm4gR29vZ2xlQ2hyb21lV2luUG9ydChwb3J0X25hbWUs IG9wdGlvbnMpCisgICAgICAgIHJldHVybiBHb29nbGVDaHJvbWVXaW5Qb3J0KE5vbmUsIG9wdGlv bnMpCiAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcigndW5zdXBwb3J0ZWQgcG9ydDogJXMn ICUgcG9ydF9uYW1lKQo=