140585 2015-01-17 16:43:00 -0800 iOS EWS queue name should be consistent 2015-01-19 10:26:12 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 140476 140623 1 ddkilzer ddkilzer ap benjamin commit-queue dbates ddkilzer glenn jake.nielsen.webkit jhoneycutt simon.fraser oldest_to_newest 1062141 0 ddkilzer 2015-01-17 16:43:00 -0800 Bug 140476 adds support to create an iOS EWS queue, but it wasn't consistent about using a name of 'ios-device-ews'. This patch corrects that. 1062142 1 244845 ddkilzer 2015-01-17 16:52:18 -0800 Created attachment 244845 Patch v1 1062143 2 244845 ap 2015-01-17 16:54:22 -0800 Comment on attachment 244845 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=244845&action=review > Tools/ChangeLog:8 > + * EWSTools/start-queue-mac.sh: Update for rename of 'ios-ews' to Ugh, this will make the bubble a lot wider. Not a fan. 1062149 3 ddkilzer 2015-01-17 18:38:08 -0800 Alexey expressed concern about making the queue name "ios-device-ews", so changing the patch to be consistent the other way so the queue name is "ios-ews". 1062151 4 244848 ddkilzer 2015-01-17 18:53:05 -0800 Created attachment 244848 Patch v2 1062152 5 244848 ap 2015-01-17 19:00:12 -0800 Comment on attachment 244848 Patch v2 Looks worth trying, hopefully this won't break ios-simulator. 1062209 6 ddkilzer 2015-01-18 11:11:46 -0800 (In reply to comment #5) > Comment on attachment 244848 [details] > Patch v2 > > Looks worth trying, hopefully this won't break ios-simulator. Did a previous version of the patch for Bug 140476 break iso-simulator? 1062213 7 ap 2015-01-18 11:54:11 -0800 Not sure how (or what) to check. Dan Bates and Simon Fraser would probably be the ones to advise. 1062232 8 ddkilzer 2015-01-18 16:17:35 -0800 (In reply to comment #7) > Not sure how (or what) to check. Dan Bates and Simon Fraser would probably > be the ones to advise. I'm pretty sure it's just `run-webkit-tests --ios-simulator` that needs to be tested with this change. 1062252 9 ddkilzer 2015-01-18 18:52:28 -0800 (In reply to comment #8) > (In reply to comment #7) > > Not sure how (or what) to check. Dan Bates and Simon Fraser would probably > > be the ones to advise. > > I'm pretty sure it's just `run-webkit-tests --ios-simulator` that needs to > be tested with this change. Well, after applying the patch, this happens: $ ./Tools/Scripts/run-webkit-tests --ios-simulator --debug LayoutTests/fast/url Traceback (most recent call last): File "Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 425, in <module> sys.exit(main(sys.argv[1:], sys.stdout, sys.stderr)) File "Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 73, in main port = host.port_factory.get(options.platform, options) File "Tools/Scripts/webkitpy/port/factory.py", line 119, in get return cls(self._host, port_name, options=options, **kwargs) File "Tools/Scripts/webkitpy/port/ios.py", line 66, in __init__ super(IOSPort, self).__init__(*args, **kwargs) File "Tools/Scripts/webkitpy/port/apple.py", line 88, in __init__ assert port_name in allowed_port_names, "%s is not in %s" % (port_name, allowed_port_names) AssertionError: ios-simulator is not in ['ios-7', 'ios-8', 'ios-future'] (Without the patch applied, everything works as expected.) Need to fix that issue first. 1062255 10 ddkilzer 2015-01-18 20:53:37 -0800 (In reply to comment #9) > Well, after applying the patch, this happens: > > $ ./Tools/Scripts/run-webkit-tests --ios-simulator --debug > LayoutTests/fast/url > Traceback (most recent call last): > File "Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 425, > in <module> > sys.exit(main(sys.argv[1:], sys.stdout, sys.stderr)) > File "Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py", line 73, > in main > port = host.port_factory.get(options.platform, options) > File "Tools/Scripts/webkitpy/port/factory.py", line 119, in get > return cls(self._host, port_name, options=options, **kwargs) > File "Tools/Scripts/webkitpy/port/ios.py", line 66, in __init__ > super(IOSPort, self).__init__(*args, **kwargs) > File "Tools/Scripts/webkitpy/port/apple.py", line 88, in __init__ > assert port_name in allowed_port_names, "%s is not in %s" % (port_name, > allowed_port_names) > AssertionError: ios-simulator is not in ['ios-7', 'ios-8', 'ios-future'] > > (Without the patch applied, everything works as expected.) > > Need to fix that issue first. Sigh. In webkitpy/port/factory.py, PortFactory.get() does prefix matching on the PORT_CLASSES list. Because "IOSPort" appears in the list before "IOSSimulatorPort", the IOSPort.port_name ("ios") is a prefix of "ios-simulator" (the port_name derived from the --ios-simulator command line switch), so IOSPort is chosen instead of IOSSimulatorPort. The reason using "ios-device" for the port name worked before is that "ios-device" is not a prefix of "ios-simulator", so IOSPort was not used (and IOSSimulatorPort was chosen instead). The easiest solution is to make sure PortFactory.PORT_CLASSES always lists "more specific" ports first when port_name values have a common prefix. 1062258 11 244876 ddkilzer 2015-01-18 21:06:22 -0800 Created attachment 244876 Patch v3 1062262 12 244876 dbates 2015-01-18 21:28:05 -0800 Comment on attachment 244876 Patch v3 View in context: https://bugs.webkit.org/attachment.cgi?id=244876&action=review > Tools/ChangeLog:22 > + (PortFactory): Re-order PORT_CLASSES so ios.IOSSimulatorPort > + appears before ios.IOSPort. If this is not done, > + `run-webkit-tests --ios-simulator` will get the wrong Port class > + (IOSPort instead of IOSSimulatorPort) due to the way that > + PortFactory.get() uses prefix matching of <Port>.port_name to > + find the correct class to use. The approach taken in this patch to re-order the array values in PortFactory.PORT_CLASSES is OK. We may want to investigate using strict equality instead of prefix matching in PortFactory.get(). > Tools/Scripts/webkitpy/port/ios.py:49 > + VERSION_FALLBACK_ORDER = ['ios-7', 'ios-8'] I take it we plan to build for iOS 7? 1062269 13 ddkilzer 2015-01-18 22:31:46 -0800 (In reply to comment #12) > Comment on attachment 244876 [details] > Patch v3 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=244876&action=review > > > Tools/ChangeLog:22 > > + (PortFactory): Re-order PORT_CLASSES so ios.IOSSimulatorPort > > + appears before ios.IOSPort. If this is not done, > > + `run-webkit-tests --ios-simulator` will get the wrong Port class > > + (IOSPort instead of IOSSimulatorPort) due to the way that > > + PortFactory.get() uses prefix matching of <Port>.port_name to > > + find the correct class to use. > > The approach taken in this patch to re-order the array values in > PortFactory.PORT_CLASSES is OK. We may want to investigate using strict > equality instead of prefix matching in PortFactory.get(). Yes, that would be the preferred, long-term fix. > > Tools/Scripts/webkitpy/port/ios.py:49 > > + VERSION_FALLBACK_ORDER = ['ios-7', 'ios-8'] > > I take it we plan to build for iOS 7? No, adding 'ios-7' was a workaround to make test-webkitpy pass on systems with 10.8 and 10.9 SDKs installed. See comments in Bug 140476 Comment #16 for more details. 1062278 14 244876 commit-queue 2015-01-18 23:15:36 -0800 Comment on attachment 244876 Patch v3 Clearing flags on attachment: 244876 Committed r178641: <http://trac.webkit.org/changeset/178641> 1062279 15 commit-queue 2015-01-18 23:15:42 -0800 All reviewed patches have been landed. Closing bug. 244845 2015-01-17 16:52:18 -0800 2015-01-17 18:38:22 -0800 Patch v1 bug-140585-20150117165224.patch text/plain 5269 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NjI1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTZkOGQ1ZjY3ZjQxY2ViZjI5NWZlYmNiY2FkNjgwM2Rk MDNlOGE3Zi4uODUxNjRjMWU5NWE5YmZkZWVkZTU3YzRlM2QzNjZhZDA0Y2MxMWRkZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4 IEBACiAyMDE1LTAxLTE3ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKKyAg ICAgICAgaU9TIERldmljZSBFV1MgcXVldWUgbXVzdCBiZSBuYW1lZCBpb3MtZGV2aWNlLWV3cwor ICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi8xNDA1ODU+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBFV1NUb29scy9zdGFydC1xdWV1ZS1tYWMu c2g6IFVwZGF0ZSBmb3IgcmVuYW1lIG9mICdpb3MtZXdzJyB0bworICAgICAgICAnaW9zLWRldmlj ZS1ld3MnLgorICAgICAgICAqIFF1ZXVlU3RhdHVzU2VydmVyL2NvbmZpZy9xdWV1ZXMucHk6IERp dHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9ld3MuanNvbjog UmVuYW1lICdpT1MgRVdTJyB0bworICAgICAgICAnaU9TIERldmljZSBFV1MnLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weTogUmVuYW1lIElPU1BvcnQg dG8KKyAgICAgICAgSU9TRGV2aWNlUG9ydC4KKyAgICAgICAgKERlcHJlY2F0ZWRQb3J0LnBvcnQp OgorICAgICAgICAoSU9TRGV2aWNlUG9ydCk6CisgICAgICAgIChJT1NEZXZpY2VQb3J0LmJ1aWxk X3dlYmtpdF9jb21tYW5kKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZmFjdG9y eS5weTogRGl0dG8uCisgICAgICAgIChQb3J0RmFjdG9yeSk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9wb3J0L2lvcy5weTogRGl0dG8uCisgICAgICAgIChJT1NEZXZpY2VQb3J0KToKKyAg ICAgICAgKElPU0RldmljZVBvcnQuX19pbml0X18pOgorCisyMDE1LTAxLTE3ICBEYXZpZCBLaWx6 ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKICAgICAgICAgQXR0ZW1wdCB0byBmaXggd2Via2l0 cHkgdGVzdHMgb24gTW91bnRhaW4gTGlvbiwgTWF2ZXJpY2tzIGJvdHMKIAogICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHk6CmRpZmYgLS1naXQgYS9Ub29scy9FV1NUb29scy9z dGFydC1xdWV1ZS1tYWMuc2ggYi9Ub29scy9FV1NUb29scy9zdGFydC1xdWV1ZS1tYWMuc2gKaW5k ZXggODgyODUxMzY3YmNkMzQxNWI2NGJlMGJhZjZkMDBlODAzYWRjMjkyMS4uNzNhN2IwMjhmNWJl ZjgzZjEzZDA2OTk2YTAwNTQwM2UzYzNmODc0OSAxMDA3NTUKLS0tIGEvVG9vbHMvRVdTVG9vbHMv c3RhcnQtcXVldWUtbWFjLnNoCisrKyBiL1Rvb2xzL0VXU1Rvb2xzL3N0YXJ0LXF1ZXVlLW1hYy5z aApAQCAtNDMsNyArNDMsNyBAQCBFV1NfSE9NRT0vVm9sdW1lcy9EYXRhL0VXUwogV0VCS0lUX0hP TUU9JEVXU19IT01FL1dlYktpdAogCiAjIElmIGJ1aWxkaW5nIGZvciBpT1MsIG1ha2Ugc3VyZSB3 ZSBydW4gdGhpcyBzY3JpcHQgdG8gbWFrZSBpdCBwb3NzaWJsZSB0byBidWlsZCBmcmFtZXdvcmtz LgotaWYgWyAiJFFVRVVFX05BTUUiID09ICJpb3MtZXdzIiBdOyB0aGVuCitpZiBbICIkUVVFVUVf TkFNRSIgPT0gImlvcy1kZXZpY2UtZXdzIiBdOyB0aGVuCiAgICAgKGNkICRXRUJLSVRfSE9NRTsg c3VkbyAuL1Rvb2xzL1NjcmlwdHMvY29uZmlndXJlLXhjb2RlLWZvci1pb3MtZGV2ZWxvcG1lbnQp CiBmaQogCmRpZmYgLS1naXQgYS9Ub29scy9RdWV1ZVN0YXR1c1NlcnZlci9jb25maWcvcXVldWVz LnB5IGIvVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvY29uZmlnL3F1ZXVlcy5weQppbmRleCBkZGRk NWU4M2RmYzE1MDI4ZGVjZTI5Zjk5ZTQ0ZGEzNmRkM2NlNGU5Li5mNDkyZTVjZGQyM2JjNjQwOWIy ZDBhOGNlODZmOGFiNDA5NzY5ZDRiIDEwMDY0NAotLS0gYS9Ub29scy9RdWV1ZVN0YXR1c1NlcnZl ci9jb25maWcvcXVldWVzLnB5CisrKyBiL1Rvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL2NvbmZpZy9x dWV1ZXMucHkKQEAgLTM0LDcgKzM0LDcgQEAgYWxsX3F1ZXVlX25hbWVzID0gWwogICAgICJjb21t aXQtcXVldWUiLAogICAgICJzdHlsZS1xdWV1ZSIsCiAgICAgImd0ay13azItZXdzIiwKLSAgICAi aW9zLWV3cyIsCisgICAgImlvcy1kZXZpY2UtZXdzIiwKICAgICAibWFjLWV3cyIsCiAgICAgIm1h Yy13azItZXdzIiwKICAgICAid2luLWV3cyIsCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9jb25maWcvZXdzLmpzb24gYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jb25maWcvZXdzLmpzb24KaW5kZXggYjJlY2RhM2I0ZjA1MTg3MTE2OWFkODlmY2U5Yjdk MTlkZmMyMWY3Ni4uNDcxYTk5OGIzZWFmM2FkM2I2NmJiMTA0ZWFhZGQ5NDI3YTU1OTk5ZiAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2V3cy5qc29uCisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9ld3MuanNvbgpAQCAtMTQs NyArMTQsNyBAQAogICAgICJXaW4gRVdTIjogewogICAgICAgICAicG9ydCI6ICJ3aW4iCiAgICAg fSwKLSAgICAiaU9TIEVXUyI6IHsKKyAgICAiaU9TIERldmljZSBFV1MiOiB7CiAgICAgICAgICJw b3J0IjogImlvcy1kZXZpY2UiLAogICAgICAgICAiYXJjaGl0ZWN0dXJlIjogImFybXY3IgogICAg IH0sCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9y dHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHkKaW5k ZXggMDQyZTg5NmJiNzhmZDAxZTVmZGM2MDMwYzRlNWJkMmYzNWI3MzlhZS4uMmRlMDYyNmExZTU1 MjRjZDRiYzNlMDU5ODZjMDk3MjhhMDI2YjlhZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weQpAQCAtNjQsNyArNjQsNyBAQCBjbGFzcyBEZXByZWNh dGVkUG9ydChvYmplY3QpOgogICAgIGRlZiBwb3J0KHBvcnRfbmFtZSk6CiAgICAgICAgIHBvcnRz ID0gewogICAgICAgICAgICAgImd0ay13azIiOiBHdGtXSzJQb3J0LAotICAgICAgICAgICAgImlv cy1kZXZpY2UiOiBJT1NQb3J0LAorICAgICAgICAgICAgImlvcy1kZXZpY2UiOiBJT1NEZXZpY2VQ b3J0LAogICAgICAgICAgICAgIm1hYyI6IE1hY1BvcnQsCiAgICAgICAgICAgICAibWFjLXdrMiI6 IE1hY1dLMlBvcnQsCiAgICAgICAgICAgICAid2luIjogV2luUG9ydCwKQEAgLTEyMCwxMSArMTIw LDExIEBAIGNsYXNzIERlcHJlY2F0ZWRQb3J0KG9iamVjdCk6CiAgICAgICAgIHJldHVybiBzZWxm LnNjcmlwdF9zaGVsbF9jb21tYW5kKCJydW4tYmluZGluZ3MtdGVzdHMiKQogCiAKLWNsYXNzIElP U1BvcnQoRGVwcmVjYXRlZFBvcnQpOgorY2xhc3MgSU9TRGV2aWNlUG9ydChEZXByZWNhdGVkUG9y dCk6CiAgICAgcG9ydF9mbGFnX25hbWUgPSAiaW9zLWRldmljZSIKIAogICAgIGRlZiBidWlsZF93 ZWJraXRfY29tbWFuZChzZWxmLCBidWlsZF9zdHlsZT1Ob25lKToKLSAgICAgICAgY29tbWFuZCA9 IHN1cGVyKElPU1BvcnQsIHNlbGYpLmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPWJ1 aWxkX3N0eWxlKQorICAgICAgICBjb21tYW5kID0gc3VwZXIoSU9TRGV2aWNlUG9ydCwgc2VsZiku YnVpbGRfd2Via2l0X2NvbW1hbmQoYnVpbGRfc3R5bGU9YnVpbGRfc3R5bGUpCiAgICAgICAgIGNv bW1hbmQuYXBwZW5kKCItLXNkaz1pcGhvbmVvcyIpCiAgICAgICAgIHJldHVybiBjb21tYW5kCiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9mYWN0b3J5LnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ZhY3RvcnkucHkKaW5kZXggNTQyMzc5Y2I1OGQzNWVh ZTYwM2JhMWFlMDk0ZmY0ZGE4YmY2MWQ3ZC4uMmQ2ZGQ1YzRiOTdlZTM4M2I4OTY5YzJiNzFiN2Nh NDJiMmJhMDAwMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ZhY3Rv cnkucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ZhY3RvcnkucHkKQEAgLTgz LDcgKzgzLDcgQEAgY2xhc3MgUG9ydEZhY3Rvcnkob2JqZWN0KToKICAgICBQT1JUX0NMQVNTRVMg PSAoCiAgICAgICAgICdlZmwuRWZsUG9ydCcsCiAgICAgICAgICdndGsuR3RrUG9ydCcsCi0gICAg ICAgICdpb3MuSU9TUG9ydCcsCisgICAgICAgICdpb3MuSU9TRGV2aWNlUG9ydCcsCiAgICAgICAg ICdpb3MuSU9TU2ltdWxhdG9yUG9ydCcsCiAgICAgICAgICdtYWMuTWFjUG9ydCcsCiAgICAgICAg ICdtb2NrX2RydC5Nb2NrRFJUUG9ydCcsCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvaW9zLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5weQppbmRl eCBhMWM3OWJlOGU3NjYzYzNmNTZhMmQ1NTc4ZjhkOTA4MWY0MWFjODc1Li5lNDAzNTY2N2NhMDlh YWFjZDlhMzE2NWJiNWRiNjk4NmM5MmFkNzQ1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvaW9zLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Mu cHkKQEAgLTQyLDcgKzQyLDcgQEAgZnJvbSB3ZWJraXRweS54Y29kZSBpbXBvcnQgc2ltdWxhdG9y CiBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKIAotY2xhc3MgSU9TUG9ydChB cHBsZVBvcnQpOgorY2xhc3MgSU9TRGV2aWNlUG9ydChBcHBsZVBvcnQpOgogICAgIHBvcnRfbmFt ZSA9ICJpb3MtZGV2aWNlIgogCiAgICAgQVJDSElURUNUVVJFUyA9IFsnYXJtdjcnLCAnYXJtdjdz JywgJ2FybTY0J10KQEAgLTYzLDcgKzYzLDcgQEAgY2xhc3MgSU9TUG9ydChBcHBsZVBvcnQpOgog ICAgICAgICByZXR1cm4gcG9ydF9uYW1lCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgKmFyZ3Ms ICoqa3dhcmdzKToKLSAgICAgICAgc3VwZXIoSU9TUG9ydCwgc2VsZikuX19pbml0X18oKmFyZ3Ms ICoqa3dhcmdzKQorICAgICAgICBzdXBlcihJT1NEZXZpY2VQb3J0LCBzZWxmKS5fX2luaXRfXygq YXJncywgKiprd2FyZ3MpCiAKICAgICAgICAgc2VsZi5fYXJjaGl0ZWN0dXJlID0gc2VsZi5nZXRf b3B0aW9uKCdhcmNoaXRlY3R1cmUnKQogCg== 244848 2015-01-17 18:53:05 -0800 2015-01-18 21:06:11 -0800 Patch v2 bug-140585-20150117185311.patch text/plain 2874 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NjI1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTZkOGQ1ZjY3ZjQxY2ViZjI5NWZlYmNiY2FkNjgwM2Rk MDNlOGE3Zi4uMjc3NTFlODlkMjA4NGFhOTdjZjVkZGEyMTAxZjFiM2Q2MjQzY2JlZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIw IEBACiAyMDE1LTAxLTE3ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKKyAg ICAgICAgaU9TIEVXUyBxdWV1ZSBuYW1lIHNob3VsZCBiZSBjb25zaXN0ZW50CisgICAgICAgIDxo dHRwOi8vd2Via2l0Lm9yZy9iLzE0MDU4NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9ld3Mu anNvbjogUmVuYW1lICdpb3MtZGV2aWNlJworICAgICAgICB0byAnaW9zJy4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHk6IERpdHRvLgorICAgICAgICAo RGVwcmVjYXRlZFBvcnQucG9ydCk6CisgICAgICAgIChJT1NQb3J0KToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5OiBEaXR0by4KKyAgICAgICAgKElPU1BvcnQpOgorCisy MDE1LTAxLTE3ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKICAgICAgICAg QXR0ZW1wdCB0byBmaXggd2Via2l0cHkgdGVzdHMgb24gTW91bnRhaW4gTGlvbiwgTWF2ZXJpY2tz IGJvdHMKIAogICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHk6CmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvZXdzLmpzb24gYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvZXdzLmpzb24KaW5kZXggYjJlY2RhM2I0 ZjA1MTg3MTE2OWFkODlmY2U5YjdkMTlkZmMyMWY3Ni4uMDNlMzhkZGNlYjkwOGRmZjg1MzI2ODMw ZDQwYmFjZmQ5YzliMjY0NiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vY29uZmlnL2V3cy5qc29uCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2Nv bmZpZy9ld3MuanNvbgpAQCAtMTUsNyArMTUsNyBAQAogICAgICAgICAicG9ydCI6ICJ3aW4iCiAg ICAgfSwKICAgICAiaU9TIEVXUyI6IHsKLSAgICAgICAgInBvcnQiOiAiaW9zLWRldmljZSIsCisg ICAgICAgICJwb3J0IjogImlvcyIsCiAgICAgICAgICJhcmNoaXRlY3R1cmUiOiAiYXJtdjciCiAg ICAgfSwKICAgICAiTWFjIEVXUyI6IHsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L2NvbmZpZy9wb3J0cy5weQppbmRleCAwNDJlODk2YmI3OGZkMDFlNWZkYzYwMzBjNGU1YmQyZjM1 YjczOWFlLi5iMjdiOTQ0NmU5MDNlZDAxMjI4M2QzMzc2YWVlZjNkMzFiNzA5NDljIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5CkBAIC02NCw3ICs2 NCw3IEBAIGNsYXNzIERlcHJlY2F0ZWRQb3J0KG9iamVjdCk6CiAgICAgZGVmIHBvcnQocG9ydF9u YW1lKToKICAgICAgICAgcG9ydHMgPSB7CiAgICAgICAgICAgICAiZ3RrLXdrMiI6IEd0a1dLMlBv cnQsCi0gICAgICAgICAgICAiaW9zLWRldmljZSI6IElPU1BvcnQsCisgICAgICAgICAgICAiaW9z IjogSU9TUG9ydCwKICAgICAgICAgICAgICJtYWMiOiBNYWNQb3J0LAogICAgICAgICAgICAgIm1h Yy13azIiOiBNYWNXSzJQb3J0LAogICAgICAgICAgICAgIndpbiI6IFdpblBvcnQsCkBAIC0xMjEs NyArMTIxLDcgQEAgY2xhc3MgRGVwcmVjYXRlZFBvcnQob2JqZWN0KToKIAogCiBjbGFzcyBJT1NQ b3J0KERlcHJlY2F0ZWRQb3J0KToKLSAgICBwb3J0X2ZsYWdfbmFtZSA9ICJpb3MtZGV2aWNlIgor ICAgIHBvcnRfZmxhZ19uYW1lID0gImlvcyIKIAogICAgIGRlZiBidWlsZF93ZWJraXRfY29tbWFu ZChzZWxmLCBidWlsZF9zdHlsZT1Ob25lKToKICAgICAgICAgY29tbWFuZCA9IHN1cGVyKElPU1Bv cnQsIHNlbGYpLmJ1aWxkX3dlYmtpdF9jb21tYW5kKGJ1aWxkX3N0eWxlPWJ1aWxkX3N0eWxlKQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHkKaW5kZXggYTFjNzliZThlNzY2M2MzZjU2YTJkNTU3 OGY4ZDkwODFmNDFhYzg3NS4uNzEwYTI3ZGM3MzBkYTA0YzUxMjE5ODlmNDA2MGFmOTZlMWZlMTcw ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5CkBAIC00MywxMCArNDMsMTAgQEAgX2xv ZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCiAKIGNsYXNzIElPU1BvcnQoQXBwbGVQ b3J0KToKLSAgICBwb3J0X25hbWUgPSAiaW9zLWRldmljZSIKKyAgICBwb3J0X25hbWUgPSAiaW9z IgogCiAgICAgQVJDSElURUNUVVJFUyA9IFsnYXJtdjcnLCAnYXJtdjdzJywgJ2FybTY0J10KLSAg ICBWRVJTSU9OX0ZBTExCQUNLX09SREVSID0gWydpb3MtZGV2aWNlLTcnLCAnaW9zLWRldmljZS04 J10KKyAgICBWRVJTSU9OX0ZBTExCQUNLX09SREVSID0gWydpb3MtNycsICdpb3MtOCddCiAKICAg ICBAY2xhc3NtZXRob2QKICAgICBkZWYgZGV0ZXJtaW5lX2Z1bGxfcG9ydF9uYW1lKGNscywgaG9z dCwgb3B0aW9ucywgcG9ydF9uYW1lKToK 244876 2015-01-18 21:06:22 -0800 2015-01-18 23:15:36 -0800 Patch v3 bug-140585-20150118210629.patch text/plain 4429 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NjI1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTZkOGQ1ZjY3ZjQxY2ViZjI5NWZlYmNiY2FkNjgwM2Rk MDNlOGE3Zi4uMzdlMDc5NTM1NDc0MWE4YmFiMTJiN2QwZTdkNjhjNDQwZjg1YzVjYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDE1LTAxLTE4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CisKKyAg ICAgICAgaU9TIEVXUyBxdWV1ZSBuYW1lIHNob3VsZCBiZSBjb25zaXN0ZW50CisgICAgICAgIDxo dHRwOi8vd2Via2l0Lm9yZy9iLzE0MDU4NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9ld3Mu anNvbjogUmVuYW1lICdpb3MtZGV2aWNlJworICAgICAgICB0byAnaW9zJy4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMucHk6IERpdHRvLgorICAgICAgICAo RGVwcmVjYXRlZFBvcnQucG9ydCk6CisgICAgICAgIChJT1NQb3J0KToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5OiBEaXR0by4KKyAgICAgICAgKElPU1BvcnQpOgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2ZhY3RvcnkucHk6CisgICAgICAgIChQb3J0 RmFjdG9yeSk6IFJlLW9yZGVyIFBPUlRfQ0xBU1NFUyBzbyBpb3MuSU9TU2ltdWxhdG9yUG9ydAor ICAgICAgICBhcHBlYXJzIGJlZm9yZSBpb3MuSU9TUG9ydC4gIElmIHRoaXMgaXMgbm90IGRvbmUs CisgICAgICAgIGBydW4td2Via2l0LXRlc3RzIC0taW9zLXNpbXVsYXRvcmAgd2lsbCBnZXQgdGhl IHdyb25nIFBvcnQgY2xhc3MKKyAgICAgICAgKElPU1BvcnQgaW5zdGVhZCBvZiBJT1NTaW11bGF0 b3JQb3J0KSBkdWUgdG8gdGhlIHdheSB0aGF0CisgICAgICAgIFBvcnRGYWN0b3J5LmdldCgpIHVz ZXMgcHJlZml4IG1hdGNoaW5nIG9mIDxQb3J0Pi5wb3J0X25hbWUgdG8KKyAgICAgICAgZmluZCB0 aGUgY29ycmVjdCBjbGFzcyB0byB1c2UuCisKIDIwMTUtMDEtMTcgIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGFwcGxlLmNvbT4KIAogICAgICAgICBBdHRlbXB0IHRvIGZpeCB3ZWJraXRweSB0ZXN0 cyBvbiBNb3VudGFpbiBMaW9uLCBNYXZlcmlja3MgYm90cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL2V3cy5qc29uIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY29uZmlnL2V3cy5qc29uCmluZGV4IGIyZWNkYTNiNGYwNTE4NzExNjlhZDg5 ZmNlOWI3ZDE5ZGZjMjFmNzYuLjAzZTM4ZGRjZWI5MDhkZmY4NTMyNjgzMGQ0MGJhY2ZkOWM5YjI2 NDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9ld3Mu anNvbgorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvZXdzLmpzb24K QEAgLTE1LDcgKzE1LDcgQEAKICAgICAgICAgInBvcnQiOiAid2luIgogICAgIH0sCiAgICAgImlP UyBFV1MiOiB7Ci0gICAgICAgICJwb3J0IjogImlvcy1kZXZpY2UiLAorICAgICAgICAicG9ydCI6 ICJpb3MiLAogICAgICAgICAiYXJjaGl0ZWN0dXJlIjogImFybXY3IgogICAgIH0sCiAgICAgIk1h YyBFV1MiOiB7CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25m aWcvcG9ydHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHMu cHkKaW5kZXggMDQyZTg5NmJiNzhmZDAxZTVmZGM2MDMwYzRlNWJkMmYzNWI3MzlhZS4uYjI3Yjk0 NDZlOTAzZWQwMTIyODNkMzM3NmFlZWYzZDMxYjcwOTQ5YyAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5weQpAQCAtNjQsNyArNjQsNyBAQCBjbGFzcyBE ZXByZWNhdGVkUG9ydChvYmplY3QpOgogICAgIGRlZiBwb3J0KHBvcnRfbmFtZSk6CiAgICAgICAg IHBvcnRzID0gewogICAgICAgICAgICAgImd0ay13azIiOiBHdGtXSzJQb3J0LAotICAgICAgICAg ICAgImlvcy1kZXZpY2UiOiBJT1NQb3J0LAorICAgICAgICAgICAgImlvcyI6IElPU1BvcnQsCiAg ICAgICAgICAgICAibWFjIjogTWFjUG9ydCwKICAgICAgICAgICAgICJtYWMtd2syIjogTWFjV0sy UG9ydCwKICAgICAgICAgICAgICJ3aW4iOiBXaW5Qb3J0LApAQCAtMTIxLDcgKzEyMSw3IEBAIGNs YXNzIERlcHJlY2F0ZWRQb3J0KG9iamVjdCk6CiAKIAogY2xhc3MgSU9TUG9ydChEZXByZWNhdGVk UG9ydCk6Ci0gICAgcG9ydF9mbGFnX25hbWUgPSAiaW9zLWRldmljZSIKKyAgICBwb3J0X2ZsYWdf bmFtZSA9ICJpb3MiCiAKICAgICBkZWYgYnVpbGRfd2Via2l0X2NvbW1hbmQoc2VsZiwgYnVpbGRf c3R5bGU9Tm9uZSk6CiAgICAgICAgIGNvbW1hbmQgPSBzdXBlcihJT1NQb3J0LCBzZWxmKS5idWls ZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT1idWlsZF9zdHlsZSkKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9mYWN0b3J5LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2ZhY3RvcnkucHkKaW5kZXggNTQyMzc5Y2I1OGQzNWVhZTYwM2JhMWFlMDk0ZmY0 ZGE4YmY2MWQ3ZC4uMTc3MTY1OGEwMmI1NmRiYjUxYjdlZTFmMTExM2YzNmM5MGVjYTJmYiAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ZhY3RvcnkucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ZhY3RvcnkucHkKQEAgLTgwLDExICs4MCwxOSBAQCBk ZWYgX2J1aWxkZXJfb3B0aW9ucyhidWlsZGVyX25hbWUpOgogCiAKIGNsYXNzIFBvcnRGYWN0b3J5 KG9iamVjdCk6CisgICAgIyBPcmRlciBtYXR0ZXJzLiAgRm9yIHBvcnQgY2xhc3NlcyB0aGF0IGhh dmUgYSBwb3J0X25hbWUgd2l0aCBhCisgICAgIyBjb21tb24gcHJlZml4LCB0aGUgbW9yZSBzcGVj aWZpYyBwb3J0IGNsYXNzIHNob3VsZCBiZSBsaXN0ZWQKKyAgICAjIGZpcnN0LiAgRm9yIGV4YW1w bGUsICdpb3MuSU9TU2ltdWxhdG9yUG9ydCcgKHBvcnRfbmFtZT0naW9zLXNpbXVsYXRvcicpCisg ICAgIyBzaG91bGQgYmUgbGlzdGVkIGJlZm9yZSAnaW9zLklPU1BvcnQnIChwb3J0X25hbWU9J2lv cycpLiAgSWYgdGhpcworICAgICMgcnVsZSBpcyBub3QgZm9sbG93ZWQsIHRoZW4gYHdlYmtpdC1w YXRjaCAtLWlvcy1zaW11bGF0b3JgIHdpbGwgdHJ5CisgICAgIyB0byB1c2UgSU9TUG9ydCBpbnN0 ZWFkIG9mIElPU1NpbXVsYXRvclBvcnQgYmVjYXVzZSAnaW9zJworICAgICMgKElPU1BvcnQucG9y dF9uYW1lKSBpcyBhIHByZWZpeCBvZiAnaW9zLXNpbXVsYXRvcicgKHBvcnRfbmFtZQorICAgICMg ZGVyaXZlZCBmcm9tICctLWlvcy1zaW11bGF0b3InIGNvbW1hbmQtbGluZSBzd2l0Y2gpLCBmb3Ig ZXhhbXBsZS4KICAgICBQT1JUX0NMQVNTRVMgPSAoCiAgICAgICAgICdlZmwuRWZsUG9ydCcsCiAg ICAgICAgICdndGsuR3RrUG9ydCcsCi0gICAgICAgICdpb3MuSU9TUG9ydCcsCiAgICAgICAgICdp b3MuSU9TU2ltdWxhdG9yUG9ydCcsCisgICAgICAgICdpb3MuSU9TUG9ydCcsCiAgICAgICAgICdt YWMuTWFjUG9ydCcsCiAgICAgICAgICdtb2NrX2RydC5Nb2NrRFJUUG9ydCcsCiAgICAgICAgICd0 ZXN0LlRlc3RQb3J0JywKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9p b3MucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5CmluZGV4IGExYzc5YmU4 ZTc2NjNjM2Y1NmEyZDU1NzhmOGQ5MDgxZjQxYWM4NzUuLjcxMGEyN2RjNzMwZGEwNGM1MTIxOTg5 ZjQwNjBhZjk2ZTFmZTE3MGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC9pb3MucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5weQpAQCAtNDMs MTAgKzQzLDEwIEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogCiBjbGFz cyBJT1NQb3J0KEFwcGxlUG9ydCk6Ci0gICAgcG9ydF9uYW1lID0gImlvcy1kZXZpY2UiCisgICAg cG9ydF9uYW1lID0gImlvcyIKIAogICAgIEFSQ0hJVEVDVFVSRVMgPSBbJ2FybXY3JywgJ2FybXY3 cycsICdhcm02NCddCi0gICAgVkVSU0lPTl9GQUxMQkFDS19PUkRFUiA9IFsnaW9zLWRldmljZS03 JywgJ2lvcy1kZXZpY2UtOCddCisgICAgVkVSU0lPTl9GQUxMQkFDS19PUkRFUiA9IFsnaW9zLTcn LCAnaW9zLTgnXQogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIGRldGVybWluZV9mdWxsX3Bv cnRfbmFtZShjbHMsIGhvc3QsIG9wdGlvbnMsIHBvcnRfbmFtZSk6Cg==