189135 2018-08-29 17:49:32 -0700 BenchmarkResults.format should support specifying depth of tests to show. 2018-09-06 15:33:05 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 189367 1 dewei_zhu webkit-unassigned dewei_zhu ews-watchlist glenn rniwa oldest_to_newest 1455077 0 dewei_zhu 2018-08-29 17:49:32 -0700 BenchmarkResults.format should support specifying depth of tests to show. 1456976 1 348999 dewei_zhu 2018-09-05 20:43:31 -0700 Created attachment 348999 Patch 1457003 2 348999 rniwa 2018-09-06 00:31:34 -0700 Comment on attachment 348999 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348999&action=review r=me with the suggested change. > Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py:78 > - output += cls._format_tests(test['tests'], scale_unit, show_iteration_values, indent=(indent + ' ' * len(test_name))) > + output += cls._format_tests(test['tests'], scale_unit, show_iteration_values, None if max_depth is None else max_depth - 1, indent=(indent + ' ' * len(test_name))) This is such a convoluted way of doing this. Please just check: "if 'tests' in test and max_depth > 1" above. 1457228 3 348999 dewei_zhu 2018-09-06 13:44:57 -0700 Comment on attachment 348999 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348999&action=review >> Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py:78 >> + output += cls._format_tests(test['tests'], scale_unit, show_iteration_values, None if max_depth is None else max_depth - 1, indent=(indent + ' ' * len(test_name))) > > This is such a convoluted way of doing this. > Please just check: "if 'tests' in test and max_depth > 1" above. I don't think this will handle the case when max_depth is None. It would have been much easier if Python have something similar to Infinity in JavaScript. Also, due to the check on line 56, it ensures max_depth can either be None or integer larger than 0. I can try to simplify it by using "max_depth - 1 if max_depth else None" 1457239 4 348999 rniwa 2018-09-06 14:13:45 -0700 Comment on attachment 348999 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348999&action=review > Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py:52 > + def format(self, scale_unit=True, show_iteration_values=False, max_depth=None): > + return self._format_tests(self._results, scale_unit, show_iteration_values, max_depth) Just use max_depth=sys.maxsize here. 1457277 5 349078 dewei_zhu 2018-09-06 14:59:32 -0700 Created attachment 349078 Patch 1457297 6 dewei_zhu 2018-09-06 15:33:05 -0700 Re-landed the change in r235762. 348999 2018-09-05 20:43:31 -0700 2018-09-06 14:59:30 -0700 Patch bug-189135-20180905204331.patch text/plain 4726 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NDkwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2FkNjc3MmE4YTA3YjVlYTY4MTllN2JiNTBiZjZlN2Jh NjZlZmQ5OS4uMjkxMGY2YzU1ZTgzODBiMTI3NmE1OWMzYThiYzQ1OTIzOGIyY2RhYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDE4LTA4LTI5ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIEJlbmNobWFya1Jlc3VsdHMuZm9ybWF0IHNob3VsZCBzdXBwb3J0IHNwZWNpZnlpbmcgZGVw dGggb2YgdGVzdHMgdG8gc2hvdy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4OTEzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZGVkIHRoZSBvcHRpb24gdG8gc3BlY2lmeSB0aGUgZGVwdGggb2YgdGVz dHMgdG8gc2hvdy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5l ci9iZW5jaG1hcmtfcmVzdWx0cy5weToKKyAgICAgICAgKEJlbmNobWFya1Jlc3VsdHMpOgorICAg ICAgICAoQmVuY2htYXJrUmVzdWx0cy5mb3JtYXQpOiBBZGRlZCAnbWF4X2RlcHRoJyBvcHRpb24u CisgICAgICAgIChCZW5jaG1hcmtSZXN1bHRzLl9mb3JtYXRfdGVzdHMpOiBBZGRlZCB1bml0IHRl c3QgZm9yICdtYXhfZGVwdGgnLgorCiAyMDE4LTA4LTI5ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVA YXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgdGVzdCBnYXJkZW5pbmc7IE5vd1BsYXlp bmdUZXN0IEFQSSB0ZXN0cyByZXF1aXJlIEhpZ2ggU2llcnJhLgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19yZXN1bHRzLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19yZXN1bHRz LnB5CmluZGV4IGQwMmRjMWExNjY3OTgxMDA0NmVjZGZhODM2ZmFhMjVhMjE4ZjRmZjcuLmYzMDdj M2E5MWU3MWQzMzI5MzgwZjQ0OTg3NWQyMDRkNjFkMmY4OTMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcmVzdWx0cy5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3Jlc3Vs dHMucHkKQEAgLTQ4LDExICs0OCwxMyBAQCBjbGFzcyBCZW5jaG1hcmtSZXN1bHRzKG9iamVjdCk6 CiAgICAgICAgIHNlbGYuX2xpbnRfcmVzdWx0cyhyZXN1bHRzKQogICAgICAgICBzZWxmLl9yZXN1 bHRzID0gc2VsZi5fYWdncmVnYXRlX3Jlc3VsdHMocmVzdWx0cykKIAotICAgIGRlZiBmb3JtYXQo c2VsZiwgc2NhbGVfdW5pdD1UcnVlLCBzaG93X2l0ZXJhdGlvbl92YWx1ZXM9RmFsc2UpOgotICAg ICAgICByZXR1cm4gc2VsZi5fZm9ybWF0X3Rlc3RzKHNlbGYuX3Jlc3VsdHMsIHNjYWxlX3VuaXQs IHNob3dfaXRlcmF0aW9uX3ZhbHVlcykKKyAgICBkZWYgZm9ybWF0KHNlbGYsIHNjYWxlX3VuaXQ9 VHJ1ZSwgc2hvd19pdGVyYXRpb25fdmFsdWVzPUZhbHNlLCBtYXhfZGVwdGg9Tm9uZSk6CisgICAg ICAgIHJldHVybiBzZWxmLl9mb3JtYXRfdGVzdHMoc2VsZi5fcmVzdWx0cywgc2NhbGVfdW5pdCwg c2hvd19pdGVyYXRpb25fdmFsdWVzLCBtYXhfZGVwdGgpCiAKICAgICBAY2xhc3NtZXRob2QKLSAg ICBkZWYgX2Zvcm1hdF90ZXN0cyhjbHMsIHRlc3RzLCBzY2FsZV91bml0LCBzaG93X2l0ZXJhdGlv bl92YWx1ZXMsIGluZGVudD0nJyk6CisgICAgZGVmIF9mb3JtYXRfdGVzdHMoY2xzLCB0ZXN0cywg c2NhbGVfdW5pdCwgc2hvd19pdGVyYXRpb25fdmFsdWVzLCBtYXhfZGVwdGgsIGluZGVudD0nJyk6 CisgICAgICAgIGlmIG1heF9kZXB0aCBpcyBub3QgTm9uZSBhbmQgbWF4X2RlcHRoIDw9IDA6Cisg ICAgICAgICAgICByZXR1cm4gJycKICAgICAgICAgb3V0cHV0ID0gJycKICAgICAgICAgY29uZmln X25hbWUgPSAnY3VycmVudCcKICAgICAgICAgZm9yIHRlc3RfbmFtZSBpbiBzb3J0ZWQodGVzdHMu a2V5cygpKToKQEAgLTczLDcgKzc1LDcgQEAgY2xhc3MgQmVuY2htYXJrUmVzdWx0cyhvYmplY3Qp OgogICAgICAgICAgICAgICAgICAgICAgICAgb3V0cHV0ICs9IGFnZ3JlZ2F0b3JfbmFtZSArICc6 JwogICAgICAgICAgICAgICAgICAgICBvdXRwdXQgKz0gJyAnICsgY2xzLl9mb3JtYXRfdmFsdWVz KG1ldHJpY19uYW1lLCBtZXRyaWNbYWdncmVnYXRvcl9uYW1lXVtjb25maWdfbmFtZV0sIHNjYWxl X3VuaXQsIHNob3dfaXRlcmF0aW9uX3ZhbHVlcykgKyAnXG4nCiAgICAgICAgICAgICBpZiAndGVz dHMnIGluIHRlc3Q6Ci0gICAgICAgICAgICAgICAgb3V0cHV0ICs9IGNscy5fZm9ybWF0X3Rlc3Rz KHRlc3RbJ3Rlc3RzJ10sIHNjYWxlX3VuaXQsIHNob3dfaXRlcmF0aW9uX3ZhbHVlcywgaW5kZW50 PShpbmRlbnQgKyAnICcgKiBsZW4odGVzdF9uYW1lKSkpCisgICAgICAgICAgICAgICAgb3V0cHV0 ICs9IGNscy5fZm9ybWF0X3Rlc3RzKHRlc3RbJ3Rlc3RzJ10sIHNjYWxlX3VuaXQsIHNob3dfaXRl cmF0aW9uX3ZhbHVlcywgTm9uZSBpZiBtYXhfZGVwdGggaXMgTm9uZSBlbHNlIG1heF9kZXB0aCAt IDEsIGluZGVudD0oaW5kZW50ICsgJyAnICogbGVuKHRlc3RfbmFtZSkpKQogICAgICAgICByZXR1 cm4gb3V0cHV0CiAKICAgICBAY2xhc3NtZXRob2QKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcmVzdWx0c191bml0dGVzdC5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcmVzdWx0 c191bml0dGVzdC5weQppbmRleCBkNGJlNDNjODJlMzczNjU3NTY1YzEwY2EwMDdjM2VmMjNlYjEx ZTJlLi5mODdmMTJlZDJlMGNhNThiZGU4ZjUxNzI4ZjQ4YWJlZWEwMDNlZDdiIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3Jlc3Vs dHNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVu bmVyL2JlbmNobWFya19yZXN1bHRzX3VuaXR0ZXN0LnB5CkBAIC01NSw2ICs1NSwxOSBAQCBTb21l VGVzdDpUaW1lOkFyaXRobWV0aWM6IDMuMG1zIHN0ZGV2PTMzLjMlCiAgICAgICAgIFN1YlRlc3Qy OlRpbWU6IDUuMG1zIHN0ZGV2PTIwLjAlCiAnJydbMTpdKQogCisgICAgZGVmIHRlc3RfZm9ybWF0 X3dpdGhfZGVwdGhfbGltaXQoc2VsZik6CisgICAgICAgIHJlc3VsdCA9IEJlbmNobWFya1Jlc3Vs dHMoeydTb21lVGVzdCc6IHsKKyAgICAgICAgICAgICdtZXRyaWNzJzogeydUaW1lJzogWydUb3Rh bCcsICdBcml0aG1ldGljJ119LAorICAgICAgICAgICAgJ3Rlc3RzJzogeworICAgICAgICAgICAg ICAgICdTdWJUZXN0MSc6IHsnbWV0cmljcyc6IHsnVGltZSc6IHsnY3VycmVudCc6IFsxLCAyLCAz XX19fSwKKyAgICAgICAgICAgICAgICAnU3ViVGVzdDInOiB7J21ldHJpY3MnOiB7J1RpbWUnOiB7 J2N1cnJlbnQnOiBbNCwgNSwgNl19fX19fX0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVz dWx0LmZvcm1hdChtYXhfZGVwdGg9MSksICcnJworU29tZVRlc3Q6VGltZTpBcml0aG1ldGljOiAz LjBtcyBzdGRldj0zMy4zJQorICAgICAgICA6VGltZTpUb3RhbDogNy4wbXMgc3RkZXY9MjguNiUK KycnJ1sxOl0pCisKKworCiAgICAgZGVmIHRlc3RfZm9ybWF0X3ZhbHVlc193aXRoX2xhcmdlX2Vy cm9yKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKEJlbmNobWFya1Jlc3VsdHMuX2Zv cm1hdF92YWx1ZXMoJ1J1bnMnLCBbMSwgMiwgM10pLCAnMi4wL3Mgc3RkZXY9NTAuMCUnKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKEJlbmNobWFya1Jlc3VsdHMuX2Zvcm1hdF92YWx1ZXMoJ1J1 bnMnLCBbMTAsIDIwLCAzMF0pLCAnMjAvcyBzdGRldj01MC4wJScpCmRpZmYgLS1naXQgYS9XZWJz aXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL21vZGVscy90ZXN0LWdyb3VwLmpzIGIvV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMvdGVzdC1ncm91cC5qcwppbmRl eCA0YWM0M2I0Mjk3OGJjYWNlZTMzOTc5MDRlZWI2Zjc3ZDdmZWI5ZDRmLi45MWE0MDA3ZmRkOTIx MWEzODI3ZmFkYjJjMmJiNDk1ZmMzMjFjMmFiIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvcHVibGljL3YzL21vZGVscy90ZXN0LWdyb3VwLmpzCisrKyBiL1dlYnNpdGVzL3Bl cmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvbW9kZWxzL3Rlc3QtZ3JvdXAuanMKQEAgLTE5NCw3ICsx OTQsNyBAQCBjbGFzcyBUZXN0R3JvdXAgZXh0ZW5kcyBMYWJlbGVkT2JqZWN0IHsKICAgICB7CiAg ICAgICAgIHZhciBzZWxmID0gdGhpczsKICAgICAgICAgdmFyIGlkID0gdGhpcy5pZCgpOwotICAg ICAgICByZXR1cm4gUHJpdmlsZWdlZEFQSS5zZW5kUmVxdWVzdCgndXBkYXRlLXRlc3QtZ3JvdXAn LCB7CisgICAgICAgIHJldHVybiBQcml2aWxlZ2VkQVBJLnNlbmRSZXF1ZXN0KCd1cGRhdGVQYXRp c3NlcmllLXRlc3QtZ3JvdXAnLCB7CiAgICAgICAgICAgICBncm91cDogaWQsCiAgICAgICAgICAg ICBuYW1lOiBuZXdOYW1lLAogICAgICAgICB9KS50aGVuKGZ1bmN0aW9uIChkYXRhKSB7Cg== 349078 2018-09-06 14:59:32 -0700 2018-09-06 15:06:30 -0700 Patch bug-189135-20180906145931.patch text/plain 4089 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NzU5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWZkNzU2YjQzZmRjMjIyMWQxMzY5MmZjODcxYzY4ODdl NGJjNjFlNi4uN2Q3ZmI2NmZhMThkMDVhMjE3NTFjNTEzZDE1YjdjOTZkMDA1NTJlNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDE4LTA5LTA2ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIEJlbmNobWFya1Jlc3VsdHMuZm9ybWF0IHNob3VsZCBzdXBwb3J0IHNwZWNpZnlpbmcgZGVw dGggb2YgdGVzdHMgdG8gc2hvdy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4OTEzNQorCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4K KworICAgICAgICBBZGRlZCB0aGUgb3B0aW9uIHRvIHNwZWNpZnkgdGhlIGRlcHRoIG9mIHRlc3Rz IHRvIHNob3cuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv YmVuY2htYXJrX3Jlc3VsdHMucHk6CisgICAgICAgIChCZW5jaG1hcmtSZXN1bHRzKToKKyAgICAg ICAgKEJlbmNobWFya1Jlc3VsdHMuZm9ybWF0KTogQWRkZWQgJ21heF9kZXB0aCcgb3B0aW9uLgor ICAgICAgICAoQmVuY2htYXJrUmVzdWx0cy5fZm9ybWF0X3Rlc3RzKTogQWRkZWQgdW5pdCB0ZXN0 cyBmb3IgJ21heF9kZXB0aCcuCisKKwogMjAxOC0wOS0wNiAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0 LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIz NTc1NS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5l ci9iZW5jaG1hcmtfcmVzdWx0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJr X3J1bm5lci9iZW5jaG1hcmtfcmVzdWx0cy5weQppbmRleCBkMDJkYzFhMTY2Nzk4MTAwNDZlY2Rm YTgzNmZhYTI1YTIxOGY0ZmY3Li4zMzZkYWE2YjRkNzM5NzY0NGUwNzgyZDI3YzJhOGQ3ZDBhMzgw YTFkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv YmVuY2htYXJrX3Jlc3VsdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1h cmtfcnVubmVyL2JlbmNobWFya19yZXN1bHRzLnB5CkBAIC0yMyw2ICsyMyw3IEBACiBpbXBvcnQg anNvbgogaW1wb3J0IG1hdGgKIGltcG9ydCByZQoraW1wb3J0IHN5cwogCiAKIGNsYXNzIEJlbmNo bWFya1Jlc3VsdHMob2JqZWN0KToKQEAgLTQ4LDExICs0OSwxMSBAQCBjbGFzcyBCZW5jaG1hcmtS ZXN1bHRzKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX2xpbnRfcmVzdWx0cyhyZXN1bHRzKQogICAg ICAgICBzZWxmLl9yZXN1bHRzID0gc2VsZi5fYWdncmVnYXRlX3Jlc3VsdHMocmVzdWx0cykKIAot ICAgIGRlZiBmb3JtYXQoc2VsZiwgc2NhbGVfdW5pdD1UcnVlLCBzaG93X2l0ZXJhdGlvbl92YWx1 ZXM9RmFsc2UpOgotICAgICAgICByZXR1cm4gc2VsZi5fZm9ybWF0X3Rlc3RzKHNlbGYuX3Jlc3Vs dHMsIHNjYWxlX3VuaXQsIHNob3dfaXRlcmF0aW9uX3ZhbHVlcykKKyAgICBkZWYgZm9ybWF0KHNl bGYsIHNjYWxlX3VuaXQ9VHJ1ZSwgc2hvd19pdGVyYXRpb25fdmFsdWVzPUZhbHNlLCBtYXhfZGVw dGg9c3lzLm1heHNpemUpOgorICAgICAgICByZXR1cm4gc2VsZi5fZm9ybWF0X3Rlc3RzKHNlbGYu X3Jlc3VsdHMsIHNjYWxlX3VuaXQsIHNob3dfaXRlcmF0aW9uX3ZhbHVlcywgbWF4X2RlcHRoKQog CiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIF9mb3JtYXRfdGVzdHMoY2xzLCB0ZXN0cywgc2Nh bGVfdW5pdCwgc2hvd19pdGVyYXRpb25fdmFsdWVzLCBpbmRlbnQ9JycpOgorICAgIGRlZiBfZm9y bWF0X3Rlc3RzKGNscywgdGVzdHMsIHNjYWxlX3VuaXQsIHNob3dfaXRlcmF0aW9uX3ZhbHVlcywg bWF4X2RlcHRoLCBpbmRlbnQ9JycpOgogICAgICAgICBvdXRwdXQgPSAnJwogICAgICAgICBjb25m aWdfbmFtZSA9ICdjdXJyZW50JwogICAgICAgICBmb3IgdGVzdF9uYW1lIGluIHNvcnRlZCh0ZXN0 cy5rZXlzKCkpOgpAQCAtNzIsOCArNzMsOCBAQCBjbGFzcyBCZW5jaG1hcmtSZXN1bHRzKG9iamVj dCk6CiAgICAgICAgICAgICAgICAgICAgIGlmIGFnZ3JlZ2F0b3JfbmFtZToKICAgICAgICAgICAg ICAgICAgICAgICAgIG91dHB1dCArPSBhZ2dyZWdhdG9yX25hbWUgKyAnOicKICAgICAgICAgICAg ICAgICAgICAgb3V0cHV0ICs9ICcgJyArIGNscy5fZm9ybWF0X3ZhbHVlcyhtZXRyaWNfbmFtZSwg bWV0cmljW2FnZ3JlZ2F0b3JfbmFtZV1bY29uZmlnX25hbWVdLCBzY2FsZV91bml0LCBzaG93X2l0 ZXJhdGlvbl92YWx1ZXMpICsgJ1xuJwotICAgICAgICAgICAgaWYgJ3Rlc3RzJyBpbiB0ZXN0Ogot ICAgICAgICAgICAgICAgIG91dHB1dCArPSBjbHMuX2Zvcm1hdF90ZXN0cyh0ZXN0Wyd0ZXN0cydd LCBzY2FsZV91bml0LCBzaG93X2l0ZXJhdGlvbl92YWx1ZXMsIGluZGVudD0oaW5kZW50ICsgJyAn ICogbGVuKHRlc3RfbmFtZSkpKQorICAgICAgICAgICAgaWYgJ3Rlc3RzJyBpbiB0ZXN0IGFuZCBt YXhfZGVwdGggPiAxOgorICAgICAgICAgICAgICAgIG91dHB1dCArPSBjbHMuX2Zvcm1hdF90ZXN0 cyh0ZXN0Wyd0ZXN0cyddLCBzY2FsZV91bml0LCBzaG93X2l0ZXJhdGlvbl92YWx1ZXMsIG1heF9k ZXB0aCAtIDEsIGluZGVudD0oaW5kZW50ICsgJyAnICogbGVuKHRlc3RfbmFtZSkpKQogICAgICAg ICByZXR1cm4gb3V0cHV0CiAKICAgICBAY2xhc3NtZXRob2QKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcmVzdWx0c191bml0dGVz dC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtf cmVzdWx0c191bml0dGVzdC5weQppbmRleCBkNGJlNDNjODJlMzczNjU3NTY1YzEwY2EwMDdjM2Vm MjNlYjExZTJlLi5iYjA2ZmRlMGUzMjg4NjY1OTdhODdjZGZiYTJhYTZkM2M4NTBkNjIzIDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJr X3Jlc3VsdHNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1h cmtfcnVubmVyL2JlbmNobWFya19yZXN1bHRzX3VuaXR0ZXN0LnB5CkBAIC01NSw2ICs1NSwxNyBA QCBTb21lVGVzdDpUaW1lOkFyaXRobWV0aWM6IDMuMG1zIHN0ZGV2PTMzLjMlCiAgICAgICAgIFN1 YlRlc3QyOlRpbWU6IDUuMG1zIHN0ZGV2PTIwLjAlCiAnJydbMTpdKQogCisgICAgZGVmIHRlc3Rf Zm9ybWF0X3dpdGhfZGVwdGhfbGltaXQoc2VsZik6CisgICAgICAgIHJlc3VsdCA9IEJlbmNobWFy a1Jlc3VsdHMoeydTb21lVGVzdCc6IHsKKyAgICAgICAgICAgICdtZXRyaWNzJzogeydUaW1lJzog WydUb3RhbCcsICdBcml0aG1ldGljJ119LAorICAgICAgICAgICAgJ3Rlc3RzJzogeworICAgICAg ICAgICAgICAgICdTdWJUZXN0MSc6IHsnbWV0cmljcyc6IHsnVGltZSc6IHsnY3VycmVudCc6IFsx LCAyLCAzXX19fSwKKyAgICAgICAgICAgICAgICAnU3ViVGVzdDInOiB7J21ldHJpY3MnOiB7J1Rp bWUnOiB7J2N1cnJlbnQnOiBbNCwgNSwgNl19fX19fX0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwocmVzdWx0LmZvcm1hdChtYXhfZGVwdGg9MSksICcnJworU29tZVRlc3Q6VGltZTpBcml0aG1l dGljOiAzLjBtcyBzdGRldj0zMy4zJQorICAgICAgICA6VGltZTpUb3RhbDogNy4wbXMgc3RkZXY9 MjguNiUKKycnJ1sxOl0pCisKICAgICBkZWYgdGVzdF9mb3JtYXRfdmFsdWVzX3dpdGhfbGFyZ2Vf ZXJyb3Ioc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoQmVuY2htYXJrUmVzdWx0cy5f Zm9ybWF0X3ZhbHVlcygnUnVucycsIFsxLCAyLCAzXSksICcyLjAvcyBzdGRldj01MC4wJScpCiAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoQmVuY2htYXJrUmVzdWx0cy5fZm9ybWF0X3ZhbHVlcygn UnVucycsIFsxMCwgMjAsIDMwXSksICcyMC9zIHN0ZGV2PTUwLjAlJykK