171881 2017-05-09 13:39:47 -0700 webkitpy: Run sample/spindump on iOS devices 2017-06-08 13:39:05 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain buildbot commit-queue dbates ddkilzer glenn lforschler webkit-bug-importer oldest_to_newest 1306533 0 jbedard 2017-05-09 13:39:47 -0700 We should enable running both sample and spindump on iOS devices. 1306534 1 webkit-bug-importer 2017-05-09 13:40:21 -0700 <rdar://problem/32084602> 1306575 2 309542 jbedard 2017-05-09 14:33:57 -0700 Created attachment 309542 Patch 1316505 3 312191 jbedard 2017-06-07 09:16:14 -0700 Created attachment 312191 Patch 1316572 4 312191 aakash_jain 2017-06-07 11:59:48 -0700 Comment on attachment 312191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312191&action=review looks fine to me. > Tools/ChangeLog:3 > + webkitpy: Preform sample/spindump on iOS devices "Preform" seems like a typo. 1316589 5 312191 dbates 2017-06-07 12:50:44 -0700 Comment on attachment 312191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312191&action=review > Tools/Scripts/webkitpy/port/darwin.py:155 > + def _need_sudo_for_root(): Can we make use of PlatformInfo to avoid the need to add such a method? > Tools/Scripts/webkitpy/port/darwin.py:181 > + DarwinPort.sample_file_path(host, name, pid, self.results_directory())) This change seems like an unrelated bug fix. In general, a bug/patch should fix one issue. If we have unit tests for this code then it would be good to add a test for this change. If it is not possible to write a test for this change and you feel it is excessive to file a new bug for this change then please add a remark to the ChangeLog for this change. > Tools/Scripts/webkitpy/port/darwin.py:186 > + DarwinPort.spindump_file_path(host, name, pid, self.results_directory())) Ditto. 1316592 6 312191 jbedard 2017-06-07 12:58:09 -0700 Comment on attachment 312191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312191&action=review >> Tools/Scripts/webkitpy/port/darwin.py:155 >> + def _need_sudo_for_root(): > > Can we make use of PlatformInfo to avoid the need to add such a method? Yes, we could directly check if the platform is iOS. >> Tools/Scripts/webkitpy/port/darwin.py:181 >> + DarwinPort.sample_file_path(host, name, pid, self.results_directory())) > > This change seems like an unrelated bug fix. In general, a bug/patch should fix one issue. If we have unit tests for this code then it would be good to add a test for this change. If it is not possible to write a test for this change and you feel it is excessive to file a new bug for this change then please add a remark to the ChangeLog for this change. Actually, this is a change which shouldn't be here at all. The previous code is correct. 1316600 7 312214 jbedard 2017-06-07 13:10:52 -0700 Created attachment 312214 Patch 1316615 8 312214 dbates 2017-06-07 13:43:38 -0700 Comment on attachment 312214 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312214&action=review > Tools/Scripts/webkitpy/port/darwin.py:157 > + command_begin = ['/usr/bin/sudo', '-n'] if self.host.platform.is_ios() else [] We should only call sudo if the platform is Mac. On another note, can we come up with a better name? command_prefix? > Tools/Scripts/webkitpy/port/darwin_testcase.py:108 > + command_begin = ['/usr/bin/sudo', '-n'] if port.host.platform.is_ios() else [] We should not be modifying the expected behavior of a test based on a variable as it negates the value of the test since if the test code is wrong then bugs in the real code can pass through undetected. We should have a separate test that mocks an iOS platform. > Tools/Scripts/webkitpy/port/darwin_testcase.py:117 > - if args[0] == '/usr/bin/sudo': > + if args[0] == '/usr/bin/sudo' or args[0] == '/usr/sbin/spindump': Similarly this test methodology is error prone. Hopefully this can be resolved once we do the above. > Tools/Scripts/webkitpy/port/darwin_testcase.py:132 > + if args[0] == '/usr/bin/sudo' or args[0] == '/usr/sbin/spindump': Ditto. 1316685 9 312245 jbedard 2017-06-07 15:41:45 -0700 Created attachment 312245 Patch 1316781 10 312245 dbates 2017-06-07 20:08:22 -0700 Comment on attachment 312245 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312245&action=review > Tools/Scripts/webkitpy/port/darwin.py:159 > + str(pid), Is it necessary to stringify this? I thought Executive will do this for us. If so, then please remove the str(). > Tools/Scripts/webkitpy/port/darwin.py:160 > + '10', Similarly, do we need to stringify this? See my above remark. > Tools/Scripts/webkitpy/port/darwin.py:162 > + '-file', Ditto. > Tools/Scripts/webkitpy/port/darwin.py:165 > + command = ['/usr/bin/sudo', '-n'] + command if self.host.platform.is_mac() else command I suggest writing this as a single if statement without an else clause. > Tools/Scripts/webkitpy/port/darwin.py:171 > + str(pid), Do we need to stringify this? See my remark for line 159. > Tools/Scripts/webkitpy/port/darwin.py:172 > + '10', Ditto. > Tools/Scripts/webkitpy/port/darwin.py:173 > + '10', Ditto. > Tools/Scripts/webkitpy/port/darwin_testcase.py:107 > port.host.filesystem.files['/__im_tmp/tmp_0_/test-42-spindump.txt'] = 'Spindump file' We should move this test and the test you modify below as well as any other applicable ones to the test file for the Mac port. We should not be asserting Mac in this test because these tests should be applicable to all Darwin-based platforms. > Tools/Scripts/webkitpy/port/ios_device_unittest.py:32 > + os_name = 'ios' What do we use this class variable for? > Tools/Scripts/webkitpy/port/ios_device_unittest.py:82 > + raise ScriptError("MOCK script error") " => ' > Tools/Scripts/webkitpy/port/ios_simulator_unittest.py:33 > + os_name = 'mac' What do we use this class variable for? 1316908 11 312245 jbedard 2017-06-08 08:15:53 -0700 Comment on attachment 312245 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312245&action=review >> Tools/Scripts/webkitpy/port/darwin.py:159 >> + str(pid), > > Is it necessary to stringify this? I thought Executive will do this for us. If so, then please remove the str(). Yes, we do need to stringily this. >> Tools/Scripts/webkitpy/port/darwin_testcase.py:107 >> port.host.filesystem.files['/__im_tmp/tmp_0_/test-42-spindump.txt'] = 'Spindump file' > > We should move this test and the test you modify below as well as any other applicable ones to the test file for the Mac port. We should not be asserting Mac in this test because these tests should be applicable to all Darwin-based platforms. iOS-Simulator ports have an os_name of mac as well. This test definitely belongs in Darwin. I assert the os_name because spindump/sample may fail with the wrong os_name, and this failure is not very intuitive. This assert catches the root-cause of an issue which could break the rest of the test. >> Tools/Scripts/webkitpy/port/ios_device_unittest.py:32 >> + os_name = 'ios' > > What do we use this class variable for? This is used to define platform.os_name. >> Tools/Scripts/webkitpy/port/ios_simulator_unittest.py:33 >> + os_name = 'mac' > > What do we use this class variable for? See above. 1316959 12 312317 jbedard 2017-06-08 10:20:43 -0700 Created attachment 312317 Patch 1316961 13 jbedard 2017-06-08 10:22:25 -0700 Fixed the bug which made it necessary to stringify integers. Added a FixMe regarding the os_name, and removed the assert since after talking with Dan, the hope is that this is a temporary arrangement. 1317015 14 312317 dbates 2017-06-08 12:24:39 -0700 Comment on attachment 312317 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=312317&action=review > Tools/Scripts/webkitpy/port/darwin.py:165 > + command = ['/usr/bin/sudo', '-n'] + command if self.host.platform.is_mac() else command I take it you disagreed with by suggestion in comment #10 that it would be more idiomatic to write this line as a single if statement without an else clause: if self.host.platform.is_mac(): command = ['/usr/bin/sudo', '-n'] + command ? > Tools/Scripts/webkitpy/port/ios_device_unittest.py:50 > + I do not see the value of having this empty line and its presence is inconsistent with the lack of an empty line at the beginning of test_sample_process_exception(). I suggest we remove this empty line. > Tools/Scripts/webkitpy/port/ios_device_unittest.py:63 > + Ditto. 1317019 15 312335 jbedard 2017-06-08 13:01:13 -0700 Created attachment 312335 Patch for landing 1317030 16 312335 commit-queue 2017-06-08 13:39:04 -0700 Comment on attachment 312335 Patch for landing Clearing flags on attachment: 312335 Committed r217946: <http://trac.webkit.org/changeset/217946> 1317031 17 commit-queue 2017-06-08 13:39:05 -0700 All reviewed patches have been landed. Closing bug. 309542 2017-05-09 14:33:57 -0700 2017-06-07 09:16:12 -0700 Patch bug-171881-20170509143356.patch text/plain 5753 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNjU0MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI2IEBACisyMDE3LTA1LTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUHJlZm9ybSBzYW1wbGUvc3BpbmR1bXAgb24gaU9TIGRl dmljZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MTg4MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzIwODQ2MDI+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQv ZGFyd2luLnB5OgorICAgICAgICAoRGFyd2luUG9ydCk6CisgICAgICAgIChEYXJ3aW5Qb3J0Ll9u ZWVkX3N1ZG9fZm9yX3Jvb3QpOiBBZGQgZm9yIGlPUyBkZXZpY2VzLiBUcnVlIGJ5IGRlZmF1bHQu CisgICAgICAgIChEYXJ3aW5Qb3J0LnNhbXBsZV9wcm9jZXNzKTogT25seSBhZGQgc3VkbyBwcmVm aXggaWYgdGhlIHBsYXRmb3JtIG5lZWRzIHN1ZG8KKyAgICAgICAgdG8gcnVuIGEgY29tbWFuZCBh cyByb290LgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9kYXJ3aW5fdGVzdGNhc2Uu cHk6CisgICAgICAgIChEYXJ3aW5UZXN0LnRlc3Rfc3BpbmR1bXApOiBBY2NvdW50IGZvciBwb3J0 cyB3aGljaCBkbyBub3QgcnVuIHNwaW5kdW1wIHdpdGggc3Vkby4KKyAgICAgICAgKERhcndpblRl c3QudGVzdF9zYW1wbGVfcHJvY2Vzcy5sb2dnaW5nX3J1bl9jb21tYW5kKTogRGl0dG8uCisgICAg ICAgIChEYXJ3aW5UZXN0LnRlc3Rfc2FtcGxlX3Byb2Nlc3NfZXhjZXB0aW9uLnRocm93aW5nX3J1 bl9jb21tYW5kKTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19k ZXZpY2UucHk6CisgICAgICAgIChJT1NEZXZpY2VQb3J0Ll9uZWVkX3N1ZG9fZm9yX3Jvb3QpOiBS ZXR1cm4gZmFsc2UuCisgICAgICAgIChJT1NEZXZpY2VQb3J0Lmxvb2tfZm9yX25ld19zYW1wbGVz KTogRGVsZXRlZC4KKyAgICAgICAgKElPU0RldmljZVBvcnQuc2FtcGxlX3Byb2Nlc3MpOiBEZWxl dGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlX3VuaXR0ZXN0 LnB5OiBSZW1vdmVkIHNwZWNpYWwtY2FzZSBzcGluZHVtcCB0ZXN0cy4KKwogMjAxNy0wNS0wOSAg Sm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgYnVpbGQgSW1h Z2VEaWZmIHdpdGggaG9zdCBTREsgZnJvbSBNYWtlCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvZGFyd2luLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9kYXJ3aW4ucHkJKHJldmlzaW9uIDIxNjUzNSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC9kYXJ3aW4ucHkJKHdvcmtpbmcgY29weSkKQEAgLTEyMiwxMiArMTIyLDE1IEBAIGNs YXNzIERhcndpblBvcnQoQXBwbGVQb3J0KToKICAgICAgICAgYWxsX2NyYXNoX2xvZyA9IHNlbGYu X2xvb2tfZm9yX2FsbF9jcmFzaF9sb2dzX2luX2xvZ19kaXIoc3RhcnRfdGltZSkKICAgICAgICAg cmV0dXJuIHNlbGYuX21lcmdlX2NyYXNoX2xvZ3MoY3Jhc2hfbG9ncywgYWxsX2NyYXNoX2xvZywg Y3Jhc2hlZF9wcm9jZXNzZXMpCiAKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF9uZWVkX3N1 ZG9fZm9yX3Jvb3QoKToKKyAgICAgICAgcmV0dXJuIFRydWUKKwogICAgIGRlZiBzYW1wbGVfcHJv Y2VzcyhzZWxmLCBuYW1lLCBwaWQsIHRhcmdldF9ob3N0PU5vbmUpOgogICAgICAgICBob3N0ID0g dGFyZ2V0X2hvc3Qgb3Igc2VsZi5ob3N0CiAgICAgICAgIHRlbXBkaXIgPSBob3N0LmZpbGVzeXN0 ZW0ubWtkdGVtcCgpCi0gICAgICAgIGV4aXRfc3RhdHVzID0gaG9zdC5leGVjdXRpdmUucnVuX2Nv bW1hbmQoWwotICAgICAgICAgICAgIi91c3IvYmluL3N1ZG8iLAotICAgICAgICAgICAgIi1uIiwK KyAgICAgICAgY29tbWFuZF9iZWdpbiA9IFsnL3Vzci9iaW4vc3VkbycsICctbiddIGlmIHNlbGYu X25lZWRfc3Vkb19mb3Jfcm9vdCgpIGVsc2UgW10KKyAgICAgICAgZXhpdF9zdGF0dXMgPSBob3N0 LmV4ZWN1dGl2ZS5ydW5fY29tbWFuZChjb21tYW5kX2JlZ2luICsgWwogICAgICAgICAgICAgIi91 c3Ivc2Jpbi9zcGluZHVtcCIsCiAgICAgICAgICAgICBwaWQsCiAgICAgICAgICAgICAxMCwKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kYXJ3aW5fdGVzdGNhc2UucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rhcndpbl90ZXN0Y2FzZS5weQko cmV2aXNpb24gMjE2NTM1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rhcndpbl90 ZXN0Y2FzZS5weQkod29ya2luZyBjb3B5KQpAQCAtOTQsNyArOTQsOCBAQCBjbGFzcyBEYXJ3aW5U ZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDCiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9y dCgpCiAgICAgICAgIHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycvX19pbV90bXAvdG1wXzBf L3Rlc3QtNDItc3BpbmR1bXAudHh0J10gPSAnU3BpbmR1bXAgZmlsZScKICAgICAgICAgcG9ydC5o b3N0LmV4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKHJ1bl9jb21tYW5kX2ZuPWxvZ2dpbmdfcnVu X2NvbW1hbmQpCi0gICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICJbJy91c3IvYmluL3N1ZG8nLCAn LW4nLCAnL3Vzci9zYmluL3NwaW5kdW1wJywgNDIsIDEwLCAxMCwgJy1maWxlJywgJy9fX2ltX3Rt cC90bXBfMF8vdGVzdC00Mi1zcGluZHVtcC50eHQnXVxuIgorICAgICAgICBjb21tYW5kX2JlZ2lu ID0gWycvdXNyL2Jpbi9zdWRvJywgJy1uJ10gaWYgcG9ydC5fbmVlZF9zdWRvX2Zvcl9yb290KCkg ZWxzZSBbXQorICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSBzdHIoY29tbWFuZF9iZWdpbiArIFsn L3Vzci9zYmluL3NwaW5kdW1wJywgNDIsIDEwLCAxMCwgJy1maWxlJywgJy9fX2ltX3RtcC90bXBf MF8vdGVzdC00Mi1zcGluZHVtcC50eHQnXSkgKyAnXG4nCiAgICAgICAgIE91dHB1dENhcHR1cmUo KS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBwb3J0LnNhbXBsZV9wcm9jZXNzLCBhcmdzPVsndGVzdCcs IDQyXSwgZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91dCkKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChwb3J0Lmhvc3QuZmlsZXN5c3RlbS5maWxlc1snL21vY2stYnVpbGQvbGF5b3V0LXRl c3QtcmVzdWx0cy90ZXN0LTQyLXNwaW5kdW1wLnR4dCddLCAnU3BpbmR1bXAgZmlsZScpCiAgICAg ICAgIHNlbGYuYXNzZXJ0SXNOb25lKHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycvX19pbV90 bXAvdG1wXzBfL3Rlc3QtNDItc3BpbmR1bXAudHh0J10pCkBAIC0xMDIsNyArMTAzLDcgQEAgY2xh c3MgRGFyd2luVGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0QwogICAgIGRlZiB0ZXN0X3NhbXBs ZV9wcm9jZXNzKHNlbGYpOgogCiAgICAgICAgIGRlZiBsb2dnaW5nX3J1bl9jb21tYW5kKGFyZ3Mp OgotICAgICAgICAgICAgaWYgYXJnc1swXSA9PSAnL3Vzci9iaW4vc3Vkbyc6CisgICAgICAgICAg ICBpZiBhcmdzWzBdID09ICcvdXNyL2Jpbi9zdWRvJyBvciBhcmdzWzBdID09ICcvdXNyL3NiaW4v c3BpbmR1bXAnOgogICAgICAgICAgICAgICAgIHJldHVybiAxCiAgICAgICAgICAgICBwcmludCBh cmdzCiAgICAgICAgICAgICByZXR1cm4gMApAQCAtMTE3LDcgKzExOCw3IEBAIGNsYXNzIERhcndp blRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdEMKIAogICAgIGRlZiB0ZXN0X3NhbXBsZV9wcm9j ZXNzX2V4Y2VwdGlvbihzZWxmKToKICAgICAgICAgZGVmIHRocm93aW5nX3J1bl9jb21tYW5kKGFy Z3MpOgotICAgICAgICAgICAgaWYgYXJnc1swXSA9PSAnL3Vzci9iaW4vc3Vkbyc6CisgICAgICAg ICAgICBpZiBhcmdzWzBdID09ICcvdXNyL2Jpbi9zdWRvJyBvciBhcmdzWzBdID09ICcvdXNyL3Ni aW4vc3BpbmR1bXAnOgogICAgICAgICAgICAgICAgIHJldHVybiAxCiAgICAgICAgICAgICByYWlz ZSBTY3JpcHRFcnJvcigiTU9DSyBzY3JpcHQgZXJyb3IiKQogCkluZGV4OiBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZS5weQkocmV2aXNpb24gMjE2NTM1KQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2UucHkJKHdvcmtpbmcgY29weSkKQEAgLTc0 LDExICs3NCw5IEBAIGNsYXNzIElPU0RldmljZVBvcnQoSU9TUG9ydCk6CiAgICAgZGVmIGxvb2tf Zm9yX25ld19jcmFzaF9sb2dzKHNlbGYsIGNyYXNoZWRfcHJvY2Vzc2VzLCBzdGFydF90aW1lKToK ICAgICAgICAgcmV0dXJuIHt9CiAKLSAgICBkZWYgbG9va19mb3JfbmV3X3NhbXBsZXMoc2VsZiwg dW5yZXNwb25zaXZlX3Byb2Nlc3Nlcywgc3RhcnRfdGltZSk6Ci0gICAgICAgIHJldHVybiB7fQot Ci0gICAgZGVmIHNhbXBsZV9wcm9jZXNzKHNlbGYsIG5hbWUsIHBpZCwgdGFyZ2V0X2hvc3Q9Tm9u ZSk6Ci0gICAgICAgIHBhc3MKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF9uZWVkX3N1ZG9f Zm9yX3Jvb3QoKToKKyAgICAgICAgcmV0dXJuIEZhbHNlCiAKICAgICAjIERlc3BpdGUgdGhlaXIg bmFtZXMsIHRoZXNlIGZsYWdzIGRvIG5vdCBhY3R1YWxseSBnZXQgcGFzc2VkIGFsbCB0aGUgd2F5 IGRvd24gdG8gd2Via2l0LWJ1aWxkLgogICAgIGRlZiBfYnVpbGRfZHJpdmVyX2ZsYWdzKHNlbGYp OgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2VfdW5pdHRlc3Qu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2Vf dW5pdHRlc3QucHkJKHJldmlzaW9uIDIxNjUzNSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9pb3NfZGV2aWNlX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zNiwxMyArMzYs MyBAQCBjbGFzcyBJT1NEZXZpY2VUZXN0KGlvc190ZXN0Y2FzZS5JT1NUZXN0CiAKICAgICBkZWYg dGVzdF9vcGVyYXRpbmdfc3lzdGVtKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdp b3MtZGV2aWNlJywgc2VsZi5tYWtlX3BvcnQoKS5vcGVyYXRpbmdfc3lzdGVtKCkpCi0KLSAgICAj IEZJWE1FOiBVcGRhdGUgdGVzdHMgd2hlbiA8cmRhcjovL3Byb2JsZW0vMzA0OTc5OTE+IGlzIGNv bXBsZXRlZC4KLSAgICBkZWYgdGVzdF9zcGluZHVtcChzZWxmKToKLSAgICAgICAgcGFzcwotCi0g ICAgZGVmIHRlc3Rfc2FtcGxlX3Byb2Nlc3Moc2VsZik6Ci0gICAgICAgIHBhc3MKLQotICAgIGRl ZiB0ZXN0X3NhbXBsZV9wcm9jZXNzX2V4Y2VwdGlvbihzZWxmKToKLSAgICAgICAgcGFzcwo= 312191 2017-06-07 09:16:14 -0700 2017-06-07 13:10:51 -0700 Patch bug-171881-20170607091613.patch text/plain 8617 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNzg4NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMzIEBACisyMDE3LTA2LTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUHJlZm9ybSBzYW1wbGUvc3BpbmR1bXAgb24gaU9TIGRl dmljZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3 MTg4MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzIwODQ2MDI+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3BpbmR1bXAgYW5kIHNhbXBsZSBhcmUg c3VwcG9ydGVkIG9uIGlPUyBkZXZpY2VzLCBhbHRob3VnaCB0aGV5IHNob3VsZCBub3QgYmUKKyAg ICAgICAgcnVuIHdpdGggc3Vkby4gQWRkaXRpb25hbGx5LCBpbnRlZ2VycyBzaG91bGQgbm90IGJl IHNlbnQgdG8gcnVuX2NvbW1hbmQsIGFsbAorICAgICAgICBjb21tYW5kcyBzaG91bGQgYWxyZWFk eSBiZSBjb252ZXJ0ZWQgdG8gc3RyaW5ncy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv cG9ydC9kYXJ3aW4ucHk6CisgICAgICAgIChEYXJ3aW5Qb3J0KToKKyAgICAgICAgKERhcndpblBv cnQuX25lZWRfc3Vkb19mb3Jfcm9vdCk6IEFkZCBmb3IgaU9TIGRldmljZXMuIFRydWUgYnkgZGVm YXVsdC4KKyAgICAgICAgKERhcndpblBvcnQuc2FtcGxlX3Byb2Nlc3MpOiBPbmx5IGFkZCBzdWRv IHByZWZpeCBpZiB0aGUgcGxhdGZvcm0gbmVlZHMgc3VkbworICAgICAgICB0byBydW4gYSBjb21t YW5kIGFzIHJvb3QuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rhcndpbl90ZXN0 Y2FzZS5weToKKyAgICAgICAgKERhcndpblRlc3QudGVzdF9zcGluZHVtcCk6IEFjY291bnQgZm9y IHBvcnRzIHdoaWNoIGRvIG5vdCBydW4gc3BpbmR1bXAgd2l0aCBzdWRvLgorICAgICAgICAoRGFy d2luVGVzdC50ZXN0X3NhbXBsZV9wcm9jZXNzLmxvZ2dpbmdfcnVuX2NvbW1hbmQpOiBEaXR0by4K KyAgICAgICAgKERhcndpblRlc3QudGVzdF9zYW1wbGVfcHJvY2Vzcyk6IERpdHRvLgorICAgICAg ICAoRGFyd2luVGVzdC50ZXN0X3NhbXBsZV9wcm9jZXNzX2V4Y2VwdGlvbi50aHJvd2luZ19ydW5f Y29tbWFuZCk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2 aWNlLnB5OgorICAgICAgICAoSU9TRGV2aWNlUG9ydCk6CisgICAgICAgIChJT1NEZXZpY2VQb3J0 Ll9uZWVkX3N1ZG9fZm9yX3Jvb3QpOiBSZXR1cm4gZmFsc2UuCisgICAgICAgIChJT1NEZXZpY2VQ b3J0Lmxvb2tfZm9yX25ld19zYW1wbGVzKTogRGVsZXRlZC4KKyAgICAgICAgKElPU0RldmljZVBv cnQuc2FtcGxlX3Byb2Nlc3MpOiBEZWxldGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv cG9ydC9pb3NfZGV2aWNlX3VuaXR0ZXN0LnB5OgorICAgICAgICAoSU9TRGV2aWNlVGVzdC50ZXN0 X2dldF9jcmFzaF9sb2cpOiBSZW1vdmVkIHNwZWNpYWwtY2FzZSBzcGluZHVtcCB0ZXN0cy4KKwog MjAxNy0wNi0wNyAgQ2hhcmxpZSBUdXJuZXIgIDxjdHVybmVyQGlnYWxpYS5jb20+CiAKICAgICAg ICAgQWRkIENoYXJsaWUgVHVybmVyIGFzIGNvbnRyaWJ1dG9yCkluZGV4OiBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9kYXJ3aW4ucHkJKHJldmlzaW9uIDIxNzg1OCkKKysrIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvcG9ydC9kYXJ3aW4ucHkJKHdvcmtpbmcgY29weSkKQEAgLTE1MSwzNiArMTUxLDM5 IEBAIGNsYXNzIERhcndpblBvcnQoQXBwbGVQb3J0KToKICAgICAgICAgYWxsX2NyYXNoX2xvZyA9 IHNlbGYuX2xvb2tfZm9yX2FsbF9jcmFzaF9sb2dzX2luX2xvZ19kaXIoc3RhcnRfdGltZSkKICAg ICAgICAgcmV0dXJuIHNlbGYuX21lcmdlX2NyYXNoX2xvZ3MoY3Jhc2hfbG9ncywgYWxsX2NyYXNo X2xvZywgY3Jhc2hlZF9wcm9jZXNzZXMpCiAKKyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF9u ZWVkX3N1ZG9fZm9yX3Jvb3QoKToKKyAgICAgICAgcmV0dXJuIFRydWUKKwogICAgIGRlZiBzYW1w bGVfcHJvY2VzcyhzZWxmLCBuYW1lLCBwaWQsIHRhcmdldF9ob3N0PU5vbmUpOgogICAgICAgICBo b3N0ID0gdGFyZ2V0X2hvc3Qgb3Igc2VsZi5ob3N0CiAgICAgICAgIHRlbXBkaXIgPSBob3N0LmZp bGVzeXN0ZW0ubWtkdGVtcCgpCi0gICAgICAgIGV4aXRfc3RhdHVzID0gaG9zdC5leGVjdXRpdmUu cnVuX2NvbW1hbmQoWwotICAgICAgICAgICAgIi91c3IvYmluL3N1ZG8iLAotICAgICAgICAgICAg Ii1uIiwKLSAgICAgICAgICAgICIvdXNyL3NiaW4vc3BpbmR1bXAiLAotICAgICAgICAgICAgcGlk LAotICAgICAgICAgICAgMTAsCi0gICAgICAgICAgICAxMCwKLSAgICAgICAgICAgICItZmlsZSIs CisgICAgICAgIGNvbW1hbmRfYmVnaW4gPSBbJy91c3IvYmluL3N1ZG8nLCAnLW4nXSBpZiBzZWxm Ll9uZWVkX3N1ZG9fZm9yX3Jvb3QoKSBlbHNlIFtdCisgICAgICAgIGV4aXRfc3RhdHVzID0gaG9z dC5leGVjdXRpdmUucnVuX2NvbW1hbmQoY29tbWFuZF9iZWdpbiArIFsKKyAgICAgICAgICAgICcv dXNyL3NiaW4vc3BpbmR1bXAnLAorICAgICAgICAgICAgc3RyKHBpZCksCisgICAgICAgICAgICAn MTAnLAorICAgICAgICAgICAgJzEwJywKKyAgICAgICAgICAgICctZmlsZScsCiAgICAgICAgICAg ICBEYXJ3aW5Qb3J0LnNwaW5kdW1wX2ZpbGVfcGF0aChob3N0LCBuYW1lLCBwaWQsIHN0cih0ZW1w ZGlyKSksCiAgICAgICAgIF0sIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkKICAgICAgICAgaWYgZXhp dF9zdGF0dXM6CiAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAgaG9zdC5leGVjdXRp dmUucnVuX2NvbW1hbmQoWwotICAgICAgICAgICAgICAgICAgICAiL3Vzci9iaW4vc2FtcGxlIiwK LSAgICAgICAgICAgICAgICAgICAgcGlkLAotICAgICAgICAgICAgICAgICAgICAxMCwKLSAgICAg ICAgICAgICAgICAgICAgMTAsCi0gICAgICAgICAgICAgICAgICAgICItZmlsZSIsCisgICAgICAg ICAgICAgICAgICAgICcvdXNyL2Jpbi9zYW1wbGUnLAorICAgICAgICAgICAgICAgICAgICBzdHIo cGlkKSwKKyAgICAgICAgICAgICAgICAgICAgJzEwJywKKyAgICAgICAgICAgICAgICAgICAgJzEw JywKKyAgICAgICAgICAgICAgICAgICAgJy1maWxlJywKICAgICAgICAgICAgICAgICAgICAgRGFy d2luUG9ydC5zYW1wbGVfZmlsZV9wYXRoKGhvc3QsIG5hbWUsIHBpZCwgc3RyKHRlbXBkaXIpKSwK ICAgICAgICAgICAgICAgICBdKQogICAgICAgICAgICAgICAgIGhvc3QuZmlsZXN5c3RlbS5tb3Zl X3RvX2Jhc2VfaG9zdChEYXJ3aW5Qb3J0LnNhbXBsZV9maWxlX3BhdGgoaG9zdCwgbmFtZSwgcGlk LCBzdHIodGVtcGRpcikpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBEYXJ3aW5Qb3J0LnNhbXBsZV9maWxlX3BhdGgoc2VsZi5ob3N0LCBuYW1lLCBw aWQsIHNlbGYucmVzdWx0c19kaXJlY3RvcnkoKSkpCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIERhcndpblBvcnQuc2FtcGxlX2ZpbGVfcGF0aChob3N0 LCBuYW1lLCBwaWQsIHNlbGYucmVzdWx0c19kaXJlY3RvcnkoKSkpCiAgICAgICAgICAgICBleGNl cHQgU2NyaXB0RXJyb3IgYXMgZToKICAgICAgICAgICAgICAgICBfbG9nLndhcm5pbmcoJ1VuYWJs ZSB0byBzYW1wbGUgcHJvY2VzczonICsgc3RyKGUpKQogICAgICAgICBlbHNlOgogICAgICAgICAg ICAgaG9zdC5maWxlc3lzdGVtLm1vdmVfdG9fYmFzZV9ob3N0KERhcndpblBvcnQuc3BpbmR1bXBf ZmlsZV9wYXRoKGhvc3QsIG5hbWUsIHBpZCwgc3RyKHRlbXBkaXIpKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBEYXJ3aW5Qb3J0LnNwaW5kdW1wX2ZpbGVf cGF0aChzZWxmLmhvc3QsIG5hbWUsIHBpZCwgc2VsZi5yZXN1bHRzX2RpcmVjdG9yeSgpKSkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBEYXJ3aW5Qb3J0LnNw aW5kdW1wX2ZpbGVfcGF0aChob3N0LCBuYW1lLCBwaWQsIHNlbGYucmVzdWx0c19kaXJlY3Rvcnko KSkpCiAgICAgICAgIGhvc3QuZmlsZXN5c3RlbS5ybXRyZWUoc3RyKHRlbXBkaXIpKQogCiAgICAg QHN0YXRpY21ldGhvZApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rhcndpbl90 ZXN0Y2FzZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFy d2luX3Rlc3RjYXNlLnB5CShyZXZpc2lvbiAyMTc4NTgpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvZGFyd2luX3Rlc3RjYXNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMDUsNyArMTA1 LDggQEAgY2xhc3MgRGFyd2luVGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRUZXN0QwogICAgICAgICBw b3J0ID0gc2VsZi5tYWtlX3BvcnQoKQogICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5c3RlbS5maWxl c1snL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXNwaW5kdW1wLnR4dCddID0gJ1NwaW5kdW1wIGZp bGUnCiAgICAgICAgIHBvcnQuaG9zdC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihydW5fY29t bWFuZF9mbj1sb2dnaW5nX3J1bl9jb21tYW5kKQotICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSAi WycvdXNyL2Jpbi9zdWRvJywgJy1uJywgJy91c3Ivc2Jpbi9zcGluZHVtcCcsIDQyLCAxMCwgMTAs ICctZmlsZScsICcvX19pbV90bXAvdG1wXzBfL3Rlc3QtNDItc3BpbmR1bXAudHh0J11cbiIKKyAg ICAgICAgY29tbWFuZF9iZWdpbiA9IFsnL3Vzci9iaW4vc3VkbycsICctbiddIGlmIHBvcnQuX25l ZWRfc3Vkb19mb3Jfcm9vdCgpIGVsc2UgW10KKyAgICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gc3Ry KGNvbW1hbmRfYmVnaW4gKyBbJy91c3Ivc2Jpbi9zcGluZHVtcCcsICc0MicsICcxMCcsICcxMCcs ICctZmlsZScsICcvX19pbV90bXAvdG1wXzBfL3Rlc3QtNDItc3BpbmR1bXAudHh0J10pICsgJ1xu JwogICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgcG9ydC5zYW1w bGVfcHJvY2VzcywgYXJncz1bJ3Rlc3QnLCA0Ml0sIGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9z dGRvdXQpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5ob3N0LmZpbGVzeXN0ZW0uZmls ZXNbJy9tb2NrLWJ1aWxkL2xheW91dC10ZXN0LXJlc3VsdHMvdGVzdC00Mi1zcGluZHVtcC50eHQn XSwgJ1NwaW5kdW1wIGZpbGUnKQogICAgICAgICBzZWxmLmFzc2VydElzTm9uZShwb3J0Lmhvc3Qu ZmlsZXN5c3RlbS5maWxlc1snL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXNwaW5kdW1wLnR4dCdd KQpAQCAtMTEzLDcgKzExNCw3IEBAIGNsYXNzIERhcndpblRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0 VGVzdEMKICAgICBkZWYgdGVzdF9zYW1wbGVfcHJvY2VzcyhzZWxmKToKIAogICAgICAgICBkZWYg bG9nZ2luZ19ydW5fY29tbWFuZChhcmdzKToKLSAgICAgICAgICAgIGlmIGFyZ3NbMF0gPT0gJy91 c3IvYmluL3N1ZG8nOgorICAgICAgICAgICAgaWYgYXJnc1swXSA9PSAnL3Vzci9iaW4vc3Vkbycg b3IgYXJnc1swXSA9PSAnL3Vzci9zYmluL3NwaW5kdW1wJzoKICAgICAgICAgICAgICAgICByZXR1 cm4gMQogICAgICAgICAgICAgcHJpbnQgYXJncwogICAgICAgICAgICAgcmV0dXJuIDAKQEAgLTEy MSwxNCArMTIyLDE0IEBAIGNsYXNzIERhcndpblRlc3QocG9ydF90ZXN0Y2FzZS5Qb3J0VGVzdEMK ICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKICAgICAgICAgcG9ydC5ob3N0LmZpbGVz eXN0ZW0uZmlsZXNbJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi1zYW1wbGUudHh0J10gPSAnU2Ft cGxlIGZpbGUnCiAgICAgICAgIHBvcnQuaG9zdC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihy dW5fY29tbWFuZF9mbj1sb2dnaW5nX3J1bl9jb21tYW5kKQotICAgICAgICBleHBlY3RlZF9zdGRv dXQgPSAiWycvdXNyL2Jpbi9zYW1wbGUnLCA0MiwgMTAsIDEwLCAnLWZpbGUnLCAnL19faW1fdG1w L3RtcF8wXy90ZXN0LTQyLXNhbXBsZS50eHQnXVxuIgorICAgICAgICBleHBlY3RlZF9zdGRvdXQg PSAiWycvdXNyL2Jpbi9zYW1wbGUnLCAnNDInLCAnMTAnLCAnMTAnLCAnLWZpbGUnLCAnL19faW1f dG1wL3RtcF8wXy90ZXN0LTQyLXNhbXBsZS50eHQnXVxuIgogICAgICAgICBPdXRwdXRDYXB0dXJl KCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgcG9ydC5zYW1wbGVfcHJvY2VzcywgYXJncz1bJ3Rlc3Qn LCA0Ml0sIGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9zdGRvdXQpCiAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwocG9ydC5ob3N0LmZpbGVzeXN0ZW0uZmlsZXNbJy9tb2NrLWJ1aWxkL2xheW91dC10 ZXN0LXJlc3VsdHMvdGVzdC00Mi1zYW1wbGUudHh0J10sICdTYW1wbGUgZmlsZScpCiAgICAgICAg IHNlbGYuYXNzZXJ0SXNOb25lKHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycvX19pbV90bXAv dG1wXzBfL3Rlc3QtNDItc2FtcGxlLnR4dCddKQogCiAgICAgZGVmIHRlc3Rfc2FtcGxlX3Byb2Nl c3NfZXhjZXB0aW9uKHNlbGYpOgogICAgICAgICBkZWYgdGhyb3dpbmdfcnVuX2NvbW1hbmQoYXJn cyk6Ci0gICAgICAgICAgICBpZiBhcmdzWzBdID09ICcvdXNyL2Jpbi9zdWRvJzoKKyAgICAgICAg ICAgIGlmIGFyZ3NbMF0gPT0gJy91c3IvYmluL3N1ZG8nIG9yIGFyZ3NbMF0gPT0gJy91c3Ivc2Jp bi9zcGluZHVtcCc6CiAgICAgICAgICAgICAgICAgcmV0dXJuIDEKICAgICAgICAgICAgIHJhaXNl IFNjcmlwdEVycm9yKCJNT0NLIHNjcmlwdCBlcnJvciIpCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlLnB5CShyZXZpc2lvbiAyMTc4NTgpCisrKyBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZS5weQkod29ya2luZyBjb3B5KQpAQCAtOTUs MTEgKzk1LDkgQEAgY2xhc3MgSU9TRGV2aWNlUG9ydChJT1NQb3J0KToKICAgICBkZWYgY2hlY2tf Zm9yX2xlYWtzKHNlbGYsIHByb2Nlc3NfbmFtZSwgcHJvY2Vzc19waWQpOgogICAgICAgICBwYXNz CiAKLSAgICBkZWYgbG9va19mb3JfbmV3X3NhbXBsZXMoc2VsZiwgdW5yZXNwb25zaXZlX3Byb2Nl c3Nlcywgc3RhcnRfdGltZSk6Ci0gICAgICAgIHJldHVybiB7fQotCi0gICAgZGVmIHNhbXBsZV9w cm9jZXNzKHNlbGYsIG5hbWUsIHBpZCwgdGFyZ2V0X2hvc3Q9Tm9uZSk6Ci0gICAgICAgIHBhc3MK KyAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIF9uZWVkX3N1ZG9fZm9yX3Jvb3QoKToKKyAgICAg ICAgcmV0dXJuIEZhbHNlCiAKICAgICAjIERlc3BpdGUgdGhlaXIgbmFtZXMsIHRoZXNlIGZsYWdz IGRvIG5vdCBhY3R1YWxseSBnZXQgcGFzc2VkIGFsbCB0aGUgd2F5IGRvd24gdG8gd2Via2l0LWJ1 aWxkLgogICAgIGRlZiBfYnVpbGRfZHJpdmVyX2ZsYWdzKHNlbGYpOgpJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2VfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2VfdW5pdHRlc3QucHkJKHJldmlz aW9uIDIxNzg1OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlX3Vu aXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00OCwxMyArNDgsMyBAQCBjbGFzcyBJT1NEZXZp Y2VUZXN0KGlvc190ZXN0Y2FzZS5JT1NUZXN0CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9y dChwb3J0X25hbWU9c2VsZi5wb3J0X25hbWUpCiAgICAgICAgIHdpdGggc2VsZi5hc3NlcnRSYWlz ZXMoUnVudGltZUVycm9yKToKICAgICAgICAgICAgIHBvcnQuX2dldF9jcmFzaF9sb2coJ0R1bXBS ZW5kZXJUcmVlJywgMTIzNCwgTm9uZSwgTm9uZSwgdGltZS50aW1lKCksIHdhaXRfZm9yX2xvZz1G YWxzZSkKLQotICAgICMgRklYTUU6IFVwZGF0ZSB0ZXN0cyB3aGVuIDxyZGFyOi8vcHJvYmxlbS8z MDQ5Nzk5MT4gaXMgY29tcGxldGVkLgotICAgIGRlZiB0ZXN0X3NwaW5kdW1wKHNlbGYpOgotICAg ICAgICBwYXNzCi0KLSAgICBkZWYgdGVzdF9zYW1wbGVfcHJvY2VzcyhzZWxmKToKLSAgICAgICAg cGFzcwotCi0gICAgZGVmIHRlc3Rfc2FtcGxlX3Byb2Nlc3NfZXhjZXB0aW9uKHNlbGYpOgotICAg ICAgICBwYXNzCg== 312214 2017-06-07 13:10:52 -0700 2017-06-07 15:41:43 -0700 Patch bug-171881-20170607131051.patch text/plain 7535 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNzkwMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMxIEBACisyMDE3LTA2LTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUnVuIHNhbXBsZS9zcGluZHVtcCBvbiBpT1MgZGV2aWNl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxODgx CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjA4NDYwMj4KKworICAgICAgICBSZXZpZXdlZCBi eSBBYWthc2ggSmFpbi4KKworICAgICAgICBTcGluZHVtcCBhbmQgc2FtcGxlIGFyZSBzdXBwb3J0 ZWQgb24gaU9TIGRldmljZXMsIGFsdGhvdWdoIHRoZXkgc2hvdWxkIG5vdCBiZQorICAgICAgICBy dW4gd2l0aCBzdWRvLiBBZGRpdGlvbmFsbHksIGludGVnZXJzIHNob3VsZCBub3QgYmUgc2VudCB0 byBydW5fY29tbWFuZCwgYWxsCisgICAgICAgIGNvbW1hbmRzIHNob3VsZCBhbHJlYWR5IGJlIGNv bnZlcnRlZCB0byBzdHJpbmdzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rh cndpbi5weToKKyAgICAgICAgKERhcndpblBvcnQpOgorICAgICAgICAoRGFyd2luUG9ydC5zYW1w bGVfcHJvY2Vzcyk6IERvIG5vdCBhZGQgc3VkbyBwcmVmaXggaWYgdGhlIHBsYXRmb3JtIGlzIGlP Uywgd2hpY2gKKyAgICAgICAgZG9lcyBub3QgbmVlZCBzdWRvIHRvIHJ1biBhIGNvbW1hbmQgYXMg cm9vdC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luX3Rlc3RjYXNlLnB5 OgorICAgICAgICAoRGFyd2luVGVzdC50ZXN0X3NwaW5kdW1wKTogQWNjb3VudCBmb3IgcG9ydHMg d2hpY2ggZG8gbm90IHJ1biBzcGluZHVtcCB3aXRoIHN1ZG8uCisgICAgICAgIChEYXJ3aW5UZXN0 LnRlc3Rfc2FtcGxlX3Byb2Nlc3MubG9nZ2luZ19ydW5fY29tbWFuZCk6IERpdHRvLgorICAgICAg ICAoRGFyd2luVGVzdC50ZXN0X3NhbXBsZV9wcm9jZXNzKTogRGl0dG8uCisgICAgICAgIChEYXJ3 aW5UZXN0LnRlc3Rfc2FtcGxlX3Byb2Nlc3NfZXhjZXB0aW9uLnRocm93aW5nX3J1bl9jb21tYW5k KTogRGl0dG8uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2UucHk6 CisgICAgICAgIChJT1NEZXZpY2VQb3J0KToKKyAgICAgICAgKElPU0RldmljZVBvcnQubG9va19m b3JfbmV3X3NhbXBsZXMpOiBEZWxldGVkLgorICAgICAgICAoSU9TRGV2aWNlUG9ydC5zYW1wbGVf cHJvY2Vzcyk6IERlbGV0ZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19k ZXZpY2VfdW5pdHRlc3QucHk6CisgICAgICAgIChJT1NEZXZpY2VUZXN0LnRlc3RfZ2V0X2NyYXNo X2xvZyk6IFJlbW92ZWQgc3BlY2lhbC1jYXNlIHNwaW5kdW1wIHRlc3RzLgorCiAyMDE3LTA2LTA3 ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBTdXBwb3J0 IHJlbW92YWwgb2YgYXV0aGVudGljYXRpb24gZGF0YSB0aHJvdWdoIHRoZSBXZWJzaXRlIGRhdGEg c3RvcmUgQVBJLgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rhcndpbi5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5CShyZXZp c2lvbiAyMTc5MDApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5CSh3 b3JraW5nIGNvcHkpCkBAIC0xNTQsMjQgKzE1NCwyMyBAQCBjbGFzcyBEYXJ3aW5Qb3J0KEFwcGxl UG9ydCk6CiAgICAgZGVmIHNhbXBsZV9wcm9jZXNzKHNlbGYsIG5hbWUsIHBpZCwgdGFyZ2V0X2hv c3Q9Tm9uZSk6CiAgICAgICAgIGhvc3QgPSB0YXJnZXRfaG9zdCBvciBzZWxmLmhvc3QKICAgICAg ICAgdGVtcGRpciA9IGhvc3QuZmlsZXN5c3RlbS5ta2R0ZW1wKCkKLSAgICAgICAgZXhpdF9zdGF0 dXMgPSBob3N0LmV4ZWN1dGl2ZS5ydW5fY29tbWFuZChbCi0gICAgICAgICAgICAiL3Vzci9iaW4v c3VkbyIsCi0gICAgICAgICAgICAiLW4iLAotICAgICAgICAgICAgIi91c3Ivc2Jpbi9zcGluZHVt cCIsCi0gICAgICAgICAgICBwaWQsCi0gICAgICAgICAgICAxMCwKLSAgICAgICAgICAgIDEwLAot ICAgICAgICAgICAgIi1maWxlIiwKKyAgICAgICAgY29tbWFuZF9iZWdpbiA9IFsnL3Vzci9iaW4v c3VkbycsICctbiddIGlmIHNlbGYuaG9zdC5wbGF0Zm9ybS5pc19pb3MoKSBlbHNlIFtdCisgICAg ICAgIGV4aXRfc3RhdHVzID0gaG9zdC5leGVjdXRpdmUucnVuX2NvbW1hbmQoY29tbWFuZF9iZWdp biArIFsKKyAgICAgICAgICAgICcvdXNyL3NiaW4vc3BpbmR1bXAnLAorICAgICAgICAgICAgc3Ry KHBpZCksCisgICAgICAgICAgICAnMTAnLAorICAgICAgICAgICAgJzEwJywKKyAgICAgICAgICAg ICctZmlsZScsCiAgICAgICAgICAgICBEYXJ3aW5Qb3J0LnNwaW5kdW1wX2ZpbGVfcGF0aChob3N0 LCBuYW1lLCBwaWQsIHN0cih0ZW1wZGlyKSksCiAgICAgICAgIF0sIHJldHVybl9leGl0X2NvZGU9 VHJ1ZSkKICAgICAgICAgaWYgZXhpdF9zdGF0dXM6CiAgICAgICAgICAgICB0cnk6CiAgICAgICAg ICAgICAgICAgaG9zdC5leGVjdXRpdmUucnVuX2NvbW1hbmQoWwotICAgICAgICAgICAgICAgICAg ICAiL3Vzci9iaW4vc2FtcGxlIiwKLSAgICAgICAgICAgICAgICAgICAgcGlkLAotICAgICAgICAg ICAgICAgICAgICAxMCwKLSAgICAgICAgICAgICAgICAgICAgMTAsCi0gICAgICAgICAgICAgICAg ICAgICItZmlsZSIsCisgICAgICAgICAgICAgICAgICAgICcvdXNyL2Jpbi9zYW1wbGUnLAorICAg ICAgICAgICAgICAgICAgICBzdHIocGlkKSwKKyAgICAgICAgICAgICAgICAgICAgJzEwJywKKyAg ICAgICAgICAgICAgICAgICAgJzEwJywKKyAgICAgICAgICAgICAgICAgICAgJy1maWxlJywKICAg ICAgICAgICAgICAgICAgICAgRGFyd2luUG9ydC5zYW1wbGVfZmlsZV9wYXRoKGhvc3QsIG5hbWUs IHBpZCwgc3RyKHRlbXBkaXIpKSwKICAgICAgICAgICAgICAgICBdKQogICAgICAgICAgICAgICAg IGhvc3QuZmlsZXN5c3RlbS5tb3ZlX3RvX2Jhc2VfaG9zdChEYXJ3aW5Qb3J0LnNhbXBsZV9maWxl X3BhdGgoaG9zdCwgbmFtZSwgcGlkLCBzdHIodGVtcGRpcikpLApJbmRleDogVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wb3J0L2Rhcndpbl90ZXN0Y2FzZS5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luX3Rlc3RjYXNlLnB5CShyZXZpc2lvbiAyMTc5MDAp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luX3Rlc3RjYXNlLnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC0xMDUsNyArMTA1LDggQEAgY2xhc3MgRGFyd2luVGVzdChwb3J0X3Rlc3Rj YXNlLlBvcnRUZXN0QwogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQogICAgICAgICBw b3J0Lmhvc3QuZmlsZXN5c3RlbS5maWxlc1snL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXNwaW5k dW1wLnR4dCddID0gJ1NwaW5kdW1wIGZpbGUnCiAgICAgICAgIHBvcnQuaG9zdC5leGVjdXRpdmUg PSBNb2NrRXhlY3V0aXZlMihydW5fY29tbWFuZF9mbj1sb2dnaW5nX3J1bl9jb21tYW5kKQotICAg ICAgICBleHBlY3RlZF9zdGRvdXQgPSAiWycvdXNyL2Jpbi9zdWRvJywgJy1uJywgJy91c3Ivc2Jp bi9zcGluZHVtcCcsIDQyLCAxMCwgMTAsICctZmlsZScsICcvX19pbV90bXAvdG1wXzBfL3Rlc3Qt NDItc3BpbmR1bXAudHh0J11cbiIKKyAgICAgICAgY29tbWFuZF9iZWdpbiA9IFsnL3Vzci9iaW4v c3VkbycsICctbiddIGlmIHBvcnQuaG9zdC5wbGF0Zm9ybS5pc19pb3MoKSBlbHNlIFtdCisgICAg ICAgIGV4cGVjdGVkX3N0ZG91dCA9IHN0cihjb21tYW5kX2JlZ2luICsgWycvdXNyL3NiaW4vc3Bp bmR1bXAnLCAnNDInLCAnMTAnLCAnMTAnLCAnLWZpbGUnLCAnL19faW1fdG1wL3RtcF8wXy90ZXN0 LTQyLXNwaW5kdW1wLnR4dCddKSArICdcbicKICAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2Vy dF9vdXRwdXRzKHNlbGYsIHBvcnQuc2FtcGxlX3Byb2Nlc3MsIGFyZ3M9Wyd0ZXN0JywgNDJdLCBl eHBlY3RlZF9zdGRvdXQ9ZXhwZWN0ZWRfc3Rkb3V0KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycvbW9jay1idWlsZC9sYXlvdXQtdGVzdC1yZXN1 bHRzL3Rlc3QtNDItc3BpbmR1bXAudHh0J10sICdTcGluZHVtcCBmaWxlJykKICAgICAgICAgc2Vs Zi5hc3NlcnRJc05vbmUocG9ydC5ob3N0LmZpbGVzeXN0ZW0uZmlsZXNbJy9fX2ltX3RtcC90bXBf MF8vdGVzdC00Mi1zcGluZHVtcC50eHQnXSkKQEAgLTExMyw3ICsxMTQsNyBAQCBjbGFzcyBEYXJ3 aW5UZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDCiAgICAgZGVmIHRlc3Rfc2FtcGxlX3Byb2Nl c3Moc2VsZik6CiAKICAgICAgICAgZGVmIGxvZ2dpbmdfcnVuX2NvbW1hbmQoYXJncyk6Ci0gICAg ICAgICAgICBpZiBhcmdzWzBdID09ICcvdXNyL2Jpbi9zdWRvJzoKKyAgICAgICAgICAgIGlmIGFy Z3NbMF0gPT0gJy91c3IvYmluL3N1ZG8nIG9yIGFyZ3NbMF0gPT0gJy91c3Ivc2Jpbi9zcGluZHVt cCc6CiAgICAgICAgICAgICAgICAgcmV0dXJuIDEKICAgICAgICAgICAgIHByaW50IGFyZ3MKICAg ICAgICAgICAgIHJldHVybiAwCkBAIC0xMjEsMTQgKzEyMiwxNCBAQCBjbGFzcyBEYXJ3aW5UZXN0 KHBvcnRfdGVzdGNhc2UuUG9ydFRlc3RDCiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgp CiAgICAgICAgIHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycvX19pbV90bXAvdG1wXzBfL3Rl c3QtNDItc2FtcGxlLnR4dCddID0gJ1NhbXBsZSBmaWxlJwogICAgICAgICBwb3J0Lmhvc3QuZXhl Y3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIocnVuX2NvbW1hbmRfZm49bG9nZ2luZ19ydW5fY29tbWFu ZCkKLSAgICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9iaW4vc2FtcGxlJywgNDIsIDEw LCAxMCwgJy1maWxlJywgJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi1zYW1wbGUudHh0J11cbiIK KyAgICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9iaW4vc2FtcGxlJywgJzQyJywgJzEw JywgJzEwJywgJy1maWxlJywgJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi1zYW1wbGUudHh0J11c biIKICAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuc2Ft cGxlX3Byb2Nlc3MsIGFyZ3M9Wyd0ZXN0JywgNDJdLCBleHBlY3RlZF9zdGRvdXQ9ZXhwZWN0ZWRf c3Rkb3V0KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuaG9zdC5maWxlc3lzdGVtLmZp bGVzWycvbW9jay1idWlsZC9sYXlvdXQtdGVzdC1yZXN1bHRzL3Rlc3QtNDItc2FtcGxlLnR4dCdd LCAnU2FtcGxlIGZpbGUnKQogICAgICAgICBzZWxmLmFzc2VydElzTm9uZShwb3J0Lmhvc3QuZmls ZXN5c3RlbS5maWxlc1snL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXNhbXBsZS50eHQnXSkKIAog ICAgIGRlZiB0ZXN0X3NhbXBsZV9wcm9jZXNzX2V4Y2VwdGlvbihzZWxmKToKICAgICAgICAgZGVm IHRocm93aW5nX3J1bl9jb21tYW5kKGFyZ3MpOgotICAgICAgICAgICAgaWYgYXJnc1swXSA9PSAn L3Vzci9iaW4vc3Vkbyc6CisgICAgICAgICAgICBpZiBhcmdzWzBdID09ICcvdXNyL2Jpbi9zdWRv JyBvciBhcmdzWzBdID09ICcvdXNyL3NiaW4vc3BpbmR1bXAnOgogICAgICAgICAgICAgICAgIHJl dHVybiAxCiAgICAgICAgICAgICByYWlzZSBTY3JpcHRFcnJvcigiTU9DSyBzY3JpcHQgZXJyb3Ii KQogCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZS5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZS5weQkocmV2 aXNpb24gMjE3OTAwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2Uu cHkJKHdvcmtpbmcgY29weSkKQEAgLTk1LDEyICs5NSw2IEBAIGNsYXNzIElPU0RldmljZVBvcnQo SU9TUG9ydCk6CiAgICAgZGVmIGNoZWNrX2Zvcl9sZWFrcyhzZWxmLCBwcm9jZXNzX25hbWUsIHBy b2Nlc3NfcGlkKToKICAgICAgICAgcGFzcwogCi0gICAgZGVmIGxvb2tfZm9yX25ld19zYW1wbGVz KHNlbGYsIHVucmVzcG9uc2l2ZV9wcm9jZXNzZXMsIHN0YXJ0X3RpbWUpOgotICAgICAgICByZXR1 cm4ge30KLQotICAgIGRlZiBzYW1wbGVfcHJvY2VzcyhzZWxmLCBuYW1lLCBwaWQsIHRhcmdldF9o b3N0PU5vbmUpOgotICAgICAgICBwYXNzCi0KICAgICAjIERlc3BpdGUgdGhlaXIgbmFtZXMsIHRo ZXNlIGZsYWdzIGRvIG5vdCBhY3R1YWxseSBnZXQgcGFzc2VkIGFsbCB0aGUgd2F5IGRvd24gdG8g d2Via2l0LWJ1aWxkLgogICAgIGRlZiBfYnVpbGRfZHJpdmVyX2ZsYWdzKHNlbGYpOgogICAgICAg ICByZXR1cm4gWyctLXNkaycsIHNlbGYuU0RLXSArIChbJ0FSQ0hTPSVzJyAlIHNlbGYuYXJjaGl0 ZWN0dXJlKCldIGlmIHNlbGYuYXJjaGl0ZWN0dXJlKCkgZWxzZSBbXSkKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlX3VuaXR0ZXN0LnB5CShyZXZp c2lvbiAyMTc5MDApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZV91 bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNDgsMTMgKzQ4LDMgQEAgY2xhc3MgSU9TRGV2 aWNlVGVzdChpb3NfdGVzdGNhc2UuSU9TVGVzdAogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3Bv cnQocG9ydF9uYW1lPXNlbGYucG9ydF9uYW1lKQogICAgICAgICB3aXRoIHNlbGYuYXNzZXJ0UmFp c2VzKFJ1bnRpbWVFcnJvcik6CiAgICAgICAgICAgICBwb3J0Ll9nZXRfY3Jhc2hfbG9nKCdEdW1w UmVuZGVyVHJlZScsIDEyMzQsIE5vbmUsIE5vbmUsIHRpbWUudGltZSgpLCB3YWl0X2Zvcl9sb2c9 RmFsc2UpCi0KLSAgICAjIEZJWE1FOiBVcGRhdGUgdGVzdHMgd2hlbiA8cmRhcjovL3Byb2JsZW0v MzA0OTc5OTE+IGlzIGNvbXBsZXRlZC4KLSAgICBkZWYgdGVzdF9zcGluZHVtcChzZWxmKToKLSAg ICAgICAgcGFzcwotCi0gICAgZGVmIHRlc3Rfc2FtcGxlX3Byb2Nlc3Moc2VsZik6Ci0gICAgICAg IHBhc3MKLQotICAgIGRlZiB0ZXN0X3NhbXBsZV9wcm9jZXNzX2V4Y2VwdGlvbihzZWxmKToKLSAg ICAgICAgcGFzcwo= 312245 2017-06-07 15:41:45 -0700 2017-06-08 10:20:41 -0700 Patch bug-171881-20170607154144.patch text/plain 10295 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNzkwOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDE3LTA2LTA3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUnVuIHNhbXBsZS9zcGluZHVtcCBvbiBpT1MgZGV2aWNl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxODgx CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjA4NDYwMj4KKworICAgICAgICBSZXZpZXdlZCBi eSBBYWthc2ggSmFpbi4KKworICAgICAgICBTcGluZHVtcCBhbmQgc2FtcGxlIGFyZSBzdXBwb3J0 ZWQgb24gaU9TIGRldmljZXMsIGFsdGhvdWdoIHRoZXkgc2hvdWxkIG5vdCBiZQorICAgICAgICBy dW4gd2l0aCBzdWRvLiBBZGRpdGlvbmFsbHksIGludGVnZXJzIHNob3VsZCBub3QgYmUgc2VudCB0 byBydW5fY29tbWFuZCwgYWxsCisgICAgICAgIGNvbW1hbmRzIHNob3VsZCBhbHJlYWR5IGJlIGNv bnZlcnRlZCB0byBzdHJpbmdzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rh cndpbi5weToKKyAgICAgICAgKERhcndpblBvcnQuc2FtcGxlX3Byb2Nlc3MpOiBPbmx5IGFkZCBz dWRvIHByZWZpeCBpZiB0aGUgcGxhdGZvcm0gaXMgTWFjLCB3aGljaAorICAgICAgICByZXF1aXJl cyBzdWRvIHRvIHJ1biBzcGluZHVtcC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQv ZGFyd2luX3Rlc3RjYXNlLnB5OgorICAgICAgICAoRGFyd2luVGVzdC50ZXN0X3NwaW5kdW1wKTog UGFyc2UgZm9yIHN0cmluZ3MgcGFzc2VkIGludG8gcnVuX2NvbW1hbmQgcmF0aGVyIHRoYW4gaW50 ZWdlcnMuCisgICAgICAgIChEYXJ3aW5UZXN0LnRlc3Rfc2FtcGxlX3Byb2Nlc3MpOiBEaXR0by4K KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZS5weToKKyAgICAgICAg KElPU0RldmljZVBvcnQubG9va19mb3JfbmV3X3NhbXBsZXMpOiBEZWxldGVkLgorICAgICAgICAo SU9TRGV2aWNlUG9ydC5zYW1wbGVfcHJvY2Vzcyk6IERlbGV0ZWQuCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2VfdW5pdHRlc3QucHk6CisgICAgICAgIChJT1NEZXZp Y2VUZXN0KTogaU9TIGRldmljZXMgdXNlICdpb3MnIGFuZCB0aGVpciBvc19uYW1lLgorICAgICAg ICAoSU9TRGV2aWNlVGVzdC50ZXN0X3NwaW5kdW1wKToKKyAgICAgICAgKElPU0RldmljZVRlc3Qu dGVzdF9zYW1wbGVfcHJvY2Vzcyk6CisgICAgICAgIChJT1NEZXZpY2VUZXN0LnRlc3Rfc2FtcGxl X3Byb2Nlc3NfZXhjZXB0aW9uKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9z X3NpbXVsYXRvcl91bml0dGVzdC5weToKKyAgICAgICAgKElPU1NpbXVsYXRvclRlc3QpOiBpT1Mg U2ltdWxhdG9ycyBydW4gb24gTWFjIGFuZCB1c2UgJ21hYycgYXMgdGhlaXIgb3NfbmFtZS4KKwog MjAxNy0wNi0wNyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAg VGVhY2ggcnVuLXdlYmtpdC10ZXN0cyBob3cgdG8gcnVuIEhUVFBTIFdlYiBQbGF0Zm9ybSBUZXN0 cwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rhcndpbi5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5CShyZXZpc2lvbiAyMTc5 MDMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5CSh3b3JraW5nIGNv cHkpCkBAIC0xNTQsMjQgKzE1NCwyNCBAQCBjbGFzcyBEYXJ3aW5Qb3J0KEFwcGxlUG9ydCk6CiAg ICAgZGVmIHNhbXBsZV9wcm9jZXNzKHNlbGYsIG5hbWUsIHBpZCwgdGFyZ2V0X2hvc3Q9Tm9uZSk6 CiAgICAgICAgIGhvc3QgPSB0YXJnZXRfaG9zdCBvciBzZWxmLmhvc3QKICAgICAgICAgdGVtcGRp ciA9IGhvc3QuZmlsZXN5c3RlbS5ta2R0ZW1wKCkKLSAgICAgICAgZXhpdF9zdGF0dXMgPSBob3N0 LmV4ZWN1dGl2ZS5ydW5fY29tbWFuZChbCi0gICAgICAgICAgICAiL3Vzci9iaW4vc3VkbyIsCi0g ICAgICAgICAgICAiLW4iLAotICAgICAgICAgICAgIi91c3Ivc2Jpbi9zcGluZHVtcCIsCi0gICAg ICAgICAgICBwaWQsCi0gICAgICAgICAgICAxMCwKLSAgICAgICAgICAgIDEwLAotICAgICAgICAg ICAgIi1maWxlIiwKKyAgICAgICAgY29tbWFuZCA9IFsKKyAgICAgICAgICAgICcvdXNyL3NiaW4v c3BpbmR1bXAnLAorICAgICAgICAgICAgc3RyKHBpZCksCisgICAgICAgICAgICAnMTAnLAorICAg ICAgICAgICAgJzEwJywKKyAgICAgICAgICAgICctZmlsZScsCiAgICAgICAgICAgICBEYXJ3aW5Q b3J0LnNwaW5kdW1wX2ZpbGVfcGF0aChob3N0LCBuYW1lLCBwaWQsIHN0cih0ZW1wZGlyKSksCi0g ICAgICAgIF0sIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkKKyAgICAgICAgXQorICAgICAgICBjb21t YW5kID0gWycvdXNyL2Jpbi9zdWRvJywgJy1uJ10gKyBjb21tYW5kIGlmIHNlbGYuaG9zdC5wbGF0 Zm9ybS5pc19tYWMoKSBlbHNlIGNvbW1hbmQKKyAgICAgICAgZXhpdF9zdGF0dXMgPSBob3N0LmV4 ZWN1dGl2ZS5ydW5fY29tbWFuZChjb21tYW5kLCByZXR1cm5fZXhpdF9jb2RlPVRydWUpCiAgICAg ICAgIGlmIGV4aXRfc3RhdHVzOgogICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIGhv c3QuZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsKLSAgICAgICAgICAgICAgICAgICAgIi91c3IvYmlu L3NhbXBsZSIsCi0gICAgICAgICAgICAgICAgICAgIHBpZCwKLSAgICAgICAgICAgICAgICAgICAg MTAsCi0gICAgICAgICAgICAgICAgICAgIDEwLAotICAgICAgICAgICAgICAgICAgICAiLWZpbGUi LAorICAgICAgICAgICAgICAgICAgICAnL3Vzci9iaW4vc2FtcGxlJywKKyAgICAgICAgICAgICAg ICAgICAgc3RyKHBpZCksCisgICAgICAgICAgICAgICAgICAgICcxMCcsCisgICAgICAgICAgICAg ICAgICAgICcxMCcsCisgICAgICAgICAgICAgICAgICAgICctZmlsZScsCiAgICAgICAgICAgICAg ICAgICAgIERhcndpblBvcnQuc2FtcGxlX2ZpbGVfcGF0aChob3N0LCBuYW1lLCBwaWQsIHN0cih0 ZW1wZGlyKSksCiAgICAgICAgICAgICAgICAgXSkKICAgICAgICAgICAgICAgICBob3N0LmZpbGVz eXN0ZW0ubW92ZV90b19iYXNlX2hvc3QoRGFyd2luUG9ydC5zYW1wbGVfZmlsZV9wYXRoKGhvc3Qs IG5hbWUsIHBpZCwgc3RyKHRlbXBkaXIpKSwKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9kYXJ3aW5fdGVzdGNhc2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2Rhcndpbl90ZXN0Y2FzZS5weQkocmV2aXNpb24gMjE3OTAzKQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L2Rhcndpbl90ZXN0Y2FzZS5weQkod29ya2luZyBjb3B5KQpA QCAtMTAzLDkgKzEwMywxMCBAQCBjbGFzcyBEYXJ3aW5UZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFRl c3RDCiAgICAgICAgICAgICBwcmludCBhcmdzCiAKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9w b3J0KCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0Lmhvc3QucGxhdGZvcm0ub3NfbmFt ZSwgJ21hYycpCiAgICAgICAgIHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycvX19pbV90bXAv dG1wXzBfL3Rlc3QtNDItc3BpbmR1bXAudHh0J10gPSAnU3BpbmR1bXAgZmlsZScKICAgICAgICAg cG9ydC5ob3N0LmV4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKHJ1bl9jb21tYW5kX2ZuPWxvZ2dp bmdfcnVuX2NvbW1hbmQpCi0gICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICJbJy91c3IvYmluL3N1 ZG8nLCAnLW4nLCAnL3Vzci9zYmluL3NwaW5kdW1wJywgNDIsIDEwLCAxMCwgJy1maWxlJywgJy9f X2ltX3RtcC90bXBfMF8vdGVzdC00Mi1zcGluZHVtcC50eHQnXVxuIgorICAgICAgICBleHBlY3Rl ZF9zdGRvdXQgPSAiWycvdXNyL2Jpbi9zdWRvJywgJy1uJywgJy91c3Ivc2Jpbi9zcGluZHVtcCcs ICc0MicsICcxMCcsICcxMCcsICctZmlsZScsICcvX19pbV90bXAvdG1wXzBfL3Rlc3QtNDItc3Bp bmR1bXAudHh0J11cbiIKICAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNl bGYsIHBvcnQuc2FtcGxlX3Byb2Nlc3MsIGFyZ3M9Wyd0ZXN0JywgNDJdLCBleHBlY3RlZF9zdGRv dXQ9ZXhwZWN0ZWRfc3Rkb3V0KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuaG9zdC5m aWxlc3lzdGVtLmZpbGVzWycvbW9jay1idWlsZC9sYXlvdXQtdGVzdC1yZXN1bHRzL3Rlc3QtNDIt c3BpbmR1bXAudHh0J10sICdTcGluZHVtcCBmaWxlJykKICAgICAgICAgc2VsZi5hc3NlcnRJc05v bmUocG9ydC5ob3N0LmZpbGVzeXN0ZW0uZmlsZXNbJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi1z cGluZHVtcC50eHQnXSkKQEAgLTEyMSw3ICsxMjIsNyBAQCBjbGFzcyBEYXJ3aW5UZXN0KHBvcnRf dGVzdGNhc2UuUG9ydFRlc3RDCiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCiAgICAg ICAgIHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycvX19pbV90bXAvdG1wXzBfL3Rlc3QtNDIt c2FtcGxlLnR4dCddID0gJ1NhbXBsZSBmaWxlJwogICAgICAgICBwb3J0Lmhvc3QuZXhlY3V0aXZl ID0gTW9ja0V4ZWN1dGl2ZTIocnVuX2NvbW1hbmRfZm49bG9nZ2luZ19ydW5fY29tbWFuZCkKLSAg ICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9iaW4vc2FtcGxlJywgNDIsIDEwLCAxMCwg Jy1maWxlJywgJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi1zYW1wbGUudHh0J11cbiIKKyAgICAg ICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9iaW4vc2FtcGxlJywgJzQyJywgJzEwJywgJzEw JywgJy1maWxlJywgJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi1zYW1wbGUudHh0J11cbiIKICAg ICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBvcnQuc2FtcGxlX3By b2Nlc3MsIGFyZ3M9Wyd0ZXN0JywgNDJdLCBleHBlY3RlZF9zdGRvdXQ9ZXhwZWN0ZWRfc3Rkb3V0 KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycv bW9jay1idWlsZC9sYXlvdXQtdGVzdC1yZXN1bHRzL3Rlc3QtNDItc2FtcGxlLnR4dCddLCAnU2Ft cGxlIGZpbGUnKQogICAgICAgICBzZWxmLmFzc2VydElzTm9uZShwb3J0Lmhvc3QuZmlsZXN5c3Rl bS5maWxlc1snL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXNhbXBsZS50eHQnXSkKSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlLnB5CShyZXZpc2lvbiAyMTc5MDMp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZS5weQkod29ya2luZyBj b3B5KQpAQCAtOTUsMTIgKzk1LDYgQEAgY2xhc3MgSU9TRGV2aWNlUG9ydChJT1NQb3J0KToKICAg ICBkZWYgY2hlY2tfZm9yX2xlYWtzKHNlbGYsIHByb2Nlc3NfbmFtZSwgcHJvY2Vzc19waWQpOgog ICAgICAgICBwYXNzCiAKLSAgICBkZWYgbG9va19mb3JfbmV3X3NhbXBsZXMoc2VsZiwgdW5yZXNw b25zaXZlX3Byb2Nlc3Nlcywgc3RhcnRfdGltZSk6Ci0gICAgICAgIHJldHVybiB7fQotCi0gICAg ZGVmIHNhbXBsZV9wcm9jZXNzKHNlbGYsIG5hbWUsIHBpZCwgdGFyZ2V0X2hvc3Q9Tm9uZSk6Ci0g ICAgICAgIHBhc3MKLQogICAgICMgRGVzcGl0ZSB0aGVpciBuYW1lcywgdGhlc2UgZmxhZ3MgZG8g bm90IGFjdHVhbGx5IGdldCBwYXNzZWQgYWxsIHRoZSB3YXkgZG93biB0byB3ZWJraXQtYnVpbGQu CiAgICAgZGVmIF9idWlsZF9kcml2ZXJfZmxhZ3Moc2VsZik6CiAgICAgICAgIHJldHVybiBbJy0t c2RrJywgc2VsZi5TREtdICsgKFsnQVJDSFM9JXMnICUgc2VsZi5hcmNoaXRlY3R1cmUoKV0gaWYg c2VsZi5hcmNoaXRlY3R1cmUoKSBlbHNlIFtdKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2lvc19kZXZpY2VfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2VfdW5pdHRlc3QucHkJKHJldmlzaW9uIDIxNzkwMykK KysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlX3VuaXR0ZXN0LnB5CSh3 b3JraW5nIGNvcHkpCkBAIC0yMiwxMiArMjIsMTQgQEAKIAogaW1wb3J0IHRpbWUKIAorZnJvbSB3 ZWJraXRweS5jb21tb24uc3lzdGVtLm91dHB1dGNhcHR1cmUgaW1wb3J0IE91dHB1dENhcHR1cmUK K2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmVfbW9jayBpbXBvcnQgTW9ja0V4 ZWN1dGl2ZTIsIFNjcmlwdEVycm9yCiBmcm9tIHdlYmtpdHB5LnBvcnQuaW9zX2RldmljZSBpbXBv cnQgSU9TRGV2aWNlUG9ydAogZnJvbSB3ZWJraXRweS5wb3J0IGltcG9ydCBpb3NfdGVzdGNhc2UK IAogCiBjbGFzcyBJT1NEZXZpY2VUZXN0KGlvc190ZXN0Y2FzZS5JT1NUZXN0KToKLSAgICBvc19u YW1lID0gJ2lvcy1kZXZpY2UnCisgICAgb3NfbmFtZSA9ICdpb3MnCiAgICAgb3NfdmVyc2lvbiA9 ICcnCiAgICAgcG9ydF9uYW1lID0gJ2lvcy1kZXZpY2UnCiAgICAgcG9ydF9tYWtlciA9IElPU0Rl dmljZVBvcnQKQEAgLTQ0LDE3ICs0Niw0NiBAQCBjbGFzcyBJT1NEZXZpY2VUZXN0KGlvc190ZXN0 Y2FzZS5JT1NUZXN0CiAgICAgICAgIHdpdGggc2VsZi5hc3NlcnRSYWlzZXMoUnVudGltZUVycm9y KToKICAgICAgICAgICAgIHBvcnQucGF0aF90b19jcmFzaF9sb2dzKCkKIAotICAgIGRlZiB0ZXN0 X2dldF9jcmFzaF9sb2coc2VsZik6Ci0gICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChwb3J0 X25hbWU9c2VsZi5wb3J0X25hbWUpCi0gICAgICAgIHdpdGggc2VsZi5hc3NlcnRSYWlzZXMoUnVu dGltZUVycm9yKToKLSAgICAgICAgICAgIHBvcnQuX2dldF9jcmFzaF9sb2coJ0R1bXBSZW5kZXJU cmVlJywgMTIzNCwgTm9uZSwgTm9uZSwgdGltZS50aW1lKCksIHdhaXRfZm9yX2xvZz1GYWxzZSkK LQotICAgICMgRklYTUU6IFVwZGF0ZSB0ZXN0cyB3aGVuIDxyZGFyOi8vcHJvYmxlbS8zMDQ5Nzk5 MT4gaXMgY29tcGxldGVkLgogICAgIGRlZiB0ZXN0X3NwaW5kdW1wKHNlbGYpOgotICAgICAgICBw YXNzCisKKyAgICAgICAgZGVmIGxvZ2dpbmdfcnVuX2NvbW1hbmQoYXJncyk6CisgICAgICAgICAg ICBwcmludCBhcmdzCisKKyAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKKyAgICAgICAg cG9ydC5ob3N0LmZpbGVzeXN0ZW0uZmlsZXNbJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi1zcGlu ZHVtcC50eHQnXSA9ICdTcGluZHVtcCBmaWxlJworICAgICAgICBwb3J0Lmhvc3QuZXhlY3V0aXZl ID0gTW9ja0V4ZWN1dGl2ZTIocnVuX2NvbW1hbmRfZm49bG9nZ2luZ19ydW5fY29tbWFuZCkKKyAg ICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9zYmluL3NwaW5kdW1wJywgJzQyJywgJzEw JywgJzEwJywgJy1maWxlJywgJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi1zcGluZHVtcC50eHQn XVxuIgorICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgcG9ydC5z YW1wbGVfcHJvY2VzcywgYXJncz1bJ3Rlc3QnLCA0Ml0sIGV4cGVjdGVkX3N0ZG91dD1leHBlY3Rl ZF9zdGRvdXQpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5ob3N0LmZpbGVzeXN0ZW0u ZmlsZXNbJy9tb2NrLWJ1aWxkL2xheW91dC10ZXN0LXJlc3VsdHMvdGVzdC00Mi1zcGluZHVtcC50 eHQnXSwgJ1NwaW5kdW1wIGZpbGUnKQorICAgICAgICBzZWxmLmFzc2VydElzTm9uZShwb3J0Lmhv c3QuZmlsZXN5c3RlbS5maWxlc1snL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXNwaW5kdW1wLnR4 dCddKQogCiAgICAgZGVmIHRlc3Rfc2FtcGxlX3Byb2Nlc3Moc2VsZik6Ci0gICAgICAgIHBhc3MK KworICAgICAgICBkZWYgbG9nZ2luZ19ydW5fY29tbWFuZChhcmdzKToKKyAgICAgICAgICAgIGlm IGFyZ3NbMF0gPT0gJy91c3Ivc2Jpbi9zcGluZHVtcCc6CisgICAgICAgICAgICAgICAgcmV0dXJu IDEKKyAgICAgICAgICAgIHByaW50IGFyZ3MKKyAgICAgICAgICAgIHJldHVybiAwCisKKyAgICAg ICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKKyAgICAgICAgcG9ydC5ob3N0LmZpbGVzeXN0ZW0u ZmlsZXNbJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi1zYW1wbGUudHh0J10gPSAnU2FtcGxlIGZp bGUnCisgICAgICAgIHBvcnQuaG9zdC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihydW5fY29t bWFuZF9mbj1sb2dnaW5nX3J1bl9jb21tYW5kKQorICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSAi WycvdXNyL2Jpbi9zYW1wbGUnLCAnNDInLCAnMTAnLCAnMTAnLCAnLWZpbGUnLCAnL19faW1fdG1w L3RtcF8wXy90ZXN0LTQyLXNhbXBsZS50eHQnXVxuIgorICAgICAgICBPdXRwdXRDYXB0dXJlKCku YXNzZXJ0X291dHB1dHMoc2VsZiwgcG9ydC5zYW1wbGVfcHJvY2VzcywgYXJncz1bJ3Rlc3QnLCA0 Ml0sIGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9zdGRvdXQpCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwocG9ydC5ob3N0LmZpbGVzeXN0ZW0uZmlsZXNbJy9tb2NrLWJ1aWxkL2xheW91dC10ZXN0 LXJlc3VsdHMvdGVzdC00Mi1zYW1wbGUudHh0J10sICdTYW1wbGUgZmlsZScpCisgICAgICAgIHNl bGYuYXNzZXJ0SXNOb25lKHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycvX19pbV90bXAvdG1w XzBfL3Rlc3QtNDItc2FtcGxlLnR4dCddKQogCiAgICAgZGVmIHRlc3Rfc2FtcGxlX3Byb2Nlc3Nf ZXhjZXB0aW9uKHNlbGYpOgotICAgICAgICBwYXNzCisgICAgICAgIGRlZiB0aHJvd2luZ19ydW5f Y29tbWFuZChhcmdzKToKKyAgICAgICAgICAgIGlmIGFyZ3NbMF0gPT0gJy91c3Ivc2Jpbi9zcGlu ZHVtcCc6CisgICAgICAgICAgICAgICAgcmV0dXJuIDEKKyAgICAgICAgICAgIHJhaXNlIFNjcmlw dEVycm9yKCJNT0NLIHNjcmlwdCBlcnJvciIpCisKKyAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9w b3J0KCkKKyAgICAgICAgcG9ydC5ob3N0LmV4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKHJ1bl9j b21tYW5kX2ZuPXRocm93aW5nX3J1bl9jb21tYW5kKQorICAgICAgICBPdXRwdXRDYXB0dXJlKCku YXNzZXJ0X291dHB1dHMoc2VsZiwgcG9ydC5zYW1wbGVfcHJvY2VzcywgYXJncz1bJ3Rlc3QnLCA0 Ml0pCisKKyAgICBkZWYgdGVzdF9nZXRfY3Jhc2hfbG9nKHNlbGYpOgorICAgICAgICBwb3J0ID0g c2VsZi5tYWtlX3BvcnQocG9ydF9uYW1lPXNlbGYucG9ydF9uYW1lKQorICAgICAgICB3aXRoIHNl bGYuYXNzZXJ0UmFpc2VzKFJ1bnRpbWVFcnJvcik6CisgICAgICAgICAgICBwb3J0Ll9nZXRfY3Jh c2hfbG9nKCdEdW1wUmVuZGVyVHJlZScsIDEyMzQsIE5vbmUsIE5vbmUsIHRpbWUudGltZSgpLCB3 YWl0X2Zvcl9sb2c9RmFsc2UpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9z X3NpbXVsYXRvcl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvaW9zX3NpbXVsYXRvcl91bml0dGVzdC5weQkocmV2aXNpb24gMjE3OTAzKQorKysg VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19zaW11bGF0b3JfdW5pdHRlc3QucHkJKHdv cmtpbmcgY29weSkKQEAgLTMwLDcgKzMwLDcgQEAgZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVt LmV4ZWN1dGl2ZV9tbwogCiAKIGNsYXNzIElPU1NpbXVsYXRvclRlc3QoaW9zX3Rlc3RjYXNlLklP U1Rlc3QpOgotICAgIG9zX25hbWUgPSAnaW9zLXNpbXVsYXRvcicKKyAgICBvc19uYW1lID0gJ21h YycKICAgICBvc192ZXJzaW9uID0gJycKICAgICBwb3J0X25hbWUgPSAnaW9zLXNpbXVsYXRvcicK ICAgICBwb3J0X21ha2VyID0gSU9TU2ltdWxhdG9yUG9ydAo= 312317 2017-06-08 10:20:43 -0700 2017-06-08 13:01:11 -0700 Patch bug-171881-20170608102042.patch text/plain 7706 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNzkzMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI1IEBACisyMDE3LTA2LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUnVuIHNhbXBsZS9zcGluZHVtcCBvbiBpT1MgZGV2aWNl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxODgx CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjA4NDYwMj4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9kYXJ3 aW4ucHk6CisgICAgICAgIChEYXJ3aW5Qb3J0LnNhbXBsZV9wcm9jZXNzKTogT25seSBhZGQgc3Vk byBwcmVmaXggaWYgdGhlIHBsYXRmb3JtIGlzIE1hYywgd2hpY2gKKyAgICAgICAgcmVxdWlyZXMg c3VkbyB0byBydW4gc3BpbmR1bXAuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2lv c19kZXZpY2UucHk6CisgICAgICAgIChJT1NEZXZpY2VQb3J0Lmxvb2tfZm9yX25ld19zYW1wbGVz KTogRGVsZXRlZC4KKyAgICAgICAgKElPU0RldmljZVBvcnQuc2FtcGxlX3Byb2Nlc3MpOiBEZWxl dGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlX3VuaXR0ZXN0 LnB5OgorICAgICAgICAoSU9TRGV2aWNlVGVzdCk6IGlPUyBkZXZpY2VzIHVzZSAnaW9zJyBhbmQg dGhlaXIgb3NfbmFtZS4KKyAgICAgICAgKElPU0RldmljZVRlc3QudGVzdF9zcGluZHVtcCk6Cisg ICAgICAgIChJT1NEZXZpY2VUZXN0LnRlc3Rfc2FtcGxlX3Byb2Nlc3MpOgorICAgICAgICAoSU9T RGV2aWNlVGVzdC50ZXN0X3NhbXBsZV9wcm9jZXNzX2V4Y2VwdGlvbik6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9wb3J0L2lvc19zaW11bGF0b3JfdW5pdHRlc3QucHk6CisgICAgICAgIChJ T1NTaW11bGF0b3JUZXN0KTogaU9TIFNpbXVsYXRvcnMgcnVuIG9uIE1hYyBhbmQgdXNlICdtYWMn IGFzIHRoZWlyIG9zX25hbWUuCisKIDIwMTctMDYtMDcgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFw cGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIGFkZGl0aW9uYWxSZWFkQWNjZXNzQWxsb3dlZFVS THMgZG9lc27igJl0IHByZXNlcnZlIG5vbi1MYXRpbjEgcGF0aHMKSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9kYXJ3aW4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L2Rhcndpbi5weQkocmV2aXNpb24gMjE3OTMxKQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wb3J0L2Rhcndpbi5weQkod29ya2luZyBjb3B5KQpAQCAtMTU0LDI0ICsxNTQs MjQgQEAgY2xhc3MgRGFyd2luUG9ydChBcHBsZVBvcnQpOgogICAgIGRlZiBzYW1wbGVfcHJvY2Vz cyhzZWxmLCBuYW1lLCBwaWQsIHRhcmdldF9ob3N0PU5vbmUpOgogICAgICAgICBob3N0ID0gdGFy Z2V0X2hvc3Qgb3Igc2VsZi5ob3N0CiAgICAgICAgIHRlbXBkaXIgPSBob3N0LmZpbGVzeXN0ZW0u bWtkdGVtcCgpCi0gICAgICAgIGV4aXRfc3RhdHVzID0gaG9zdC5leGVjdXRpdmUucnVuX2NvbW1h bmQoWwotICAgICAgICAgICAgIi91c3IvYmluL3N1ZG8iLAotICAgICAgICAgICAgIi1uIiwKLSAg ICAgICAgICAgICIvdXNyL3NiaW4vc3BpbmR1bXAiLAorICAgICAgICBjb21tYW5kID0gWworICAg ICAgICAgICAgJy91c3Ivc2Jpbi9zcGluZHVtcCcsCiAgICAgICAgICAgICBwaWQsCiAgICAgICAg ICAgICAxMCwKICAgICAgICAgICAgIDEwLAotICAgICAgICAgICAgIi1maWxlIiwKKyAgICAgICAg ICAgICctZmlsZScsCiAgICAgICAgICAgICBEYXJ3aW5Qb3J0LnNwaW5kdW1wX2ZpbGVfcGF0aCho b3N0LCBuYW1lLCBwaWQsIHN0cih0ZW1wZGlyKSksCi0gICAgICAgIF0sIHJldHVybl9leGl0X2Nv ZGU9VHJ1ZSkKKyAgICAgICAgXQorICAgICAgICBjb21tYW5kID0gWycvdXNyL2Jpbi9zdWRvJywg Jy1uJ10gKyBjb21tYW5kIGlmIHNlbGYuaG9zdC5wbGF0Zm9ybS5pc19tYWMoKSBlbHNlIGNvbW1h bmQKKyAgICAgICAgZXhpdF9zdGF0dXMgPSBob3N0LmV4ZWN1dGl2ZS5ydW5fY29tbWFuZChjb21t YW5kLCByZXR1cm5fZXhpdF9jb2RlPVRydWUpCiAgICAgICAgIGlmIGV4aXRfc3RhdHVzOgogICAg ICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIGhvc3QuZXhlY3V0aXZlLnJ1bl9jb21tYW5k KFsKLSAgICAgICAgICAgICAgICAgICAgIi91c3IvYmluL3NhbXBsZSIsCisgICAgICAgICAgICAg ICAgICAgICcvdXNyL2Jpbi9zYW1wbGUnLAogICAgICAgICAgICAgICAgICAgICBwaWQsCiAgICAg ICAgICAgICAgICAgICAgIDEwLAogICAgICAgICAgICAgICAgICAgICAxMCwKLSAgICAgICAgICAg ICAgICAgICAgIi1maWxlIiwKKyAgICAgICAgICAgICAgICAgICAgJy1maWxlJywKICAgICAgICAg ICAgICAgICAgICAgRGFyd2luUG9ydC5zYW1wbGVfZmlsZV9wYXRoKGhvc3QsIG5hbWUsIHBpZCwg c3RyKHRlbXBkaXIpKSwKICAgICAgICAgICAgICAgICBdKQogICAgICAgICAgICAgICAgIGhvc3Qu ZmlsZXN5c3RlbS5tb3ZlX3RvX2Jhc2VfaG9zdChEYXJ3aW5Qb3J0LnNhbXBsZV9maWxlX3BhdGgo aG9zdCwgbmFtZSwgcGlkLCBzdHIodGVtcGRpcikpLApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2lvc19kZXZpY2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2lvc19kZXZpY2UucHkJKHJldmlzaW9uIDIxNzkzMSkKKysrIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC05NSwxMiAr OTUsNiBAQCBjbGFzcyBJT1NEZXZpY2VQb3J0KElPU1BvcnQpOgogICAgIGRlZiBjaGVja19mb3Jf bGVha3Moc2VsZiwgcHJvY2Vzc19uYW1lLCBwcm9jZXNzX3BpZCk6CiAgICAgICAgIHBhc3MKIAot ICAgIGRlZiBsb29rX2Zvcl9uZXdfc2FtcGxlcyhzZWxmLCB1bnJlc3BvbnNpdmVfcHJvY2Vzc2Vz LCBzdGFydF90aW1lKToKLSAgICAgICAgcmV0dXJuIHt9Ci0KLSAgICBkZWYgc2FtcGxlX3Byb2Nl c3Moc2VsZiwgbmFtZSwgcGlkLCB0YXJnZXRfaG9zdD1Ob25lKToKLSAgICAgICAgcGFzcwotCiAg ICAgIyBEZXNwaXRlIHRoZWlyIG5hbWVzLCB0aGVzZSBmbGFncyBkbyBub3QgYWN0dWFsbHkgZ2V0 IHBhc3NlZCBhbGwgdGhlIHdheSBkb3duIHRvIHdlYmtpdC1idWlsZC4KICAgICBkZWYgX2J1aWxk X2RyaXZlcl9mbGFncyhzZWxmKToKICAgICAgICAgcmV0dXJuIFsnLS1zZGsnLCBzZWxmLlNES10g KyAoWydBUkNIUz0lcycgJSBzZWxmLmFyY2hpdGVjdHVyZSgpXSBpZiBzZWxmLmFyY2hpdGVjdHVy ZSgpIGVsc2UgW10pCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2Rldmlj ZV91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv aW9zX2RldmljZV91bml0dGVzdC5weQkocmV2aXNpb24gMjE3OTMxKQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2VfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAg LTIyLDEyICsyMiwxNCBAQAogCiBpbXBvcnQgdGltZQogCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5z eXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQorZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLmV4ZWN1dGl2ZV9tb2NrIGltcG9ydCBNb2NrRXhlY3V0aXZlMiwgU2NyaXB0 RXJyb3IKIGZyb20gd2Via2l0cHkucG9ydC5pb3NfZGV2aWNlIGltcG9ydCBJT1NEZXZpY2VQb3J0 CiBmcm9tIHdlYmtpdHB5LnBvcnQgaW1wb3J0IGlvc190ZXN0Y2FzZQogCiAKIGNsYXNzIElPU0Rl dmljZVRlc3QoaW9zX3Rlc3RjYXNlLklPU1Rlc3QpOgotICAgIG9zX25hbWUgPSAnaW9zLWRldmlj ZScKKyAgICBvc19uYW1lID0gJ2lvcycKICAgICBvc192ZXJzaW9uID0gJycKICAgICBwb3J0X25h bWUgPSAnaW9zLWRldmljZScKICAgICBwb3J0X21ha2VyID0gSU9TRGV2aWNlUG9ydApAQCAtNDQs MTcgKzQ2LDQ2IEBAIGNsYXNzIElPU0RldmljZVRlc3QoaW9zX3Rlc3RjYXNlLklPU1Rlc3QKICAg ICAgICAgd2l0aCBzZWxmLmFzc2VydFJhaXNlcyhSdW50aW1lRXJyb3IpOgogICAgICAgICAgICAg cG9ydC5wYXRoX3RvX2NyYXNoX2xvZ3MoKQogCi0gICAgZGVmIHRlc3RfZ2V0X2NyYXNoX2xvZyhz ZWxmKToKLSAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHBvcnRfbmFtZT1zZWxmLnBvcnRf bmFtZSkKLSAgICAgICAgd2l0aCBzZWxmLmFzc2VydFJhaXNlcyhSdW50aW1lRXJyb3IpOgotICAg ICAgICAgICAgcG9ydC5fZ2V0X2NyYXNoX2xvZygnRHVtcFJlbmRlclRyZWUnLCAxMjM0LCBOb25l LCBOb25lLCB0aW1lLnRpbWUoKSwgd2FpdF9mb3JfbG9nPUZhbHNlKQotCi0gICAgIyBGSVhNRTog VXBkYXRlIHRlc3RzIHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzMwNDk3OTkxPiBpcyBjb21wbGV0ZWQu CiAgICAgZGVmIHRlc3Rfc3BpbmR1bXAoc2VsZik6Ci0gICAgICAgIHBhc3MKKworICAgICAgICBk ZWYgbG9nZ2luZ19ydW5fY29tbWFuZChhcmdzKToKKyAgICAgICAgICAgIHByaW50IGFyZ3MKKwor ICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQorICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5 c3RlbS5maWxlc1snL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXNwaW5kdW1wLnR4dCddID0gJ1Nw aW5kdW1wIGZpbGUnCisgICAgICAgIHBvcnQuaG9zdC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZl MihydW5fY29tbWFuZF9mbj1sb2dnaW5nX3J1bl9jb21tYW5kKQorICAgICAgICBleHBlY3RlZF9z dGRvdXQgPSAiWycvdXNyL3NiaW4vc3BpbmR1bXAnLCA0MiwgMTAsIDEwLCAnLWZpbGUnLCAnL19f aW1fdG1wL3RtcF8wXy90ZXN0LTQyLXNwaW5kdW1wLnR4dCddXG4iCisgICAgICAgIE91dHB1dENh cHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBwb3J0LnNhbXBsZV9wcm9jZXNzLCBhcmdzPVsn dGVzdCcsIDQyXSwgZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91dCkKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChwb3J0Lmhvc3QuZmlsZXN5c3RlbS5maWxlc1snL21vY2stYnVpbGQvbGF5 b3V0LXRlc3QtcmVzdWx0cy90ZXN0LTQyLXNwaW5kdW1wLnR4dCddLCAnU3BpbmR1bXAgZmlsZScp CisgICAgICAgIHNlbGYuYXNzZXJ0SXNOb25lKHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycv X19pbV90bXAvdG1wXzBfL3Rlc3QtNDItc3BpbmR1bXAudHh0J10pCiAKICAgICBkZWYgdGVzdF9z YW1wbGVfcHJvY2VzcyhzZWxmKToKLSAgICAgICAgcGFzcworCisgICAgICAgIGRlZiBsb2dnaW5n X3J1bl9jb21tYW5kKGFyZ3MpOgorICAgICAgICAgICAgaWYgYXJnc1swXSA9PSAnL3Vzci9zYmlu L3NwaW5kdW1wJzoKKyAgICAgICAgICAgICAgICByZXR1cm4gMQorICAgICAgICAgICAgcHJpbnQg YXJncworICAgICAgICAgICAgcmV0dXJuIDAKKworICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3Bv cnQoKQorICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5c3RlbS5maWxlc1snL19faW1fdG1wL3RtcF8w Xy90ZXN0LTQyLXNhbXBsZS50eHQnXSA9ICdTYW1wbGUgZmlsZScKKyAgICAgICAgcG9ydC5ob3N0 LmV4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKHJ1bl9jb21tYW5kX2ZuPWxvZ2dpbmdfcnVuX2Nv bW1hbmQpCisgICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICJbJy91c3IvYmluL3NhbXBsZScsIDQy LCAxMCwgMTAsICctZmlsZScsICcvX19pbV90bXAvdG1wXzBfL3Rlc3QtNDItc2FtcGxlLnR4dCdd XG4iCisgICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBwb3J0LnNh bXBsZV9wcm9jZXNzLCBhcmdzPVsndGVzdCcsIDQyXSwgZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVk X3N0ZG91dCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0Lmhvc3QuZmlsZXN5c3RlbS5m aWxlc1snL21vY2stYnVpbGQvbGF5b3V0LXRlc3QtcmVzdWx0cy90ZXN0LTQyLXNhbXBsZS50eHQn XSwgJ1NhbXBsZSBmaWxlJykKKyAgICAgICAgc2VsZi5hc3NlcnRJc05vbmUocG9ydC5ob3N0LmZp bGVzeXN0ZW0uZmlsZXNbJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi1zYW1wbGUudHh0J10pCiAK ICAgICBkZWYgdGVzdF9zYW1wbGVfcHJvY2Vzc19leGNlcHRpb24oc2VsZik6Ci0gICAgICAgIHBh c3MKKyAgICAgICAgZGVmIHRocm93aW5nX3J1bl9jb21tYW5kKGFyZ3MpOgorICAgICAgICAgICAg aWYgYXJnc1swXSA9PSAnL3Vzci9zYmluL3NwaW5kdW1wJzoKKyAgICAgICAgICAgICAgICByZXR1 cm4gMQorICAgICAgICAgICAgcmFpc2UgU2NyaXB0RXJyb3IoJ01PQ0sgc2NyaXB0IGVycm9yJykK KworICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQorICAgICAgICBwb3J0Lmhvc3QuZXhl Y3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIocnVuX2NvbW1hbmRfZm49dGhyb3dpbmdfcnVuX2NvbW1h bmQpCisgICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBwb3J0LnNh bXBsZV9wcm9jZXNzLCBhcmdzPVsndGVzdCcsIDQyXSkKKworICAgIGRlZiB0ZXN0X2dldF9jcmFz aF9sb2coc2VsZik6CisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydChwb3J0X25hbWU9c2Vs Zi5wb3J0X25hbWUpCisgICAgICAgIHdpdGggc2VsZi5hc3NlcnRSYWlzZXMoUnVudGltZUVycm9y KToKKyAgICAgICAgICAgIHBvcnQuX2dldF9jcmFzaF9sb2coJ0R1bXBSZW5kZXJUcmVlJywgMTIz NCwgTm9uZSwgTm9uZSwgdGltZS50aW1lKCksIHdhaXRfZm9yX2xvZz1GYWxzZSkKSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yX3VuaXR0ZXN0LnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yX3VuaXR0 ZXN0LnB5CShyZXZpc2lvbiAyMTc5MzEpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv aW9zX3NpbXVsYXRvcl91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzAsNyArMzAsOCBA QCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlX21vCiAKIAogY2xhc3MgSU9T U2ltdWxhdG9yVGVzdChpb3NfdGVzdGNhc2UuSU9TVGVzdCk6Ci0gICAgb3NfbmFtZSA9ICdpb3Mt c2ltdWxhdG9yJworICAgICMgRklYTUU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzMxMDcKKyAgICBvc19uYW1lID0gJ21hYycKICAgICBvc192ZXJzaW9uID0gJycK ICAgICBwb3J0X25hbWUgPSAnaW9zLXNpbXVsYXRvcicKICAgICBwb3J0X21ha2VyID0gSU9TU2lt dWxhdG9yUG9ydAo= 312335 2017-06-08 13:01:13 -0700 2017-06-08 13:39:04 -0700 Patch for landing bug-171881-20170608130112.patch text/plain 7711 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNzk0MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI1IEBACisyMDE3LTA2LTA4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUnVuIHNhbXBsZS9zcGluZHVtcCBvbiBpT1MgZGV2aWNl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxODgx CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjA4NDYwMj4KKworICAgICAgICBSZXZpZXdlZCBi eSBEYW5pZWwgQmF0ZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2lu LnB5OgorICAgICAgICAoRGFyd2luUG9ydC5zYW1wbGVfcHJvY2Vzcyk6IE9ubHkgYWRkIHN1ZG8g cHJlZml4IGlmIHRoZSBwbGF0Zm9ybSBpcyBNYWMsIHdoaWNoCisgICAgICAgIHJlcXVpcmVzIHN1 ZG8gdG8gcnVuIHNwaW5kdW1wLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nf ZGV2aWNlLnB5OgorICAgICAgICAoSU9TRGV2aWNlUG9ydC5sb29rX2Zvcl9uZXdfc2FtcGxlcyk6 IERlbGV0ZWQuCisgICAgICAgIChJT1NEZXZpY2VQb3J0LnNhbXBsZV9wcm9jZXNzKTogRGVsZXRl ZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZV91bml0dGVzdC5w eToKKyAgICAgICAgKElPU0RldmljZVRlc3QpOiBpT1MgZGV2aWNlcyB1c2UgJ2lvcycgYW5kIHRo ZWlyIG9zX25hbWUuCisgICAgICAgIChJT1NEZXZpY2VUZXN0LnRlc3Rfc3BpbmR1bXApOgorICAg ICAgICAoSU9TRGV2aWNlVGVzdC50ZXN0X3NhbXBsZV9wcm9jZXNzKToKKyAgICAgICAgKElPU0Rl dmljZVRlc3QudGVzdF9zYW1wbGVfcHJvY2Vzc19leGNlcHRpb24pOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yX3VuaXR0ZXN0LnB5OgorICAgICAgICAoSU9T U2ltdWxhdG9yVGVzdCk6IGlPUyBTaW11bGF0b3JzIHJ1biBvbiBNYWMgYW5kIHVzZSAnbWFjJyBh cyB0aGVpciBvc19uYW1lLgorCiAyMDE3LTA2LTA4ICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxs ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYkFzc2VtYmx5OiBXZSBzaG91bGQgb25seSBjcmVh dGUgd3JhcHBlcnMgZm9yIGZ1bmN0aW9ucyB0aGF0IGNhbiBiZSBleHBvcnRlZApJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rhcndpbi5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5CShyZXZpc2lvbiAyMTc5NDIpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNTQs MjQgKzE1NCwyNSBAQCBjbGFzcyBEYXJ3aW5Qb3J0KEFwcGxlUG9ydCk6CiAgICAgZGVmIHNhbXBs ZV9wcm9jZXNzKHNlbGYsIG5hbWUsIHBpZCwgdGFyZ2V0X2hvc3Q9Tm9uZSk6CiAgICAgICAgIGhv c3QgPSB0YXJnZXRfaG9zdCBvciBzZWxmLmhvc3QKICAgICAgICAgdGVtcGRpciA9IGhvc3QuZmls ZXN5c3RlbS5ta2R0ZW1wKCkKLSAgICAgICAgZXhpdF9zdGF0dXMgPSBob3N0LmV4ZWN1dGl2ZS5y dW5fY29tbWFuZChbCi0gICAgICAgICAgICAiL3Vzci9iaW4vc3VkbyIsCi0gICAgICAgICAgICAi LW4iLAotICAgICAgICAgICAgIi91c3Ivc2Jpbi9zcGluZHVtcCIsCisgICAgICAgIGNvbW1hbmQg PSBbCisgICAgICAgICAgICAnL3Vzci9zYmluL3NwaW5kdW1wJywKICAgICAgICAgICAgIHBpZCwK ICAgICAgICAgICAgIDEwLAogICAgICAgICAgICAgMTAsCi0gICAgICAgICAgICAiLWZpbGUiLAor ICAgICAgICAgICAgJy1maWxlJywKICAgICAgICAgICAgIERhcndpblBvcnQuc3BpbmR1bXBfZmls ZV9wYXRoKGhvc3QsIG5hbWUsIHBpZCwgc3RyKHRlbXBkaXIpKSwKLSAgICAgICAgXSwgcmV0dXJu X2V4aXRfY29kZT1UcnVlKQorICAgICAgICBdCisgICAgICAgIGlmIHNlbGYuaG9zdC5wbGF0Zm9y bS5pc19tYWMoKToKKyAgICAgICAgICAgIGNvbW1hbmQgPSBbJy91c3IvYmluL3N1ZG8nLCAnLW4n XSArIGNvbW1hbmQKKyAgICAgICAgZXhpdF9zdGF0dXMgPSBob3N0LmV4ZWN1dGl2ZS5ydW5fY29t bWFuZChjb21tYW5kLCByZXR1cm5fZXhpdF9jb2RlPVRydWUpCiAgICAgICAgIGlmIGV4aXRfc3Rh dHVzOgogICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIGhvc3QuZXhlY3V0aXZlLnJ1 bl9jb21tYW5kKFsKLSAgICAgICAgICAgICAgICAgICAgIi91c3IvYmluL3NhbXBsZSIsCisgICAg ICAgICAgICAgICAgICAgICcvdXNyL2Jpbi9zYW1wbGUnLAogICAgICAgICAgICAgICAgICAgICBw aWQsCiAgICAgICAgICAgICAgICAgICAgIDEwLAogICAgICAgICAgICAgICAgICAgICAxMCwKLSAg ICAgICAgICAgICAgICAgICAgIi1maWxlIiwKKyAgICAgICAgICAgICAgICAgICAgJy1maWxlJywK ICAgICAgICAgICAgICAgICAgICAgRGFyd2luUG9ydC5zYW1wbGVfZmlsZV9wYXRoKGhvc3QsIG5h bWUsIHBpZCwgc3RyKHRlbXBkaXIpKSwKICAgICAgICAgICAgICAgICBdKQogICAgICAgICAgICAg ICAgIGhvc3QuZmlsZXN5c3RlbS5tb3ZlX3RvX2Jhc2VfaG9zdChEYXJ3aW5Qb3J0LnNhbXBsZV9m aWxlX3BhdGgoaG9zdCwgbmFtZSwgcGlkLCBzdHIodGVtcGRpcikpLApJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2UucHkJKHJldmlzaW9uIDIxNzk0MikKKysrIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlLnB5CSh3b3JraW5nIGNvcHkpCkBA IC05NSwxMiArOTUsNiBAQCBjbGFzcyBJT1NEZXZpY2VQb3J0KElPU1BvcnQpOgogICAgIGRlZiBj aGVja19mb3JfbGVha3Moc2VsZiwgcHJvY2Vzc19uYW1lLCBwcm9jZXNzX3BpZCk6CiAgICAgICAg IHBhc3MKIAotICAgIGRlZiBsb29rX2Zvcl9uZXdfc2FtcGxlcyhzZWxmLCB1bnJlc3BvbnNpdmVf cHJvY2Vzc2VzLCBzdGFydF90aW1lKToKLSAgICAgICAgcmV0dXJuIHt9Ci0KLSAgICBkZWYgc2Ft cGxlX3Byb2Nlc3Moc2VsZiwgbmFtZSwgcGlkLCB0YXJnZXRfaG9zdD1Ob25lKToKLSAgICAgICAg cGFzcwotCiAgICAgIyBEZXNwaXRlIHRoZWlyIG5hbWVzLCB0aGVzZSBmbGFncyBkbyBub3QgYWN0 dWFsbHkgZ2V0IHBhc3NlZCBhbGwgdGhlIHdheSBkb3duIHRvIHdlYmtpdC1idWlsZC4KICAgICBk ZWYgX2J1aWxkX2RyaXZlcl9mbGFncyhzZWxmKToKICAgICAgICAgcmV0dXJuIFsnLS1zZGsnLCBz ZWxmLlNES10gKyAoWydBUkNIUz0lcycgJSBzZWxmLmFyY2hpdGVjdHVyZSgpXSBpZiBzZWxmLmFy Y2hpdGVjdHVyZSgpIGVsc2UgW10pCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv aW9zX2RldmljZV91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvaW9zX2RldmljZV91bml0dGVzdC5weQkocmV2aXNpb24gMjE3OTQyKQorKysgVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2VfdW5pdHRlc3QucHkJKHdvcmtpbmcg Y29weSkKQEAgLTIyLDEyICsyMiwxNCBAQAogCiBpbXBvcnQgdGltZQogCitmcm9tIHdlYmtpdHB5 LmNvbW1vbi5zeXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQorZnJvbSB3 ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZV9tb2NrIGltcG9ydCBNb2NrRXhlY3V0aXZl MiwgU2NyaXB0RXJyb3IKIGZyb20gd2Via2l0cHkucG9ydC5pb3NfZGV2aWNlIGltcG9ydCBJT1NE ZXZpY2VQb3J0CiBmcm9tIHdlYmtpdHB5LnBvcnQgaW1wb3J0IGlvc190ZXN0Y2FzZQogCiAKIGNs YXNzIElPU0RldmljZVRlc3QoaW9zX3Rlc3RjYXNlLklPU1Rlc3QpOgotICAgIG9zX25hbWUgPSAn aW9zLWRldmljZScKKyAgICBvc19uYW1lID0gJ2lvcycKICAgICBvc192ZXJzaW9uID0gJycKICAg ICBwb3J0X25hbWUgPSAnaW9zLWRldmljZScKICAgICBwb3J0X21ha2VyID0gSU9TRGV2aWNlUG9y dApAQCAtNDQsMTcgKzQ2LDQ0IEBAIGNsYXNzIElPU0RldmljZVRlc3QoaW9zX3Rlc3RjYXNlLklP U1Rlc3QKICAgICAgICAgd2l0aCBzZWxmLmFzc2VydFJhaXNlcyhSdW50aW1lRXJyb3IpOgogICAg ICAgICAgICAgcG9ydC5wYXRoX3RvX2NyYXNoX2xvZ3MoKQogCi0gICAgZGVmIHRlc3RfZ2V0X2Ny YXNoX2xvZyhzZWxmKToKLSAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHBvcnRfbmFtZT1z ZWxmLnBvcnRfbmFtZSkKLSAgICAgICAgd2l0aCBzZWxmLmFzc2VydFJhaXNlcyhSdW50aW1lRXJy b3IpOgotICAgICAgICAgICAgcG9ydC5fZ2V0X2NyYXNoX2xvZygnRHVtcFJlbmRlclRyZWUnLCAx MjM0LCBOb25lLCBOb25lLCB0aW1lLnRpbWUoKSwgd2FpdF9mb3JfbG9nPUZhbHNlKQotCi0gICAg IyBGSVhNRTogVXBkYXRlIHRlc3RzIHdoZW4gPHJkYXI6Ly9wcm9ibGVtLzMwNDk3OTkxPiBpcyBj b21wbGV0ZWQuCiAgICAgZGVmIHRlc3Rfc3BpbmR1bXAoc2VsZik6Ci0gICAgICAgIHBhc3MKKyAg ICAgICAgZGVmIGxvZ2dpbmdfcnVuX2NvbW1hbmQoYXJncyk6CisgICAgICAgICAgICBwcmludCBh cmdzCisKKyAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKKyAgICAgICAgcG9ydC5ob3N0 LmZpbGVzeXN0ZW0uZmlsZXNbJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi1zcGluZHVtcC50eHQn XSA9ICdTcGluZHVtcCBmaWxlJworICAgICAgICBwb3J0Lmhvc3QuZXhlY3V0aXZlID0gTW9ja0V4 ZWN1dGl2ZTIocnVuX2NvbW1hbmRfZm49bG9nZ2luZ19ydW5fY29tbWFuZCkKKyAgICAgICAgZXhw ZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9zYmluL3NwaW5kdW1wJywgNDIsIDEwLCAxMCwgJy1maWxl JywgJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi1zcGluZHVtcC50eHQnXVxuIgorICAgICAgICBP dXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgcG9ydC5zYW1wbGVfcHJvY2Vzcywg YXJncz1bJ3Rlc3QnLCA0Ml0sIGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9zdGRvdXQpCisgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5ob3N0LmZpbGVzeXN0ZW0uZmlsZXNbJy9tb2NrLWJ1 aWxkL2xheW91dC10ZXN0LXJlc3VsdHMvdGVzdC00Mi1zcGluZHVtcC50eHQnXSwgJ1NwaW5kdW1w IGZpbGUnKQorICAgICAgICBzZWxmLmFzc2VydElzTm9uZShwb3J0Lmhvc3QuZmlsZXN5c3RlbS5m aWxlc1snL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXNwaW5kdW1wLnR4dCddKQogCiAgICAgZGVm IHRlc3Rfc2FtcGxlX3Byb2Nlc3Moc2VsZik6Ci0gICAgICAgIHBhc3MKKyAgICAgICAgZGVmIGxv Z2dpbmdfcnVuX2NvbW1hbmQoYXJncyk6CisgICAgICAgICAgICBpZiBhcmdzWzBdID09ICcvdXNy L3NiaW4vc3BpbmR1bXAnOgorICAgICAgICAgICAgICAgIHJldHVybiAxCisgICAgICAgICAgICBw cmludCBhcmdzCisgICAgICAgICAgICByZXR1cm4gMAorCisgICAgICAgIHBvcnQgPSBzZWxmLm1h a2VfcG9ydCgpCisgICAgICAgIHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycvX19pbV90bXAv dG1wXzBfL3Rlc3QtNDItc2FtcGxlLnR4dCddID0gJ1NhbXBsZSBmaWxlJworICAgICAgICBwb3J0 Lmhvc3QuZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIocnVuX2NvbW1hbmRfZm49bG9nZ2luZ19y dW5fY29tbWFuZCkKKyAgICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9iaW4vc2FtcGxl JywgNDIsIDEwLCAxMCwgJy1maWxlJywgJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi1zYW1wbGUu dHh0J11cbiIKKyAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBv cnQuc2FtcGxlX3Byb2Nlc3MsIGFyZ3M9Wyd0ZXN0JywgNDJdLCBleHBlY3RlZF9zdGRvdXQ9ZXhw ZWN0ZWRfc3Rkb3V0KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuaG9zdC5maWxlc3lz dGVtLmZpbGVzWycvbW9jay1idWlsZC9sYXlvdXQtdGVzdC1yZXN1bHRzL3Rlc3QtNDItc2FtcGxl LnR4dCddLCAnU2FtcGxlIGZpbGUnKQorICAgICAgICBzZWxmLmFzc2VydElzTm9uZShwb3J0Lmhv c3QuZmlsZXN5c3RlbS5maWxlc1snL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXNhbXBsZS50eHQn XSkKIAogICAgIGRlZiB0ZXN0X3NhbXBsZV9wcm9jZXNzX2V4Y2VwdGlvbihzZWxmKToKLSAgICAg ICAgcGFzcworICAgICAgICBkZWYgdGhyb3dpbmdfcnVuX2NvbW1hbmQoYXJncyk6CisgICAgICAg ICAgICBpZiBhcmdzWzBdID09ICcvdXNyL3NiaW4vc3BpbmR1bXAnOgorICAgICAgICAgICAgICAg IHJldHVybiAxCisgICAgICAgICAgICByYWlzZSBTY3JpcHRFcnJvcignTU9DSyBzY3JpcHQgZXJy b3InKQorCisgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgpCisgICAgICAgIHBvcnQuaG9z dC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihydW5fY29tbWFuZF9mbj10aHJvd2luZ19ydW5f Y29tbWFuZCkKKyAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHBv cnQuc2FtcGxlX3Byb2Nlc3MsIGFyZ3M9Wyd0ZXN0JywgNDJdKQorCisgICAgZGVmIHRlc3RfZ2V0 X2NyYXNoX2xvZyhzZWxmKToKKyAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHBvcnRfbmFt ZT1zZWxmLnBvcnRfbmFtZSkKKyAgICAgICAgd2l0aCBzZWxmLmFzc2VydFJhaXNlcyhSdW50aW1l RXJyb3IpOgorICAgICAgICAgICAgcG9ydC5fZ2V0X2NyYXNoX2xvZygnRHVtcFJlbmRlclRyZWUn LCAxMjM0LCBOb25lLCBOb25lLCB0aW1lLnRpbWUoKSwgd2FpdF9mb3JfbG9nPUZhbHNlKQpJbmRl eDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19zaW11bGF0b3JfdW5pdHRlc3QucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19zaW11bGF0b3Jf dW5pdHRlc3QucHkJKHJldmlzaW9uIDIxNzk0MikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9pb3Nfc2ltdWxhdG9yX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zMCw3ICsz MCw4IEBAIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmVfbW8KIAogCiBjbGFz cyBJT1NTaW11bGF0b3JUZXN0KGlvc190ZXN0Y2FzZS5JT1NUZXN0KToKLSAgICBvc19uYW1lID0g J2lvcy1zaW11bGF0b3InCisgICAgIyBGSVhNRTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3MzEwNworICAgIG9zX25hbWUgPSAnbWFjJwogICAgIG9zX3ZlcnNpb24g PSAnJwogICAgIHBvcnRfbmFtZSA9ICdpb3Mtc2ltdWxhdG9yJwogICAgIHBvcnRfbWFrZXIgPSBJ T1NTaW11bGF0b3JQb3J0Cg==