93233 2012-08-06 01:36:42 -0700 [Chromium]duplicated command line options in Android LayoutTest 2012-08-06 22:48:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 james.wei james.wei abarth dpranke ojan peter tony wangxianzhu webkit.review.bot oldest_to_newest 687858 0 james.wei 2012-08-06 01:36:42 -0700 [Chromium]duplicated command line options in Android LayoutTest 687861 1 156622 james.wei 2012-08-06 01:40:07 -0700 Created attachment 156622 Patch 687865 2 webkit.review.bot 2012-08-06 01:42:56 -0700 Attachment 156622 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitpy..." exit_code: 1 Tools/ChangeLog:11: Line contains tab character. [whitespace/tab] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 687872 3 156626 james.wei 2012-08-06 01:56:06 -0700 Created attachment 156626 Patch 687888 4 156626 tony 2012-08-06 02:17:15 -0700 Comment on attachment 156626 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156626&action=review Seems fine, but should we add a unit test for this? > Tools/ChangeLog:12 > + If there are multiple ChromiumAndroidPort instances, these two options > + will be appended for multiple times. Do we normally have multiple ChromiumAndroidPort instances? Does having these options multiple times cause anything to break? 687912 5 james.wei 2012-08-06 02:34:14 -0700 (In reply to comment #4) > (From update of attachment 156626 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=156626&action=review > > Seems fine, but should we add a unit test for this? > ok. I will add an unit test for it. > > Tools/ChangeLog:12 > > + If there are multiple ChromiumAndroidPort instances, these two options > > + will be appended for multiple times. > > Do we normally have multiple ChromiumAndroidPort instances? Does having these options multiple times cause anything to break? when I tried chromium android layout test, there are actually two ChromiumAndroidPort instances. So the command line contains two copies of "--encode-binary" and "--enable-hardware-gpu". I have not found anything broken by it but just feel odd to have multiple same options in the file chrome-native-tests-command-line. 688180 6 156626 wangxianzhu 2012-08-06 09:08:58 -0700 Comment on attachment 156626 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156626&action=review >>> Tools/ChangeLog:12 >>> + will be appended for multiple times. >> >> Do we normally have multiple ChromiumAndroidPort instances? Does having these options multiple times cause anything to break? > > when I tried chromium android layout test, there are actually two ChromiumAndroidPort instances. So the command line contains two copies of "--encode-binary" and "--enable-hardware-gpu". > > I have not found anything broken by it but just feel odd to have multiple same options in the file chrome-native-tests-command-line. Just curious, do you know where the two instances are created and why they share the same self._options.additional_drt_flags? 688628 7 james.wei 2012-08-06 17:58:13 -0700 (In reply to comment #6) > (From update of attachment 156626 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=156626&action=review > > >>> Tools/ChangeLog:12 > >>> + will be appended for multiple times. > >> > >> Do we normally have multiple ChromiumAndroidPort instances? Does having these options multiple times cause anything to break? > > > > when I tried chromium android layout test, there are actually two ChromiumAndroidPort instances. So the command line contains two copies of "--encode-binary" and "--enable-hardware-gpu". > > > > I have not found anything broken by it but just feel odd to have multiple same options in the file chrome-native-tests-command-line. > > Just curious, do you know where the two instances are created and why they share the same self._options.additional_drt_flags? the call stack of the first one: 1. run_webkit_tests.py line 468, in main port = host.port_factory.get(options.platform, options) 2. factory.py line 114 return cls(self._host, port_name, options=options, **kwargs) 3. chromium_android.py __init__ the call stack of the second one: 1. run_webkit_tests.py line 110, in run unexpected_result_count = manager.run(args) 2. manager.py line 418, in run self._run_tests(self._test_names, result_summary, int(self._options.child_processes)) 3. manager.py line 471, in _run_tests return self._runner.run_tests(test_inputs, self._expectations, result_summary, num_workers, needs_http, needs_websockets, self._retrying) 4. layout_test_runner.py line 140, in run_tests pool.run(('test_list', shard.name, shard.test_inputs) for shard in all_shards) 5. message_pool.py line 97, in run self.wait() 6. message_pool.py line 127, in wait self._workers[0].run() 7. message_pool.py line 267, in run self._raise(sys.exc_info()) 8. message_pool.py line 251, in run worker.start() 9. layout_test_runner.py line 293, in start self._port = self._host.port_factory.get(self._options.platform, self._options) 10. factory.py line 114, in get return cls(self._host, port_name, options=options, **kwargs) 11. chromium_android.py __init__ they have the same options argument from main() of run_webkit_tests.py. 688632 8 james.wei 2012-08-06 18:06:04 -0700 will it make more sense to make the port instance singleton? that is, in factory.py, get() function can store the instance and return it when others call get() for the instance for the same port-name. but I don't know whether such chagne will break anything. 688681 9 tony 2012-08-06 18:59:29 -0700 Another approach would be to not mutate options.additional_drt_flag. E.g., in driver.py's cmd_line, in addition to using _port.get_option('aditional_drt_flag', ...), we could add a _port.additional_drt_flag() method. Dirk, thoughts? 688689 10 dpranke 2012-08-06 19:11:55 -0700 (In reply to comment #9) > Another approach would be to not mutate options.additional_drt_flag. E.g., in driver.py's cmd_line, in addition to using _port.get_option('aditional_drt_flag', ...), we could add a _port.additional_drt_flag() method. > > Dirk, thoughts? That might be slightly better. It's probably a flaw to be mutating the options argument in the port classes, but the assumption that we can do that pervades the code at the moment. 688743 11 156848 james.wei 2012-08-06 20:28:00 -0700 Created attachment 156848 Patch 688744 12 james.wei 2012-08-06 20:29:46 -0700 tony, I have modified the patch to use your approach and added an unit test. could you help to review the new patch? thanks 688745 13 156848 tony 2012-08-06 20:32:51 -0700 Comment on attachment 156848 Patch Can you rebase your change against HEAD? 688796 14 156858 james.wei 2012-08-06 21:46:21 -0700 Created attachment 156858 Patch 688835 15 156858 webkit.review.bot 2012-08-06 22:47:58 -0700 Comment on attachment 156858 Patch Clearing flags on attachment: 156858 Committed r124851: <http://trac.webkit.org/changeset/124851> 688836 16 webkit.review.bot 2012-08-06 22:48:03 -0700 All reviewed patches have been landed. Closing bug. 156622 2012-08-06 01:40:07 -0700 2012-08-06 01:56:00 -0700 Patch bug-93233-20120806163958.patch text/plain 2164 james.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NzIwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzE2MmNhYmI0ZGRhYjA1MDA0ZTlkNTgxN2M4YzNlZmRm NjQ4Zjk2MS4uOTM5MDZiNjEwNGU2OTk0YTM1YWNkYjc5ODM1MTA5YzU0ZGY1ZmEyNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEyLTA4LTA2ICBXZWkgSmFtZXMgIDxqYW1lcy53ZWlAaW50ZWwuY29tPgorCisgICAg ICAgIFtDaHJvbWl1bV1kdXBsaWNhdGVkIGNvbW1hbmQgbGluZSBvcHRpb25zIGluIEFuZHJvaWQg TGF5b3V0VGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTMyMzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBEdXBsaWNhdGVkIG9wdGlvbnMgZm91bmQgaW4gQW5kcm9pZCBsYXlvdXQgdGVzdCBjb21tYW5k IGxpbmU6CisgICAgICAgIC0tZW5jb2RlLWJpbmFyeSBhbmQgLS1lbmFibGUtaGFyZHdhcmUtZ3B1 LgorCisJCUlmIHRoZXJlIGFyZSBtdWx0aXBsZSBDaHJvbWl1bUFuZHJvaWRQb3J0IGluc3RhbmNl cywgdGhlc2UgdHdvIG9wdGlvbnMKKyAgICAgICAgd2lsbCBiZSBhcHBlbmRlZCBmb3IgbXVsdGlw bGUgdGltZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtX2FuZHJvaWQucHk6CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWRQb3J0Ll9faW5p dF9fKToKKwogMjAxMi0wOC0wNCAgTmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgW0Nocm9taXVtIE1hY10gVGVzdHMgYXJlIGV4aXRpbmcgZWFybHkgZHVlIHRvIGZh aWx1cmVzIHRvIGxvYWQgbWlzc2luZ0ltYWdlLnBuZwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5Cmlu ZGV4IDRmNGY5ZDNkZTMzYzFlOTgwMDEzZGUzNjg0ZmM2ZDVkZTk3YTkwOTIuLjdkZTBlZTRjODIy NTRhNDA0NmI2ZDllNjcyYzg0Yzg3M2FkNTNjYzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkK QEAgLTE1NywxMCArMTU3LDEzIEBAIGNsYXNzIENocm9taXVtQW5kcm9pZFBvcnQoY2hyb21pdW0u Q2hyb21pdW1Qb3J0KToKIAogICAgICAgICBpZiBub3QgaGFzYXR0cihzZWxmLl9vcHRpb25zLCAn YWRkaXRpb25hbF9kcnRfZmxhZycpOgogICAgICAgICAgICAgc2VsZi5fb3B0aW9ucy5hZGRpdGlv bmFsX2RydF9mbGFnID0gW10KLSAgICAgICAgc2VsZi5fb3B0aW9ucy5hZGRpdGlvbmFsX2RydF9m bGFnLmFwcGVuZCgnLS1lbmNvZGUtYmluYXJ5JykKKworICAgICAgICBpZiBub3QgJy0tZW5jb2Rl LWJpbmFyeScgaW4gc2VsZi5fb3B0aW9ucy5hZGRpdGlvbmFsX2RydF9mbGFnOgorICAgICAgICAg ICAgc2VsZi5fb3B0aW9ucy5hZGRpdGlvbmFsX2RydF9mbGFnLmFwcGVuZCgnLS1lbmNvZGUtYmlu YXJ5JykKIAogICAgICAgICAjIFRoZSBDaHJvbWl1bSBwb3J0IGZvciBBbmRyb2lkIGFsd2F5cyB1 c2VzIHRoZSBoYXJkd2FyZSBHUFUgcGF0aC4KLSAgICAgICAgc2VsZi5fb3B0aW9ucy5hZGRpdGlv bmFsX2RydF9mbGFnLmFwcGVuZCgnLS1lbmFibGUtaGFyZHdhcmUtZ3B1JykKKyAgICAgICAgaWYg bm90ICctLWVuYWJsZS1oYXJkd2FyZS1ncHUnIGluIHNlbGYuX29wdGlvbnMuYWRkaXRpb25hbF9k cnRfZmxhZzoKKyAgICAgICAgICAgIHNlbGYuX29wdGlvbnMuYWRkaXRpb25hbF9kcnRfZmxhZy5h cHBlbmQoJy0tZW5hYmxlLWhhcmR3YXJlLWdwdScpCiAKICAgICAgICAgIyBTaGFyZCByZWYgdGVz dHMgc28gdGhhdCB0aGV5IHJ1biB0b2dldGhlciB0byBhdm9pZCByZXBlYXRlZGx5IGRyaXZlciBy ZXN0YXJ0cy4KICAgICAgICAgc2VsZi5fb3B0aW9ucy5zaGFyZF9yZWZfdGVzdHMgPSBUcnVlCg== 156626 2012-08-06 01:56:06 -0700 2012-08-06 20:27:54 -0700 Patch bug-93233-20120806165557.patch text/plain 2170 james.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NzIwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzE2MmNhYmI0ZGRhYjA1MDA0ZTlkNTgxN2M4YzNlZmRm NjQ4Zjk2MS4uMTNkOTYwZjg0MGFjNGFkZWY2OTI3OTJiMGM1MThiODNiYTVkOGRmYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEyLTA4LTA2ICBXZWkgSmFtZXMgIDxqYW1lcy53ZWlAaW50ZWwuY29tPgorCisgICAg ICAgIFtDaHJvbWl1bV1kdXBsaWNhdGVkIGNvbW1hbmQgbGluZSBvcHRpb25zIGluIEFuZHJvaWQg TGF5b3V0VGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTMyMzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBEdXBsaWNhdGVkIG9wdGlvbnMgZm91bmQgaW4gQW5kcm9pZCBsYXlvdXQgdGVzdCBjb21tYW5k IGxpbmU6CisgICAgICAgIC0tZW5jb2RlLWJpbmFyeSBhbmQgLS1lbmFibGUtaGFyZHdhcmUtZ3B1 LgorCisgICAgICAgIElmIHRoZXJlIGFyZSBtdWx0aXBsZSBDaHJvbWl1bUFuZHJvaWRQb3J0IGlu c3RhbmNlcywgdGhlc2UgdHdvIG9wdGlvbnMKKyAgICAgICAgd2lsbCBiZSBhcHBlbmRlZCBmb3Ig bXVsdGlwbGUgdGltZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHk6CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWRQb3J0 Ll9faW5pdF9fKToKKwogMjAxMi0wOC0wNCAgTmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgW0Nocm9taXVtIE1hY10gVGVzdHMgYXJlIGV4aXRpbmcgZWFybHkgZHVl IHRvIGZhaWx1cmVzIHRvIGxvYWQgbWlzc2luZ0ltYWdlLnBuZwpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lk LnB5CmluZGV4IDRmNGY5ZDNkZTMzYzFlOTgwMDEzZGUzNjg0ZmM2ZDVkZTk3YTkwOTIuLjdkZTBl ZTRjODIyNTRhNDA0NmI2ZDllNjcyYzg0Yzg3M2FkNTNjYzQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJv aWQucHkKQEAgLTE1NywxMCArMTU3LDEzIEBAIGNsYXNzIENocm9taXVtQW5kcm9pZFBvcnQoY2hy b21pdW0uQ2hyb21pdW1Qb3J0KToKIAogICAgICAgICBpZiBub3QgaGFzYXR0cihzZWxmLl9vcHRp b25zLCAnYWRkaXRpb25hbF9kcnRfZmxhZycpOgogICAgICAgICAgICAgc2VsZi5fb3B0aW9ucy5h ZGRpdGlvbmFsX2RydF9mbGFnID0gW10KLSAgICAgICAgc2VsZi5fb3B0aW9ucy5hZGRpdGlvbmFs X2RydF9mbGFnLmFwcGVuZCgnLS1lbmNvZGUtYmluYXJ5JykKKworICAgICAgICBpZiBub3QgJy0t ZW5jb2RlLWJpbmFyeScgaW4gc2VsZi5fb3B0aW9ucy5hZGRpdGlvbmFsX2RydF9mbGFnOgorICAg ICAgICAgICAgc2VsZi5fb3B0aW9ucy5hZGRpdGlvbmFsX2RydF9mbGFnLmFwcGVuZCgnLS1lbmNv ZGUtYmluYXJ5JykKIAogICAgICAgICAjIFRoZSBDaHJvbWl1bSBwb3J0IGZvciBBbmRyb2lkIGFs d2F5cyB1c2VzIHRoZSBoYXJkd2FyZSBHUFUgcGF0aC4KLSAgICAgICAgc2VsZi5fb3B0aW9ucy5h ZGRpdGlvbmFsX2RydF9mbGFnLmFwcGVuZCgnLS1lbmFibGUtaGFyZHdhcmUtZ3B1JykKKyAgICAg ICAgaWYgbm90ICctLWVuYWJsZS1oYXJkd2FyZS1ncHUnIGluIHNlbGYuX29wdGlvbnMuYWRkaXRp b25hbF9kcnRfZmxhZzoKKyAgICAgICAgICAgIHNlbGYuX29wdGlvbnMuYWRkaXRpb25hbF9kcnRf ZmxhZy5hcHBlbmQoJy0tZW5hYmxlLWhhcmR3YXJlLWdwdScpCiAKICAgICAgICAgIyBTaGFyZCBy ZWYgdGVzdHMgc28gdGhhdCB0aGV5IHJ1biB0b2dldGhlciB0byBhdm9pZCByZXBlYXRlZGx5IGRy aXZlciByZXN0YXJ0cy4KICAgICAgICAgc2VsZi5fb3B0aW9ucy5zaGFyZF9yZWZfdGVzdHMgPSBU cnVlCg== 156848 2012-08-06 20:28:00 -0700 2012-08-06 21:46:15 -0700 Patch bug-93233-20120807112750.patch text/plain 5593 james.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0ODAyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjRkZjc0NzdkYjgyYmMzNzBmMjE5Yjg3M2JkNWQ0MDNk MzkwZWUzOC4uZDExYWFmYTgzMWQ3OGQwZjg0ZjlmM2E5MjhiZTU2MWQ3ODcxNzllMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEyLTA4LTA2ICBXZWkgSmFtZXMgIDxqYW1lcy53ZWlAaW50ZWwuY29tPgorCisgICAg ICAgIFtDaHJvbWl1bV1kdXBsaWNhdGVkIGNvbW1hbmQgbGluZSBvcHRpb25zIGluIEFuZHJvaWQg TGF5b3V0VGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTMyMzMKKworICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgorCisgICAgICAgIER1 cGxpY2F0ZWQgb3B0aW9ucyBmb3VuZCBpbiBBbmRyb2lkIGxheW91dCB0ZXN0IGNvbW1hbmQgbGlu ZToKKyAgICAgICAgLS1lbmNvZGUtYmluYXJ5IGFuZCAtLWVuYWJsZS1oYXJkd2FyZS1ncHUuCisK KyAgICAgICAgSWYgdGhlcmUgYXJlIG11bHRpcGxlIENocm9taXVtQW5kcm9pZFBvcnQgaW5zdGFu Y2VzLCB0aGVzZSB0d28gb3B0aW9ucworICAgICAgICB3aWxsIGJlIGFwcGVuZGVkIGZvciBtdWx0 aXBsZSB0aW1lcy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvY2hyb21pdW1fYW5kcm9pZC5weToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZFBvcnQuX19p bml0X18pOgorCiAyMDEyLTA4LTA2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgog CiAgICAgICAgIHJ1bi13ZWJraXQtdGVzdHMgc2hvdWxkIGhhdmUgYWJpbGl0eSB0byBhZGQgZGVz Y3JpcHRpb24gdG8gaXRzIEpTT04gb3V0cHV0CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKaW5kZXggZjAyMDdjNzlmNzE2ZjViYmY5YzZlNjll ZTg3YzAyZWZlMmU4YWU4OS4uZmU5ZGQ5ODhkZTIwOGMyN2UyMjY5OTczOWQwY2MwYmQ5MDE0MzBi NCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9i YXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFz ZS5weQpAQCAtMTQzLDYgKzE0Myw5IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAgc2Vs Zi5fcmVmdGVzdF9saXN0ID0ge30KICAgICAgICAgc2VsZi5fcmVzdWx0c19kaXJlY3RvcnkgPSBO b25lCiAKKyAgICBkZWYgYWRkaXRpb25hbF9kcnRfZmxhZyhzZWxmKToKKyAgICAgICAgcmV0dXJu IFtdCisKICAgICBkZWYgZGVmYXVsdF9waXhlbF90ZXN0cyhzZWxmKToKICAgICAgICAgIyBGSVhN RTogRGlzYWJsZSB1bnRpbCB0aGV5IGFyZSBydW4gYnkgZGVmYXVsdCBvbiBidWlsZC53ZWJraXQu b3JnLgogICAgICAgICByZXR1cm4gRmFsc2UKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQppbmRleCA0 M2JkMmIyZTY1ZDBmZDgwMGRhNTY1OTJmYjRmYzc1YTAwYTNlNWM4Li5iMDA4NzUwNGM4MjhlODlm MGUzNWVmOGYyNTgxNjc2ZTFjMzM2YzE0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5CkBAIC0x NTQsMTMgKzE1NCw2IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZFBvcnQoY2hyb21pdW0uQ2hyb21p dW1Qb3J0KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1lLCAqKmt3YXJn cyk6CiAgICAgICAgIHN1cGVyKENocm9taXVtQW5kcm9pZFBvcnQsIHNlbGYpLl9faW5pdF9fKGhv c3QsIHBvcnRfbmFtZSwgKiprd2FyZ3MpCiAKLSAgICAgICAgaWYgbm90IGhhc2F0dHIoc2VsZi5f b3B0aW9ucywgJ2FkZGl0aW9uYWxfZHJ0X2ZsYWcnKToKLSAgICAgICAgICAgIHNlbGYuX29wdGlv bnMuYWRkaXRpb25hbF9kcnRfZmxhZyA9IFtdCi0gICAgICAgIHNlbGYuX29wdGlvbnMuYWRkaXRp b25hbF9kcnRfZmxhZy5hcHBlbmQoJy0tZW5jb2RlLWJpbmFyeScpCi0KLSAgICAgICAgIyBUaGUg Q2hyb21pdW0gcG9ydCBmb3IgQW5kcm9pZCBhbHdheXMgdXNlcyB0aGUgaGFyZHdhcmUgR1BVIHBh dGguCi0gICAgICAgIHNlbGYuX29wdGlvbnMuYWRkaXRpb25hbF9kcnRfZmxhZy5hcHBlbmQoJy0t ZW5hYmxlLWhhcmR3YXJlLWdwdScpCi0KICAgICAgICAgIyBTaGFyZCByZWYgdGVzdHMgc28gdGhh dCB0aGV5IHJ1biB0b2dldGhlciB0byBhdm9pZCByZXBlYXRlZGx5IGRyaXZlciByZXN0YXJ0cy4K ICAgICAgICAgc2VsZi5fb3B0aW9ucy5zaGFyZF9yZWZfdGVzdHMgPSBUcnVlCiAKQEAgLTE3NCw2 ICsxNjcsMTAgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBv cnQpOgogICAgICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5fZGV2aWNlcyA9IFtdCiAKKyAg ICBkZWYgYWRkaXRpb25hbF9kcnRfZmxhZyhzZWxmKToKKyAgICAgICAgIyBUaGUgQ2hyb21pdW0g cG9ydCBmb3IgQW5kcm9pZCBhbHdheXMgdXNlcyB0aGUgaGFyZHdhcmUgR1BVIHBhdGguCisgICAg ICAgIHJldHVybiBbJy0tZW5jb2RlLWJpbmFyeScsICctLWVuYWJsZS1oYXJkd2FyZS1ncHUnXQor CiAgICAgZGVmIGRlZmF1bHRfdGltZW91dF9tcyhzZWxmKToKICAgICAgICAgIyBBbmRyb2lkIHBs YXRmb3JtIGhhcyBsZXNzIGNvbXB1dGluZyBwb3dlciB0aGFuIGRlc2t0b3AgcGxhdGZvcm1zLgog ICAgICAgICAjIFVzaW5nIDEwIHNlY29uZHMgYWxsb3dzIHVzIHRvIHBhc3MgbW9zdCBzbG93IHRl c3RzIHdoaWNoIGFyZSBub3QKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZF91bml0dGVzdC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZF91bml0dGVzdC5w eQppbmRleCBjOWI2OTE5MmNiY2IyNTNhYzcxZjkyNGIwMmE5MDdhYTMyYzI3OGYwLi5jNzk1NDZi YjhjNzhjOGJlZTlkMTczZjMyNDVkMjRiNTA1MGRkMjhkIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWRfdW5pdHRlc3Qu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bV9hbmRyb2lkX3VuaXR0ZXN0LnB5CkBAIC0zOSw3ICszOSw3IEBAIGZyb20gd2Via2l0cHkubGF5 b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGNocm9taXVtX2FuZHJvaWQKIGZyb20gd2Via2l0cHkubGF5 b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGNocm9taXVtX3BvcnRfdGVzdGNhc2UKIGZyb20gd2Via2l0 cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGRyaXZlcgogZnJvbSB3ZWJraXRweS5sYXlvdXRf dGVzdHMucG9ydCBpbXBvcnQgZHJpdmVyX3VuaXR0ZXN0Ci0KK2Zyb20gd2Via2l0cHkudG9vbC5t b2NrdG9vbCBpbXBvcnQgTW9ja09wdGlvbnMKIAogY2xhc3MgTW9ja1J1bkNvbW1hbmQob2JqZWN0 KToKICAgICBkZWYgX19pbml0X18oc2VsZik6CkBAIC0yNjksNSArMjY5LDIxIEBAIGNsYXNzIENo cm9taXVtQW5kcm9pZERyaXZlclR3b0RyaXZlcnNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoWydhZGInLCAnLXMnLCBtb2NrX3J1bl9jb21tYW5kLl9t b2NrX2RldmljZXNbMV0sICdzaGVsbCddLCBjbWRfbGluZTEpCiAKIAorY2xhc3MgQ2hyb21pdW1B bmRyb2lkVHdvUG9ydHNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICBkZWYgdGVzdF9vcHRp b25zX3dpdGhfdHdvX3BvcnRzKHNlbGYpOgorICAgICAgICBvcHRpb25zID0gTW9ja09wdGlvbnMo YWRkaXRpb25hbF9kcnRfZmxhZz1bJy0tZm9vPWJhcicsICctLWZvbz1iYXonXSkKKyAgICAgICAg bW9ja19ydW5fY29tbWFuZCA9IE1vY2tSdW5Db21tYW5kKCkKKyAgICAgICAgbW9ja19ydW5fY29t bWFuZC5tb2NrX3R3b19kZXZpY2VzKCkKKyAgICAgICAgcG9ydDAgPSBjaHJvbWl1bV9hbmRyb2lk LkNocm9taXVtQW5kcm9pZFBvcnQoCisgICAgICAgICAgICAgICAgTW9ja1N5c3RlbUhvc3QoZXhl Y3V0aXZlPU1vY2tFeGVjdXRpdmUyKHJ1bl9jb21tYW5kX2ZuPW1vY2tfcnVuX2NvbW1hbmQubW9j a19ydW5fY29tbWFuZF9mbikpLAorICAgICAgICAgICAgICAgICdjaHJvbWl1bS1hbmRyb2lkJywg b3B0aW9ucz1vcHRpb25zKQorICAgICAgICBwb3J0MSA9IGNocm9taXVtX2FuZHJvaWQuQ2hyb21p dW1BbmRyb2lkUG9ydCgKKyAgICAgICAgICAgICAgICBNb2NrU3lzdGVtSG9zdChleGVjdXRpdmU9 TW9ja0V4ZWN1dGl2ZTIocnVuX2NvbW1hbmRfZm49bW9ja19ydW5fY29tbWFuZC5tb2NrX3J1bl9j b21tYW5kX2ZuKSksCisgICAgICAgICAgICAgICAgJ2Nocm9taXVtLWFuZHJvaWQnLCBvcHRpb25z PW9wdGlvbnMpCisgICAgICAgIGNtZF9saW5lID0gcG9ydDEuZHJpdmVyX2NtZF9saW5lKCkKKyAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoY21kX2xpbmUuY291bnQoJy0tZW5jb2RlLWJpbmFyeScp LCAxKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhjbWRfbGluZS5jb3VudCgnLS1lbmFibGUt aGFyZHdhcmUtZ3B1JyksIDEpCisKKwogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICB1 bml0dGVzdC5tYWluKCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvZHJpdmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9kcml2ZXIucHkKaW5kZXggZTcyMGEyNDg5YzA3OTE4MWVjZDgzYmNkOTM0YjFmNDc4 MWFhMThjNi4uYjMyOWE3MWUxNDM2NWQ2ZTk2NzIxY2Y5ZTQ4ZGJlMWNlNTk4NmIyYiAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcml2ZXIucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcml2ZXIucHkK QEAgLTI5NCw2ICsyOTQsNyBAQCBjbGFzcyBEcml2ZXIob2JqZWN0KToKICAgICAgICAgIyBGSVhN RTogV2UgbmVlZCB0byBwYXNzIC0tdGltZW91dD1TRUNPTkRTIHRvIFdlYktpdFRlc3RSdW5uZXIg Zm9yIFdlYktpdDIuCiAKICAgICAgICAgY21kLmV4dGVuZChzZWxmLl9wb3J0LmdldF9vcHRpb24o J2FkZGl0aW9uYWxfZHJ0X2ZsYWcnLCBbXSkpCisgICAgICAgIGNtZC5leHRlbmQoc2VsZi5fcG9y dC5hZGRpdGlvbmFsX2RydF9mbGFnKCkpCiAKICAgICAgICAgY21kLmV4dGVuZChwZXJfdGVzdF9h cmdzKQogCg== 156858 2012-08-06 21:46:21 -0700 2012-08-06 22:47:58 -0700 Patch bug-93233-20120807124611.patch text/plain 5951 james.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0ODQ3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWEwZDMwMjc0NzVkYTQzY2UwYTJhNzFkMmRlMTBmNjVj MTU2NmY2Yy4uNDdiMjVkNzBkZDMyNTI5NWVhZDJjM2YxMGMwYmM5YmNmMTQ2NzliNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDEyLTA4LTA2ICBXZWkgSmFtZXMgIDxqYW1lcy53ZWlAaW50ZWwuY29tPgorCisgICAg ICAgIFtDaHJvbWl1bV1kdXBsaWNhdGVkIGNvbW1hbmQgbGluZSBvcHRpb25zIGluIEFuZHJvaWQg TGF5b3V0VGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTMyMzMKKworICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgorCisgICAgICAgIER1 cGxpY2F0ZWQgb3B0aW9ucyBmb3VuZCBpbiBBbmRyb2lkIGxheW91dCB0ZXN0IGNvbW1hbmQgbGlu ZToKKyAgICAgICAgLS1lbmNvZGUtYmluYXJ5IGFuZCAtLWVuYWJsZS1oYXJkd2FyZS1ncHUuCisK KyAgICAgICAgSWYgdGhlcmUgYXJlIG11bHRpcGxlIENocm9taXVtQW5kcm9pZFBvcnQgaW5zdGFu Y2VzLAorICAgICAgICB0aGVzZSB0d28gb3B0aW9ucyB3aWxsIGJlIGFwcGVuZGVkIGZvciBtdWx0 aXBsZSB0aW1lcy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQuYWRkaXRpb25hbF9kcnRfZmxhZyk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5 OgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkUG9ydC5fX2luaXRfXyk6CisgICAgICAgIChDaHJv bWl1bUFuZHJvaWRQb3J0LmFkZGl0aW9uYWxfZHJ0X2ZsYWcpOgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZF91bml0dGVzdC5weToK KyAgICAgICAgKENocm9taXVtQW5kcm9pZFR3b1BvcnRzVGVzdCk6CisgICAgICAgIChDaHJvbWl1 bUFuZHJvaWRUd29Qb3J0c1Rlc3QudGVzdF9vcHRpb25zX3dpdGhfdHdvX3BvcnRzKToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlci5weToKKyAgICAg ICAgKERyaXZlci5jbWRfbGluZSk6CisKIDIwMTItMDgtMDMgIEJyYWR5IEVpZHNvbiAgPGJlaWRz b25AYXBwbGUuY29tPgogCiAgICAgICAgIE91dC1vZi1wcm9jZXNzIHBsdWctaW5zIHNob3VsZCBz dXBwb3J0IGFzeW5jaHJvbm91cyBpbml0aWFsaXphdGlvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IGYwMjA3Yzc5ZjcxNmY1YmJm OWM2ZTY5ZWU4N2MwMmVmZTJlOGFlODkuLmZlOWRkOTg4ZGUyMDhjMjdlMjI2OTk3MzlkMGNjMGJk OTAxNDMwYjQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvYmFzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Jhc2UucHkKQEAgLTE0Myw2ICsxNDMsOSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAg ICAgIHNlbGYuX3JlZnRlc3RfbGlzdCA9IHt9CiAgICAgICAgIHNlbGYuX3Jlc3VsdHNfZGlyZWN0 b3J5ID0gTm9uZQogCisgICAgZGVmIGFkZGl0aW9uYWxfZHJ0X2ZsYWcoc2VsZik6CisgICAgICAg IHJldHVybiBbXQorCiAgICAgZGVmIGRlZmF1bHRfcGl4ZWxfdGVzdHMoc2VsZik6CiAgICAgICAg ICMgRklYTUU6IERpc2FibGUgdW50aWwgdGhleSBhcmUgcnVuIGJ5IGRlZmF1bHQgb24gYnVpbGQu d2Via2l0Lm9yZy4KICAgICAgICAgcmV0dXJuIEZhbHNlCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkK aW5kZXggMjc1YzliNDVkOWQ5YjJhZjYyM2ExNDczYTM2YzBlOTVmODY5YWE5YS4uNTE4MjMzYzUy NTJlY2U0NTQ2OWUwN2JkNGM2ZjFhN2E4MDcyMzcxOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5w eQpAQCAtMTU1LDEzICsxNTUsNiBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWRQb3J0KGNocm9taXVt LkNocm9taXVtUG9ydCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZSwg Kiprd2FyZ3MpOgogICAgICAgICBzdXBlcihDaHJvbWl1bUFuZHJvaWRQb3J0LCBzZWxmKS5fX2lu aXRfXyhob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKQogCi0gICAgICAgIGlmIG5vdCBoYXNhdHRy KHNlbGYuX29wdGlvbnMsICdhZGRpdGlvbmFsX2RydF9mbGFnJyk6Ci0gICAgICAgICAgICBzZWxm Ll9vcHRpb25zLmFkZGl0aW9uYWxfZHJ0X2ZsYWcgPSBbXQotICAgICAgICBzZWxmLl9vcHRpb25z LmFkZGl0aW9uYWxfZHJ0X2ZsYWcuYXBwZW5kKCctLWVuY29kZS1iaW5hcnknKQotCi0gICAgICAg ICMgVGhlIENocm9taXVtIHBvcnQgZm9yIEFuZHJvaWQgYWx3YXlzIHVzZXMgdGhlIGhhcmR3YXJl IEdQVSBwYXRoLgotICAgICAgICBzZWxmLl9vcHRpb25zLmFkZGl0aW9uYWxfZHJ0X2ZsYWcuYXBw ZW5kKCctLWVuYWJsZS1oYXJkd2FyZS1ncHUnKQotCiAgICAgICAgIHNlbGYuX29wZXJhdGluZ19z eXN0ZW0gPSAnYW5kcm9pZCcKICAgICAgICAgc2VsZi5fdmVyc2lvbiA9ICdpY2VjcmVhbXNhbmR3 aWNoJwogCkBAIC0xNzIsNiArMTY1LDEwIEBAIGNsYXNzIENocm9taXVtQW5kcm9pZFBvcnQoY2hy b21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNlbGYuX2Rl dmljZXMgPSBbXQogCisgICAgZGVmIGFkZGl0aW9uYWxfZHJ0X2ZsYWcoc2VsZik6CisgICAgICAg ICMgVGhlIENocm9taXVtIHBvcnQgZm9yIEFuZHJvaWQgYWx3YXlzIHVzZXMgdGhlIGhhcmR3YXJl IEdQVSBwYXRoLgorICAgICAgICByZXR1cm4gWyctLWVuY29kZS1iaW5hcnknLCAnLS1lbmFibGUt aGFyZHdhcmUtZ3B1J10KKwogICAgIGRlZiBkZWZhdWx0X3RpbWVvdXRfbXMoc2VsZik6CiAgICAg ICAgICMgQW5kcm9pZCBwbGF0Zm9ybSBoYXMgbGVzcyBjb21wdXRpbmcgcG93ZXIgdGhhbiBkZXNr dG9wIHBsYXRmb3Jtcy4KICAgICAgICAgIyBVc2luZyAxMCBzZWNvbmRzIGFsbG93cyB1cyB0byBw YXNzIG1vc3Qgc2xvdyB0ZXN0cyB3aGljaCBhcmUgbm90CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWRfdW5pdHRlc3Qu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2Fu ZHJvaWRfdW5pdHRlc3QucHkKaW5kZXggYzliNjkxOTJjYmNiMjUzYWM3MWY5MjRiMDJhOTA3YWEz MmMyNzhmMC4uYzc5NTQ2YmI4Yzc4YzhiZWU5ZDE3M2YzMjQ1ZDI0YjUwNTBkZDI4ZCAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9h bmRyb2lkX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZF91bml0dGVzdC5weQpAQCAtMzksNyArMzksNyBAQCBm cm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBjaHJvbWl1bV9hbmRyb2lkCiBm cm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBjaHJvbWl1bV9wb3J0X3Rlc3Rj YXNlCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBkcml2ZXIKIGZyb20g d2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGRyaXZlcl91bml0dGVzdAotCitmcm9t IHdlYmtpdHB5LnRvb2wubW9ja3Rvb2wgaW1wb3J0IE1vY2tPcHRpb25zCiAKIGNsYXNzIE1vY2tS dW5Db21tYW5kKG9iamVjdCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgpAQCAtMjY5LDUgKzI2 OSwyMSBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXJUd29Ecml2ZXJzVGVzdCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKFsnYWRiJywgJy1zJywgbW9j a19ydW5fY29tbWFuZC5fbW9ja19kZXZpY2VzWzFdLCAnc2hlbGwnXSwgY21kX2xpbmUxKQogCiAK K2NsYXNzIENocm9taXVtQW5kcm9pZFR3b1BvcnRzVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6Cisg ICAgZGVmIHRlc3Rfb3B0aW9uc193aXRoX3R3b19wb3J0cyhzZWxmKToKKyAgICAgICAgb3B0aW9u cyA9IE1vY2tPcHRpb25zKGFkZGl0aW9uYWxfZHJ0X2ZsYWc9WyctLWZvbz1iYXInLCAnLS1mb289 YmF6J10pCisgICAgICAgIG1vY2tfcnVuX2NvbW1hbmQgPSBNb2NrUnVuQ29tbWFuZCgpCisgICAg ICAgIG1vY2tfcnVuX2NvbW1hbmQubW9ja190d29fZGV2aWNlcygpCisgICAgICAgIHBvcnQwID0g Y2hyb21pdW1fYW5kcm9pZC5DaHJvbWl1bUFuZHJvaWRQb3J0KAorICAgICAgICAgICAgICAgIE1v Y2tTeXN0ZW1Ib3N0KGV4ZWN1dGl2ZT1Nb2NrRXhlY3V0aXZlMihydW5fY29tbWFuZF9mbj1tb2Nr X3J1bl9jb21tYW5kLm1vY2tfcnVuX2NvbW1hbmRfZm4pKSwKKyAgICAgICAgICAgICAgICAnY2hy b21pdW0tYW5kcm9pZCcsIG9wdGlvbnM9b3B0aW9ucykKKyAgICAgICAgcG9ydDEgPSBjaHJvbWl1 bV9hbmRyb2lkLkNocm9taXVtQW5kcm9pZFBvcnQoCisgICAgICAgICAgICAgICAgTW9ja1N5c3Rl bUhvc3QoZXhlY3V0aXZlPU1vY2tFeGVjdXRpdmUyKHJ1bl9jb21tYW5kX2ZuPW1vY2tfcnVuX2Nv bW1hbmQubW9ja19ydW5fY29tbWFuZF9mbikpLAorICAgICAgICAgICAgICAgICdjaHJvbWl1bS1h bmRyb2lkJywgb3B0aW9ucz1vcHRpb25zKQorICAgICAgICBjbWRfbGluZSA9IHBvcnQxLmRyaXZl cl9jbWRfbGluZSgpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGNtZF9saW5lLmNvdW50KCct LWVuY29kZS1iaW5hcnknKSwgMSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoY21kX2xpbmUu Y291bnQoJy0tZW5hYmxlLWhhcmR3YXJlLWdwdScpLCAxKQorCisKIGlmIF9fbmFtZV9fID09ICdf X21haW5fXyc6CiAgICAgdW5pdHRlc3QubWFpbigpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJpdmVyLnB5CmluZGV4IGU3MjBhMjQ4OWMwNzkxODFl Y2Q4M2JjZDkzNGIxZjQ3ODFhYTE4YzYuLmIzMjlhNzFlMTQzNjVkNmU5NjcyMWNmOWU0OGRiZTFj ZTU5ODZiMmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvZHJpdmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvZHJpdmVyLnB5CkBAIC0yOTQsNiArMjk0LDcgQEAgY2xhc3MgRHJpdmVyKG9iamVjdCk6 CiAgICAgICAgICMgRklYTUU6IFdlIG5lZWQgdG8gcGFzcyAtLXRpbWVvdXQ9U0VDT05EUyB0byBX ZWJLaXRUZXN0UnVubmVyIGZvciBXZWJLaXQyLgogCiAgICAgICAgIGNtZC5leHRlbmQoc2VsZi5f cG9ydC5nZXRfb3B0aW9uKCdhZGRpdGlvbmFsX2RydF9mbGFnJywgW10pKQorICAgICAgICBjbWQu ZXh0ZW5kKHNlbGYuX3BvcnQuYWRkaXRpb25hbF9kcnRfZmxhZygpKQogCiAgICAgICAgIGNtZC5l eHRlbmQocGVyX3Rlc3RfYXJncykKIAo=