103963 2012-12-03 19:46:33 -0800 nrwt: store only the total number of tests in the result summary, not the number of tests and iterations 2012-12-04 14:56:46 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 103961 103824 1 dpranke dpranke abarth ojan rniwa tony oldest_to_newest 782145 0 dpranke 2012-12-03 19:46:33 -0800 nrwt: only store the total number of tests in the result summary 782148 1 177398 dpranke 2012-12-03 19:47:49 -0800 Created attachment 177398 Patch 782153 2 177398 rniwa 2012-12-03 19:58:17 -0800 Comment on attachment 177398 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177398&action=review > Tools/ChangeLog:3 > + nrwt: only store the total number of tests in the result summary It’s probably better to rename this bug to something like: NRWT: ResultSummary should only store the total number of tests instead of the list of tests. Otherwise it sounds as if we’re restricting the places we where we ever store the total number of tests to be ResultSummary. 782154 3 dpranke 2012-12-03 20:00:45 -0800 Good point. 782984 4 dpranke 2012-12-04 14:56:46 -0800 Committed r136582: <http://trac.webkit.org/changeset/136582> 177398 2012-12-03 19:47:49 -0800 2012-12-03 19:58:17 -0800 Patch bug-103963-20121203194514.patch text/plain 7992 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NDQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjI1NjRjNDAwZWY2NmJmNzI1MGYxOGQ0Mjg5ZGE3ZTNi NmEyYzdhZi4uMDc5NDFhOWY2ZDQ4Y2MzMjhiZWEwYzQ0Y2M4ZjZkY2Q2MDcwN2IxMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMx IEBACiAyMDEyLTEyLTAzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IG9ubHkgc3RvcmUgdGhlIHRvdGFsIG51bWJlciBvZiB0ZXN0cyBpbiB0aGUg cmVzdWx0IHN1bW1hcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEwMzk2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoZSByZXN1bHQgc3VtbWFyeSBvbmx5IG5lZWRzIHRoZSB0b3RhbCBudW1iZXIgb2Yg dGVzdHMgdGhhdCB3aWxsCisgICAgICAgIGJlIHJ1biAoaW5jbHVkaW5nIHJlcGV0aXRpb25zKSBp biBvcmRlciB0byBwcm92aWRlIHRoZSBjb3JyZWN0IHN0YXRzOworICAgICAgICBpdCBkb2Vzbid0 IGFjdHVhbGx5IG5lZWQgdG8ga25vdyBob3cgbWFueSB1bmlxdWUgdGVzdHMgdGhlcmUgYXJlLCBv cgorICAgICAgICBvciBob3cgbWFueSByZXBldGl0aW9ucyB0aGVyZSBhcmUuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9y dW5uZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChMYXlvdXRUZXN0UnVubmVyVGVzdHMuX3Jlc3Vs dF9zdW1tYXJ5KToKKyAgICAgICAgKExheW91dFRlc3RSdW5uZXJUZXN0cy50ZXN0X3VwZGF0ZV9z dW1tYXJ5X3dpdGhfcmVzdWx0KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5OgorICAgICAgICAoTWFuYWdlci5fcHJlcGFyZV9s aXN0cyk6CisgICAgICAgIChNYW5hZ2VyLnJ1bik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVzdC5weToKKyAgICAgICAg KE1hbmFnZXJUZXN0LnRlc3RfbG9va19mb3JfbmV3X2NyYXNoX2xvZ3MpOgorICAgICAgICAoUmVz dWx0U3VtbWFyeVRlc3QuZ2V0X3Jlc3VsdF9zdW1tYXJ5KToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvcmVzdWx0X3N1bW1hcnkucHk6CisgICAgICAgIChS ZXN1bHRTdW1tYXJ5Ll9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy92aWV3cy9wcmludGluZ191bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RwcmludGVy LmdldF9yZXN1bHRfc3VtbWFyeSk6CisKKzIwMTItMTItMDMgIERpcmsgUHJhbmtlICA8ZHByYW5r ZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgbnJ3dDogZG8gbGVzcyB3b3JrIHdoZW4gY3RybC1j J2VkCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDM5 NjEKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyX3VuaXR0 ZXN0LnB5CmluZGV4IDI0MTMxZjkwYjMzNDM5NTFjZWIxNTQxZDVkM2MxOGM4MTA2MjlhOTQuLjE0 ODcwYWU4MDRmNGFlYzRlYjkyMzc5NTRhMjMxN2VkOTRmNWZjZGUgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2xheW91dF90ZXN0X3J1 bm5lcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXJfdW5pdHRlc3QucHkKQEAgLTEwMCw3ICsx MDAsNyBAQCBjbGFzcyBMYXlvdXRUZXN0UnVubmVyVGVzdHModW5pdHRlc3QuVGVzdENhc2UpOgog ICAgICAgICByZXR1cm4gTG9ja0NoZWNraW5nUnVubmVyKHBvcnQsIG9wdGlvbnMsIEZha2VQcmlu dGVyKCksIHNlbGYsIFRydWUpCiAKICAgICBkZWYgX3Jlc3VsdF9zdW1tYXJ5KHNlbGYsIHJ1bm5l ciwgdGVzdHMpOgotICAgICAgICByZXR1cm4gUmVzdWx0U3VtbWFyeShUZXN0RXhwZWN0YXRpb25z KHJ1bm5lci5fcG9ydCwgdGVzdHMpLCB0ZXN0cywgMSkKKyAgICAgICAgcmV0dXJuIFJlc3VsdFN1 bW1hcnkoVGVzdEV4cGVjdGF0aW9ucyhydW5uZXIuX3BvcnQsIHRlc3RzKSwgbGVuKHRlc3RzKSkK IAogICAgIGRlZiBfcnVuX3Rlc3RzKHNlbGYsIHJ1bm5lciwgdGVzdHMpOgogICAgICAgICB0ZXN0 X2lucHV0cyA9IFtUZXN0SW5wdXQodGVzdCwgNjAwMCkgZm9yIHRlc3QgaW4gdGVzdHNdCkBAIC0x NTMsMTMgKzE1MywxMyBAQCBjbGFzcyBMYXlvdXRUZXN0UnVubmVyVGVzdHModW5pdHRlc3QuVGVz dENhc2UpOgogICAgICAgICBleHBlY3RhdGlvbnMgPSBUZXN0RXhwZWN0YXRpb25zKHJ1bm5lci5f cG9ydCwgdGVzdHM9W3Rlc3RdKQogICAgICAgICBydW5uZXIuX2V4cGVjdGF0aW9ucyA9IGV4cGVj dGF0aW9ucwogCi0gICAgICAgIHJlc3VsdF9zdW1tYXJ5ID0gUmVzdWx0U3VtbWFyeShleHBlY3Rh dGlvbnMsIFt0ZXN0XSwgMSkKKyAgICAgICAgcmVzdWx0X3N1bW1hcnkgPSBSZXN1bHRTdW1tYXJ5 KGV4cGVjdGF0aW9ucywgMSkKICAgICAgICAgcmVzdWx0ID0gVGVzdFJlc3VsdCh0ZXN0X25hbWU9 dGVzdCwgZmFpbHVyZXM9W3Rlc3RfZmFpbHVyZXMuRmFpbHVyZVJlZnRlc3RNaXNtYXRjaERpZE5v dE9jY3VyKCldLCByZWZ0ZXN0X3R5cGU9WychPSddKQogICAgICAgICBydW5uZXIuX3VwZGF0ZV9z dW1tYXJ5X3dpdGhfcmVzdWx0KHJlc3VsdF9zdW1tYXJ5LCByZXN1bHQpCiAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoMSwgcmVzdWx0X3N1bW1hcnkuZXhwZWN0ZWQpCiAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoMCwgcmVzdWx0X3N1bW1hcnkudW5leHBlY3RlZCkKIAotICAgICAgICByZXN1bHRf c3VtbWFyeSA9IFJlc3VsdFN1bW1hcnkoZXhwZWN0YXRpb25zLCBbdGVzdF0sIDEpCisgICAgICAg IHJlc3VsdF9zdW1tYXJ5ID0gUmVzdWx0U3VtbWFyeShleHBlY3RhdGlvbnMsIDEpCiAgICAgICAg IHJlc3VsdCA9IFRlc3RSZXN1bHQodGVzdF9uYW1lPXRlc3QsIGZhaWx1cmVzPVtdLCByZWZ0ZXN0 X3R5cGU9Wyc9PSddKQogICAgICAgICBydW5uZXIuX3VwZGF0ZV9zdW1tYXJ5X3dpdGhfcmVzdWx0 KHJlc3VsdF9zdW1tYXJ5LCByZXN1bHQpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMCwgcmVz dWx0X3N1bW1hcnkuZXhwZWN0ZWQpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQppbmRleCA0NTdjZjE3YzM1 ZDAyMjYzYmUxMTFhMTZhMGEyZGVmNjQxZjY5M2YwLi4yOTAxNmU1MzJjZWRmODdmOWVmNjRiZmM5 ZDg5YTkzNzY3ZTVmMDJkIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKQEAgLTMyNyw4ICszMjcsNyBA QCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMuaXRlcmF0 aW9ucyA+IDE6CiAgICAgICAgICAgICBzZWxmLl90ZXN0X25hbWVzID0gc2VsZi5fdGVzdF9uYW1l cyAqIHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucwogCi0gICAgICAgIGl0ZXJhdGlvbnMgPSBzZWxm Ll9vcHRpb25zLnJlcGVhdF9lYWNoICogc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zCi0gICAgICAg IHN1bW1hcnkgPSBSZXN1bHRTdW1tYXJ5KHNlbGYuX2V4cGVjdGF0aW9ucywgc2V0KHNlbGYuX3Rl c3RfbmFtZXMpLCBpdGVyYXRpb25zKQorICAgICAgICBzdW1tYXJ5ID0gUmVzdWx0U3VtbWFyeShz ZWxmLl9leHBlY3RhdGlvbnMsIGxlbihzZWxmLl90ZXN0X25hbWVzKSkKICAgICAgICAgZm9yIHRl c3RfbmFtZSBpbiBzZXQodGVzdHNfdG9fc2tpcCk6CiAgICAgICAgICAgICByZXN1bHQgPSB0ZXN0 X3Jlc3VsdHMuVGVzdFJlc3VsdCh0ZXN0X25hbWUpCiAgICAgICAgICAgICByZXN1bHQudHlwZSA9 IHRlc3RfZXhwZWN0YXRpb25zLlNLSVAKQEAgLTQyMCw3ICs0MTksNyBAQCBjbGFzcyBNYW5hZ2Vy KG9iamVjdCk6CiAgICAgICAgICAgICAgICAgX2xvZy5pbmZvKCcnKQogICAgICAgICAgICAgICAg IF9sb2cuaW5mbygiUmV0cnlpbmcgJWQgdW5leHBlY3RlZCBmYWlsdXJlKHMpIC4uLiIgJSBsZW4o ZmFpbHVyZXMpKQogICAgICAgICAgICAgICAgIF9sb2cuaW5mbygnJykKLSAgICAgICAgICAgICAg ICByZXRyeV9zdW1tYXJ5ID0gc2VsZi5fcnVuX3Rlc3RzKGZhaWx1cmVzLCBSZXN1bHRTdW1tYXJ5 KHNlbGYuX2V4cGVjdGF0aW9ucywgZmFpbHVyZXMsIDEpLCAxLCByZXRyeWluZz1UcnVlKQorICAg ICAgICAgICAgICAgIHJldHJ5X3N1bW1hcnkgPSBzZWxmLl9ydW5fdGVzdHMoZmFpbHVyZXMsIFJl c3VsdFN1bW1hcnkoc2VsZi5fZXhwZWN0YXRpb25zLCBsZW4oZmFpbHVyZXMpKSwgMSwgcmV0cnlp bmc9VHJ1ZSkKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgcmV0cnlfc3VtbWFy eSA9IE5vbmUKICAgICAgICAgZmluYWxseToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRlc3QucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0 ZXN0LnB5CmluZGV4IDBiOTAwZTdmM2Y5OTliZjQ0MWM1NGU1ZjY0MTkwNmIxN2U3ZTlkYjcuLjBi N2RjZGVlZmU5YTVlN2RhY2E4OGQ0MjhiMmIyNzZjZjExOWU0MjEgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRl c3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxl cnMvbWFuYWdlcl91bml0dGVzdC5weQpAQCAtOTEsNyArOTEsNyBAQCBjbGFzcyBNYW5hZ2VyVGVz dCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHBvcnQgPSBob3N0LnBvcnRfZmFjdG9yeS5n ZXQoJ3Rlc3QtbWFjLWxlb3BhcmQnKQogICAgICAgICB0ZXN0cyA9IFsnZmFpbHVyZXMvZXhwZWN0 ZWQvY3Jhc2guaHRtbCddCiAgICAgICAgIGV4cGVjdGF0aW9ucyA9IHRlc3RfZXhwZWN0YXRpb25z LlRlc3RFeHBlY3RhdGlvbnMocG9ydCwgdGVzdHMpCi0gICAgICAgIHJzID0gUmVzdWx0U3VtbWFy eShleHBlY3RhdGlvbnMsIHRlc3RzLCAxKQorICAgICAgICBycyA9IFJlc3VsdFN1bW1hcnkoZXhw ZWN0YXRpb25zLCBsZW4odGVzdHMpKQogICAgICAgICBtYW5hZ2VyID0gZ2V0X21hbmFnZXJfd2l0 aF90ZXN0cyh0ZXN0cykKICAgICAgICAgbWFuYWdlci5fbG9va19mb3JfbmV3X2NyYXNoX2xvZ3Mo cnMsIHRpbWUudGltZSgpKQogCkBAIC0xNDIsNyArMTQyLDcgQEAgY2xhc3MgUmVzdWx0U3VtbWFy eVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBnZXRfcmVzdWx0X3N1bW1hcnkoc2Vs ZiwgcG9ydCwgdGVzdF9uYW1lcywgZXhwZWN0YXRpb25zX3N0cik6CiAgICAgICAgIHBvcnQuZXhw ZWN0YXRpb25zX2RpY3QgPSBsYW1iZGE6IHsnJzogZXhwZWN0YXRpb25zX3N0cn0KICAgICAgICAg ZXhwZWN0YXRpb25zID0gdGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucyhwb3J0LCB0 ZXN0X25hbWVzKQotICAgICAgICByZXR1cm4gdGVzdF9uYW1lcywgUmVzdWx0U3VtbWFyeShleHBl Y3RhdGlvbnMsIHRlc3RfbmFtZXMsIDEpLCBleHBlY3RhdGlvbnMKKyAgICAgICAgcmV0dXJuIHRl c3RfbmFtZXMsIFJlc3VsdFN1bW1hcnkoZXhwZWN0YXRpb25zLCBsZW4odGVzdF9uYW1lcykpLCBl eHBlY3RhdGlvbnMKIAogICAgICMgRklYTUU6IFVzZSB0aGlzIHRvIHRlc3QgbW9yZSBvZiBzdW1t YXJpemVfcmVzdWx0cy4gVGhpcyB3YXMgbW92ZWQgZnJvbSBwcmludGluZ191bml0dGVzdC5weS4K ICAgICBkZWYgc3VtbWFyaXplZF9yZXN1bHRzKHNlbGYsIHBvcnQsIGV4cGVjdGVkLCBwYXNzaW5n LCBmbGFreSwgZXh0cmFfdGVzdHM9W10sIGV4dHJhX2V4cGVjdGF0aW9ucz1Ob25lKToKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy9yZXN1bHRf c3VtbWFyeS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy9y ZXN1bHRfc3VtbWFyeS5weQppbmRleCA0ZGY2YWI2MmRmZjhkYWY2NWJhNzI5ZjM2N2I5OWViMzA1 MTQ0MzMyLi5lNzNjMGI2NjM0YzcxYzEzODNiMDIwYjFmMTRhYTYyZDBmOWJjNGNkIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvcmVzdWx0X3N1 bW1hcnkucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxz L3Jlc3VsdF9zdW1tYXJ5LnB5CkBAIC0zMSw4ICszMSw4IEBAIGZyb20gd2Via2l0cHkubGF5b3V0 X3Rlc3RzLm1vZGVscy50ZXN0X2V4cGVjdGF0aW9ucyBpbXBvcnQgVGVzdEV4cGVjdGF0aW9ucywg U0tJCiAKIAogY2xhc3MgUmVzdWx0U3VtbWFyeShvYmplY3QpOgotICAgIGRlZiBfX2luaXRfXyhz ZWxmLCBleHBlY3RhdGlvbnMsIHRlc3RfZmlsZXMsIGl0ZXJhdGlvbnMpOgotICAgICAgICBzZWxm LnRvdGFsID0gbGVuKHRlc3RfZmlsZXMpICogaXRlcmF0aW9ucworICAgIGRlZiBfX2luaXRfXyhz ZWxmLCBleHBlY3RhdGlvbnMsIG51bV90ZXN0cyk6CisgICAgICAgIHNlbGYudG90YWwgPSBudW1f dGVzdHMKICAgICAgICAgc2VsZi5yZW1haW5pbmcgPSBzZWxmLnRvdGFsCiAgICAgICAgIHNlbGYu ZXhwZWN0YXRpb25zID0gZXhwZWN0YXRpb25zCiAgICAgICAgIHNlbGYuZXhwZWN0ZWQgPSAwCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmlu dGluZ191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Zp ZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5CmluZGV4IDljNzlmZjg2MWFmYzk4M2Y0ODlhYjMyNjhh ZDhhMDQ4ZDI5ZjQ0YjEuLjE2NDRkNzM4ZDQ1ZmI2ZGJmMTg1YjgwMDcyZGNhNDNmOTU2NjA4YmEg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3By aW50aW5nX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3ZpZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5CkBAIC0xMDAsNyArMTAwLDcgQEAgY2xhc3Mg IFRlc3RwcmludGVyKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgcG9ydC50ZXN0X2V4cGVj dGF0aW9uc19vdmVycmlkZXMgPSBsYW1iZGE6IE5vbmUKICAgICAgICAgZXhwZWN0YXRpb25zID0g dGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucyhzZWxmLl9wb3J0LCB0ZXN0X25hbWVz KQogCi0gICAgICAgIHJzID0gcmVzdWx0X3N1bW1hcnkuUmVzdWx0U3VtbWFyeShleHBlY3RhdGlv bnMsIHRlc3RfbmFtZXMsIDEpCisgICAgICAgIHJzID0gcmVzdWx0X3N1bW1hcnkuUmVzdWx0U3Vt bWFyeShleHBlY3RhdGlvbnMsIGxlbih0ZXN0X25hbWVzKSkKICAgICAgICAgcmV0dXJuIHRlc3Rf bmFtZXMsIHJzLCBleHBlY3RhdGlvbnMKIAogICAgIGRlZiB0ZXN0X2NvbmZpZ3VyZV9hbmRfY2xl YW51cChzZWxmKToK