170796 2017-04-12 16:45:49 -0700 Add some more WebRTC tests 2017-04-13 09:54:37 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf commit-queue eric.carlson lforschler oldest_to_newest 1296879 0 youennf 2017-04-12 16:45:49 -0700 We should add multitrack and AV+data channel tests 1296881 1 306951 youennf 2017-04-12 16:47:25 -0700 Created attachment 306951 Patch 1296893 2 306951 eric.carlson 2017-04-12 17:44:41 -0700 Comment on attachment 306951 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=306951&action=review > LayoutTests/webrtc/multi-video.html:25 > +video1 = document.getElementById("video1"); > +video2 = document.getElementById("video2"); > +video3 = document.getElementById("video3"); > +video4 = document.getElementById("video4"); > +video5 = document.getElementById("video5"); > +video6 = document.getElementById("video6"); > +canvas = document.getElementById("canvas"); Nit: technically none of these are necessary since the elements all have ids with the same names. > LayoutTests/webrtc/multi-video.html:50 > + assert_true(data[index] < 100, "test 1 for " + id); > + assert_true(data[index + 1] < 100, "test 2 for " + id); > + assert_true(data[index + 2] < 100, "test 3 for " + id); > + > + index = 80; > + assert_true(data[index] > 200, "test 4 for " + id); > + assert_true(data[index + 1] > 200, "test 5 for " + id); > + assert_true(data[index + 2] > 200, "test 6 for " + id); > + > + index += 80; > + assert_true(data[index] > 200, "test 7 for " + id); > + assert_true(data[index + 1] > 200, "test 8 for " + id); > + assert_true(data[index + 2] < 100, "test 9 for " + id); Nit: you could use a template literals for these, eg. `test 1 for ${id}`, etc 1297001 3 306990 youennf 2017-04-13 09:08:27 -0700 Created attachment 306990 Patch for landing 1297002 4 youennf 2017-04-13 09:08:54 -0700 Thanks for the review. (In reply to Eric Carlson from comment #2) > Comment on attachment 306951 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=306951&action=review > > > LayoutTests/webrtc/multi-video.html:25 > > +video1 = document.getElementById("video1"); > > +video2 = document.getElementById("video2"); > > +video3 = document.getElementById("video3"); > > +video4 = document.getElementById("video4"); > > +video5 = document.getElementById("video5"); > > +video6 = document.getElementById("video6"); > > +canvas = document.getElementById("canvas"); > > Nit: technically none of these are necessary since the elements all have ids > with the same names. Done > > LayoutTests/webrtc/multi-video.html:50 > > + assert_true(data[index] < 100, "test 1 for " + id); > > + assert_true(data[index + 1] < 100, "test 2 for " + id); > > + assert_true(data[index + 2] < 100, "test 3 for " + id); > > + > > + index = 80; > > + assert_true(data[index] > 200, "test 4 for " + id); > > + assert_true(data[index + 1] > 200, "test 5 for " + id); > > + assert_true(data[index + 2] > 200, "test 6 for " + id); > > + > > + index += 80; > > + assert_true(data[index] > 200, "test 7 for " + id); > > + assert_true(data[index + 1] > 200, "test 8 for " + id); > > + assert_true(data[index + 2] < 100, "test 9 for " + id); > > Nit: you could use a template literals for these, eg. `test 1 for ${id}`, etc Will do in future patches! 1297015 5 306990 commit-queue 2017-04-13 09:54:35 -0700 Comment on attachment 306990 Patch for landing Clearing flags on attachment: 306990 Committed r215323: <http://trac.webkit.org/changeset/215323> 1297016 6 commit-queue 2017-04-13 09:54:37 -0700 All reviewed patches have been landed. Closing bug. 306951 2017-04-12 16:47:25 -0700 2017-04-13 09:08:25 -0700 Patch bug-170796-20170412164724.patch text/plain 9126 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1MjY3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOWFhM2QzMjRiMDM3NmI2MzQwNTlm MjMzOWZmYTk1ZGZhYTMxZGViNy4uMTcwODBlYjAzMjY3Y2U3ZDk4Yzg1YTNkNmQ4NDFjOTE5MzJk ZTc0MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE3IEBACiAyMDE3LTA0LTEyICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBBZGQgc29tZSBtb3JlIFdlYlJUQyB0ZXN0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNzk2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3ZWJydGMv bXVsdGktdmlkZW8tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiB3ZWJydGMvbXVsdGkt dmlkZW8uaHRtbDogQWRkZWQuCisgICAgICAgICogd2VicnRjL3ZpZGVvLXdpdGgtZGF0YS1jaGFu bmVsLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogd2VicnRjL3ZpZGVvLXdpdGgtZGF0 YS1jaGFubmVsLmh0bWw6IEFkZGVkLgorCisyMDE3LTA0LTEyICBZb3Vlbm4gRmFibGV0ICA8eW91 ZW5uQGFwcGxlLmNvbT4KKwogICAgICAgICBvbm5lZ290aWF0aW9ubmVlZGVkIHNob3VsZCBvbmx5 IGJlIGNhbGxlZCBvbmNlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzA3ODUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2VicnRjL211bHRpLXZp ZGVvLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3dlYnJ0Yy9tdWx0aS12aWRlby1leHBlY3Rl ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uM2FjNmE0ZDUyN2JkNmVhNTM0MmE0ZmZjMTcxMWRlZDg4MTViOWMz YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy9tdWx0aS12aWRlby1leHBl Y3RlZC50eHQKQEAgLTAsMCArMSw0IEBACisgICAgIAorCitQQVNTIEJhc2ljIHZpZGVvIGV4Y2hh bmdlIAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJydGMvbXVsdGktdmlkZW8uaHRtbCBi L0xheW91dFRlc3RzL3dlYnJ0Yy9tdWx0aS12aWRlby5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc0YzNjNzk3 OTUwZDVmOGMxZmRhNDJhMmQ2YWNkY2ZjYjRkMzY3YWYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy93ZWJydGMvbXVsdGktdmlkZW8uaHRtbApAQCAtMCwwICsxLDEwMiBAQAorPCFkb2N0 eXBlIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPG1ldGEgY2hhcnNldD0idXRm LTgiPgorICAgICAgICA8dGl0bGU+VGVzdGluZyBiYXNpYyB2aWRlbyBleGNoYW5nZSBmcm9tIG9m ZmVyZXIgdG8gcmVjZWl2ZXI8L3RpdGxlPgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3Vy Y2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uL3Jl c291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAg IDxib2R5PgorICAgICAgICA8dmlkZW8gaWQ9InZpZGVvMSIgYXV0b3BsYXk9IiI+PC92aWRlbz4K KyAgICAgICAgPHZpZGVvIGlkPSJ2aWRlbzIiIGF1dG9wbGF5PSIiPjwvdmlkZW8+CisgICAgICAg IDx2aWRlbyBpZD0idmlkZW8zIiBhdXRvcGxheT0iIj48L3ZpZGVvPgorICAgICAgICA8dmlkZW8g aWQ9InZpZGVvNCIgYXV0b3BsYXk9IiI+PC92aWRlbz4KKyAgICAgICAgPHZpZGVvIGlkPSJ2aWRl bzUiIGF1dG9wbGF5PSIiPjwvdmlkZW8+CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW82IiBhdXRv cGxheT0iIj48L3ZpZGVvPgorICAgICAgICA8Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRoPSI2NDAi IGhlaWdodD0iNDgwIj48L2NhbnZhcz4KKyAgICAgICAgPHNjcmlwdCBzcmMgPSJyb3V0aW5lcy5q cyI+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQ+Cit2aWRlbzEgPSBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgidmlkZW8xIik7Cit2aWRlbzIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidmlk ZW8yIik7Cit2aWRlbzMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidmlkZW8zIik7Cit2aWRl bzQgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgidmlkZW80Iik7Cit2aWRlbzUgPSBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgidmlkZW81Iik7Cit2aWRlbzYgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgidmlkZW82Iik7CitjYW52YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY2FudmFz Iik7CisKK2Z1bmN0aW9uIHRlc3RJbWFnZSh2aWRlbykKK3sKKyAgICB2YXIgaWQ9IHZpZGVvLmlk OworICAgIGNhbnZhcy53aWR0aCA9IHZpZGVvLnZpZGVvV2lkdGg7CisgICAgY2FudmFzLmhlaWdo dCA9IHZpZGVvLnZpZGVvSGVpZ2h0OworICAgIGNhbnZhcy5nZXRDb250ZXh0KCcyZCcpLmRyYXdJ bWFnZSh2aWRlbywgMCwgMCwgY2FudmFzLndpZHRoLCBjYW52YXMuaGVpZ2h0KTsKKworICAgIGlt YWdlRGF0YSA9IGNhbnZhcy5nZXRDb250ZXh0KCcyZCcpLmdldEltYWdlRGF0YSgxMCwgMzI1LCAy NTAsIDEpOworICAgIGRhdGEgPSBpbWFnZURhdGEuZGF0YTsKKworICAgIHZhciBpbmRleCA9IDIw OworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXhdIDwgMTAwLCAidGVzdCAxIGZvciAiICsgaWQp OworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXggKyAxXSA8IDEwMCwgInRlc3QgMiBmb3IgIiAr IGlkKTsKKyAgICBhc3NlcnRfdHJ1ZShkYXRhW2luZGV4ICsgMl0gPCAxMDAsICJ0ZXN0IDMgZm9y ICIgKyBpZCk7CisKKyAgICBpbmRleCA9IDgwOworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXhd ID4gMjAwLCAidGVzdCA0IGZvciAiICsgaWQpOworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXgg KyAxXSA+IDIwMCwgInRlc3QgNSBmb3IgIiArIGlkKTsKKyAgICBhc3NlcnRfdHJ1ZShkYXRhW2lu ZGV4ICsgMl0gPiAyMDAsICJ0ZXN0IDYgZm9yICIgKyBpZCk7CisKKyAgICBpbmRleCArPSA4MDsK KyAgICBhc3NlcnRfdHJ1ZShkYXRhW2luZGV4XSA+IDIwMCwgInRlc3QgNyBmb3IgIiArIGlkKTsK KyAgICBhc3NlcnRfdHJ1ZShkYXRhW2luZGV4ICsgMV0gPiAyMDAsICJ0ZXN0IDggZm9yICIgKyBp ZCk7CisgICAgYXNzZXJ0X3RydWUoZGF0YVtpbmRleCArIDJdIDwgMTAwLCAidGVzdCA5IGZvciAi ICsgaWQpOworfQorCitwcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKKyAgICBpZiAod2luZG93LnRl c3RSdW5uZXIpCisgICAgICAgIHRlc3RSdW5uZXIuc2V0VXNlck1lZGlhUGVybWlzc2lvbih0cnVl KTsKKworICAgIHJldHVybiBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7IHZp ZGVvOiB0cnVlfSkudGhlbigoc3RyZWFtKSA9PiB7CisgICAgICAgIHJldHVybiBuZXcgUHJvbWlz ZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgICAgICBjcmVhdGVDb25uZWN0aW9ucygo Zmlyc3RDb25uZWN0aW9uKSA9PiB7CisgICAgICAgICAgICAgICAgdmFyIHRyYWNrID0gc3RyZWFt LmdldFZpZGVvVHJhY2tzKClbMF07CisgICAgICAgICAgICAgICAgdmFyIHRyYWNrMSA9IHRyYWNr LmNsb25lKCk7CisgICAgICAgICAgICAgICAgdmFyIHRyYWNrMiA9IHRyYWNrLmNsb25lKCk7Cisg ICAgICAgICAgICAgICAgdmFyIHRyYWNrMyA9IHRyYWNrLmNsb25lKCk7CisgICAgICAgICAgICAg ICAgdmFyIHRyYWNrNCA9IHRyYWNrLmNsb25lKCk7CisgICAgICAgICAgICAgICAgdmFyIHRyYWNr NSA9IHRyYWNrLmNsb25lKCk7CisgICAgICAgICAgICAgICAgdmFyIHRyYWNrNiA9IHRyYWNrLmNs b25lKCk7CisgICAgICAgICAgICAgICAgdmFyIG5ld1N0cmVhbSA9IG5ldyBNZWRpYVN0cmVhbShb dHJhY2sxLCB0cmFjazIsIHRyYWNrMywgdHJhY2s0LCB0cmFjazUsIHRyYWNrNl0pOworICAgICAg ICAgICAgICAgIGZpcnN0Q29ubmVjdGlvbi5hZGRUcmFjayh0cmFjazEsIG5ld1N0cmVhbSk7Cisg ICAgICAgICAgICAgICAgZmlyc3RDb25uZWN0aW9uLmFkZFRyYWNrKHRyYWNrMiwgbmV3U3RyZWFt KTsKKyAgICAgICAgICAgICAgICBmaXJzdENvbm5lY3Rpb24uYWRkVHJhY2sodHJhY2szLCBuZXdT dHJlYW0pOworICAgICAgICAgICAgICAgIGZpcnN0Q29ubmVjdGlvbi5hZGRUcmFjayh0cmFjazQs IG5ld1N0cmVhbSk7CisgICAgICAgICAgICAgICAgZmlyc3RDb25uZWN0aW9uLmFkZFRyYWNrKHRy YWNrNSwgbmV3U3RyZWFtKTsKKyAgICAgICAgICAgICAgICBmaXJzdENvbm5lY3Rpb24uYWRkVHJh Y2sodHJhY2s2LCBuZXdTdHJlYW0pOworICAgICAgICAgICAgfSwgKHNlY29uZENvbm5lY3Rpb24p ID0+IHsKKyAgICAgICAgICAgICAgICBzZWNvbmRDb25uZWN0aW9uLm9udHJhY2sgPSAodHJhY2tF dmVudCkgPT4geworICAgICAgICAgICAgICAgICAgICByZXNvbHZlKHRyYWNrRXZlbnQuc3RyZWFt c1swXSk7CisgICAgICAgICAgICAgICAgfTsKKyAgICAgICAgICAgIH0pOworICAgICAgICAgICAg c2V0VGltZW91dCgoKSA9PiByZWplY3QoIlRlc3QgdGltZWQgb3V0IiksIDUwMDApOworICAgICAg ICB9KTsKKyAgICB9KS50aGVuKChzdHJlYW0pID0+IHsKKyAgICAgICAgdmlkZW8xLnNyY09iamVj dCA9IG5ldyBNZWRpYVN0cmVhbShzdHJlYW0uZ2V0VmlkZW9UcmFja3MoWzBdKSk7CisgICAgICAg IHZpZGVvMi5zcmNPYmplY3QgPSBuZXcgTWVkaWFTdHJlYW0oc3RyZWFtLmdldFZpZGVvVHJhY2tz KFsxXSkpOworICAgICAgICB2aWRlbzMuc3JjT2JqZWN0ID0gbmV3IE1lZGlhU3RyZWFtKHN0cmVh bS5nZXRWaWRlb1RyYWNrcyhbMl0pKTsKKyAgICAgICAgdmlkZW80LnNyY09iamVjdCA9IG5ldyBN ZWRpYVN0cmVhbShzdHJlYW0uZ2V0VmlkZW9UcmFja3MoWzNdKSk7CisgICAgICAgIHZpZGVvNS5z cmNPYmplY3QgPSBuZXcgTWVkaWFTdHJlYW0oc3RyZWFtLmdldFZpZGVvVHJhY2tzKFs0XSkpOwor ICAgICAgICB2aWRlbzYuc3JjT2JqZWN0ID0gbmV3IE1lZGlhU3RyZWFtKHN0cmVhbS5nZXRWaWRl b1RyYWNrcyhbNV0pKTsKKyAgICAgICAgcmV0dXJuIFByb21pc2UuYWxsKFt2aWRlbzEucGxheSgp LCB2aWRlbzIucGxheSgpLCB2aWRlbzMucGxheSgpLCB2aWRlbzQucGxheSgpLCB2aWRlbzUucGxh eSgpLCB2aWRlbzYucGxheSgpXSk7CisgICAgfSkudGhlbigoKSA9PiB7CisgICAgICAgIHJldHVy biB3YWl0Rm9yKDEwMCk7CisgICAgfSkudGhlbigoKSA9PiB7CisgICAgICAgIHRlc3RJbWFnZSh2 aWRlbzEpOworICAgICAgICB0ZXN0SW1hZ2UodmlkZW8yKTsKKyAgICAgICAgdGVzdEltYWdlKHZp ZGVvMyk7CisgICAgICAgIHRlc3RJbWFnZSh2aWRlbzQpOworICAgICAgICB0ZXN0SW1hZ2Uodmlk ZW81KTsKKyAgICAgICAgdGVzdEltYWdlKHZpZGVvNik7CisgICAgfSk7Cit9LCAiQmFzaWMgdmlk ZW8gZXhjaGFuZ2UiKTsKKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9ib2R5PgorPC9odG1sPgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXdpdGgtZGF0YS1jaGFubmVsLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby13aXRoLWRhdGEtY2hhbm5lbC1l eHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMWZkODU0ZmZlOWU4MmM1ZjYwOGI1Mjk1ZjAzN2JkNGUy MDNmMTlkYgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby13aXRo LWRhdGEtY2hhbm5lbC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw0IEBACisKKworUEFTUyBBdWRp by9WaWRlbyB3aXRoIGRhdGEgY2hhbm5lbCAKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2Vi cnRjL3ZpZGVvLXdpdGgtZGF0YS1jaGFubmVsLmh0bWwgYi9MYXlvdXRUZXN0cy93ZWJydGMvdmlk ZW8td2l0aC1kYXRhLWNoYW5uZWwuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44Y2ZjNGI3ZTNkNzhlZmU0YWRm ZTdkNzgyNDdhOGIyYjEyNjk3OTBkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvd2Vi cnRjL3ZpZGVvLXdpdGgtZGF0YS1jaGFubmVsLmh0bWwKQEAgLTAsMCArMSw4MCBAQAorPCFkb2N0 eXBlIGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPG1ldGEgY2hhcnNldD0idXRm LTgiPgorICAgICAgICA8dGl0bGU+VGVzdGluZyBiYXNpYyB2aWRlbyBleGNoYW5nZSBmcm9tIG9m ZmVyZXIgdG8gcmVjZWl2ZXI8L3RpdGxlPgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3Vy Y2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uL3Jl c291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAg IDxib2R5PgorICAgICAgICA8dmlkZW8gaWQ9InZpZGVvIiBhdXRvcGxheT0iIj48L3ZpZGVvPgor ICAgICAgICA8Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRoPSI2NDAiIGhlaWdodD0iNDgwIj48L2Nh bnZhcz4KKyAgICAgICAgPHNjcmlwdCBzcmMgPSJyb3V0aW5lcy5qcyI+PC9zY3JpcHQ+CisgICAg ICAgIDxzY3JpcHQ+Cit2aWRlbyA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ2aWRlbyIpOwor Y2FudmFzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNhbnZhcyIpOworCitmdW5jdGlvbiB0 ZXN0SW1hZ2UoKQoreworICAgIGNhbnZhcy53aWR0aCA9IHZpZGVvLnZpZGVvV2lkdGg7CisgICAg Y2FudmFzLmhlaWdodCA9IHZpZGVvLnZpZGVvSGVpZ2h0OworICAgIGNhbnZhcy5nZXRDb250ZXh0 KCcyZCcpLmRyYXdJbWFnZSh2aWRlbywgMCwgMCwgY2FudmFzLndpZHRoLCBjYW52YXMuaGVpZ2h0 KTsKKworICAgIGltYWdlRGF0YSA9IGNhbnZhcy5nZXRDb250ZXh0KCcyZCcpLmdldEltYWdlRGF0 YSgxMCwgMzI1LCAyNTAsIDEpOworICAgIGRhdGEgPSBpbWFnZURhdGEuZGF0YTsKKworICAgIHZh ciBpbmRleCA9IDIwOworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXhdIDwgMTAwKTsKKyAgICBh c3NlcnRfdHJ1ZShkYXRhW2luZGV4ICsgMV0gPCAxMDApOworICAgIGFzc2VydF90cnVlKGRhdGFb aW5kZXggKyAyXSA8IDEwMCk7CisKKyAgICBpbmRleCA9IDgwOworICAgIGFzc2VydF90cnVlKGRh dGFbaW5kZXhdID4gMjAwKTsKKyAgICBhc3NlcnRfdHJ1ZShkYXRhW2luZGV4ICsgMV0gPiAyMDAp OworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXggKyAyXSA+IDIwMCk7CisKKyAgICBpbmRleCAr PSA4MDsKKyAgICBhc3NlcnRfdHJ1ZShkYXRhW2luZGV4XSA+IDIwMCk7CisgICAgYXNzZXJ0X3Ry dWUoZGF0YVtpbmRleCArIDFdID4gMjAwKTsKKyAgICBhc3NlcnRfdHJ1ZShkYXRhW2luZGV4ICsg Ml0gPCAxMDApOworfQorCitwcm9taXNlX3Rlc3QoKHRlc3QpID0+IHsKKyAgICBpZiAod2luZG93 LnRlc3RSdW5uZXIpCisgICAgICAgIHRlc3RSdW5uZXIuc2V0VXNlck1lZGlhUGVybWlzc2lvbih0 cnVlKTsKKworICAgIHJldHVybiBuYXZpZ2F0b3IubWVkaWFEZXZpY2VzLmdldFVzZXJNZWRpYSh7 IHZpZGVvOiB0cnVlLCBhdWRpbzogdHJ1ZX0pLnRoZW4oKHN0cmVhbSkgPT4geworICAgICAgICBy ZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUsIHJlamVjdCkgPT4geworICAgICAgICAgICAgdmFy IGNvdW50ID0gMDsKKyAgICAgICAgICAgIHZhciBjaGFubmVsOworICAgICAgICAgICAgdmFyIHJl bW90ZVN0cmVhbTsKKyAgICAgICAgICAgIGNyZWF0ZUNvbm5lY3Rpb25zKChmaXJzdENvbm5lY3Rp b24pID0+IHsKKyAgICAgICAgICAgICAgICBmaXJzdENvbm5lY3Rpb24uYWRkVHJhY2soc3RyZWFt LmdldFZpZGVvVHJhY2tzKClbMF0sIHN0cmVhbSk7CisgICAgICAgICAgICAgICAgZmlyc3RDb25u ZWN0aW9uLmFkZFRyYWNrKHN0cmVhbS5nZXRBdWRpb1RyYWNrcygpWzBdLCBzdHJlYW0pOworICAg ICAgICAgICAgICAgIGNoYW5uZWwgPSBmaXJzdENvbm5lY3Rpb24uY3JlYXRlRGF0YUNoYW5uZWwo InRlc3QiKTsKKyAgICAgICAgICAgIH0sIChzZWNvbmRDb25uZWN0aW9uKSA9PiB7CisgICAgICAg ICAgICAgICAgc2Vjb25kQ29ubmVjdGlvbi5vbnRyYWNrID0gKHRyYWNrRXZlbnQpID0+IHsKKyAg ICAgICAgICAgICAgICAgICAgaWYgKGNvdW50KysgPT09IDApCisgICAgICAgICAgICAgICAgICAg ICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgICAgIGNoYW5uZWwub25vcGVuID0gKCkgPT4g Y2hhbm5lbC5zZW5kKCJ0ZXN0Iik7CisgICAgICAgICAgICAgICAgICAgIHJlbW90ZVN0cmVhbSA9 IHRyYWNrRXZlbnQuc3RyZWFtc1swXTsKKyAgICAgICAgICAgICAgICB9OworICAgICAgICAgICAg ICAgIHNlY29uZENvbm5lY3Rpb24ub25kYXRhY2hhbm5lbCA9IChldmVudCkgPT4geworICAgICAg ICAgICAgICAgICAgICBldmVudC5jaGFubmVsLm9ubWVzc2FnZSA9IChldmVudCkgPT4geworICAg ICAgICAgICAgICAgICAgICAgICAgYXNzZXJ0X2VxdWFscyhldmVudC5kYXRhLCAidGVzdCIpOwor ICAgICAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZShyZW1vdGVTdHJlYW0pOworICAgICAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfSk7CisgICAgICAg ICAgICBzZXRUaW1lb3V0KCgpID0+IHJlamVjdCgiVGVzdCB0aW1lZCBvdXQiKSwgNTAwMCk7Cisg ICAgICAgIH0pOworICAgIH0pLnRoZW4oKHN0cmVhbSkgPT4geworICAgICAgICB2aWRlby5zcmNP YmplY3QgPSBzdHJlYW07CisgICAgICAgIHJldHVybiB2aWRlby5wbGF5KCk7CisgICAgfSkudGhl bigoKSA9PiB7CisgICAgICAgIHRlc3RJbWFnZSgpOworICAgIH0pOworfSwgIkF1ZGlvL1ZpZGVv IHdpdGggZGF0YSBjaGFubmVsIik7CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvYm9keT4KKzwv aHRtbD4K 306990 2017-04-13 09:08:27 -0700 2017-04-13 09:54:35 -0700 Patch for landing bug-170796-20170413090826.patch text/plain 8780 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1MjY3CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZTIxODE0NmM5MzllODliZmU1ZGE4 MDc3NzE5Yzg0ZmQ4N2I4YmFhMC4uZWNlNThiODNhMWI5N2ExYTVmNDcyMDBkNDVjNGNmMDY1NTY3 ZTJmYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE3LTA0LTEzICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgc29tZSBtb3JlIFdlYlJUQyB0ZXN0cwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwNzk2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLgorCisgICAgICAgICogd2VicnRjL211 bHRpLXZpZGVvLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogd2VicnRjL211bHRpLXZp ZGVvLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHdlYnJ0Yy92aWRlby13aXRoLWRhdGEtY2hhbm5l bC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHdlYnJ0Yy92aWRlby13aXRoLWRhdGEt Y2hhbm5lbC5odG1sOiBBZGRlZC4KKwogMjAxNy0wNC0xMiAgTWFudWVsIFJlZ28gQ2FzYXNub3Zh cyAgPHJlZ29AaWdhbGlhLmNvbT4KIAogICAgICAgICBbY3NzLWdyaWRdIFJlcGxhY2VkIGVsZW1l bnRzIGRvbid0IHByb3Blcmx5IHJlc29sdmUgcGVyY2VudGFnZSBoZWlnaHRzCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy93ZWJydGMvbXVsdGktdmlkZW8tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVz dHMvd2VicnRjL211bHRpLXZpZGVvLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zYWM2YTRkNTI3 YmQ2ZWE1MzQyYTRmZmMxNzExZGVkODgxNWI5YzNhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvd2VicnRjL211bHRpLXZpZGVvLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDQgQEAKKyAg ICAgCisKK1BBU1MgQmFzaWMgdmlkZW8gZXhjaGFuZ2UgCisKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL3dlYnJ0Yy9tdWx0aS12aWRlby5odG1sIGIvTGF5b3V0VGVzdHMvd2VicnRjL211bHRpLXZp ZGVvLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uN2VmYmNmMjIzYTFiM2UyM2E0YmJiN2FjNGRmZjE1ZjhmNWQ0 OTNkNwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3dlYnJ0Yy9tdWx0aS12aWRlby5o dG1sCkBAIC0wLDAgKzEsOTQgQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0bWw+CisgICAgPGhlYWQ+ CisgICAgICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKyAgICAgICAgPHRpdGxlPlRlc3Rpbmcg YmFzaWMgdmlkZW8gZXhjaGFuZ2UgZnJvbSBvZmZlcmVyIHRvIHJlY2VpdmVyPC90aXRsZT4KKyAg ICAgICAgPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+ CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMi Pjwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9keT4KKyAgICAgICAgPHZpZGVvIGlkPSJ2 aWRlbzEiIGF1dG9wbGF5PSIiPjwvdmlkZW8+CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW8yIiBh dXRvcGxheT0iIj48L3ZpZGVvPgorICAgICAgICA8dmlkZW8gaWQ9InZpZGVvMyIgYXV0b3BsYXk9 IiI+PC92aWRlbz4KKyAgICAgICAgPHZpZGVvIGlkPSJ2aWRlbzQiIGF1dG9wbGF5PSIiPjwvdmlk ZW8+CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW81IiBhdXRvcGxheT0iIj48L3ZpZGVvPgorICAg ICAgICA8dmlkZW8gaWQ9InZpZGVvNiIgYXV0b3BsYXk9IiI+PC92aWRlbz4KKyAgICAgICAgPGNh bnZhcyBpZD0iY2FudmFzIiB3aWR0aD0iNjQwIiBoZWlnaHQ9IjQ4MCI+PC9jYW52YXM+CisgICAg ICAgIDxzY3JpcHQgc3JjID0icm91dGluZXMuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0 PgorZnVuY3Rpb24gdGVzdEltYWdlKHZpZGVvKQoreworICAgIHZhciBpZD0gdmlkZW8uaWQ7Cisg ICAgY2FudmFzLndpZHRoID0gdmlkZW8udmlkZW9XaWR0aDsKKyAgICBjYW52YXMuaGVpZ2h0ID0g dmlkZW8udmlkZW9IZWlnaHQ7CisgICAgY2FudmFzLmdldENvbnRleHQoJzJkJykuZHJhd0ltYWdl KHZpZGVvLCAwLCAwLCBjYW52YXMud2lkdGgsIGNhbnZhcy5oZWlnaHQpOworCisgICAgaW1hZ2VE YXRhID0gY2FudmFzLmdldENvbnRleHQoJzJkJykuZ2V0SW1hZ2VEYXRhKDEwLCAzMjUsIDI1MCwg MSk7CisgICAgZGF0YSA9IGltYWdlRGF0YS5kYXRhOworCisgICAgdmFyIGluZGV4ID0gMjA7Cisg ICAgYXNzZXJ0X3RydWUoZGF0YVtpbmRleF0gPCAxMDAsICJ0ZXN0IDEgZm9yICIgKyBpZCk7Cisg ICAgYXNzZXJ0X3RydWUoZGF0YVtpbmRleCArIDFdIDwgMTAwLCAidGVzdCAyIGZvciAiICsgaWQp OworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXggKyAyXSA8IDEwMCwgInRlc3QgMyBmb3IgIiAr IGlkKTsKKworICAgIGluZGV4ID0gODA7CisgICAgYXNzZXJ0X3RydWUoZGF0YVtpbmRleF0gPiAy MDAsICJ0ZXN0IDQgZm9yICIgKyBpZCk7CisgICAgYXNzZXJ0X3RydWUoZGF0YVtpbmRleCArIDFd ID4gMjAwLCAidGVzdCA1IGZvciAiICsgaWQpOworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXgg KyAyXSA+IDIwMCwgInRlc3QgNiBmb3IgIiArIGlkKTsKKworICAgIGluZGV4ICs9IDgwOworICAg IGFzc2VydF90cnVlKGRhdGFbaW5kZXhdID4gMjAwLCAidGVzdCA3IGZvciAiICsgaWQpOworICAg IGFzc2VydF90cnVlKGRhdGFbaW5kZXggKyAxXSA+IDIwMCwgInRlc3QgOCBmb3IgIiArIGlkKTsK KyAgICBhc3NlcnRfdHJ1ZShkYXRhW2luZGV4ICsgMl0gPCAxMDAsICJ0ZXN0IDkgZm9yICIgKyBp ZCk7Cit9CisKK3Byb21pc2VfdGVzdCgodGVzdCkgPT4geworICAgIGlmICh3aW5kb3cudGVzdFJ1 bm5lcikKKyAgICAgICAgdGVzdFJ1bm5lci5zZXRVc2VyTWVkaWFQZXJtaXNzaW9uKHRydWUpOwor CisgICAgcmV0dXJuIG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHsgdmlkZW86 IHRydWV9KS50aGVuKChzdHJlYW0pID0+IHsKKyAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKChy ZXNvbHZlLCByZWplY3QpID0+IHsKKyAgICAgICAgICAgIGNyZWF0ZUNvbm5lY3Rpb25zKChmaXJz dENvbm5lY3Rpb24pID0+IHsKKyAgICAgICAgICAgICAgICB2YXIgdHJhY2sgPSBzdHJlYW0uZ2V0 VmlkZW9UcmFja3MoKVswXTsKKyAgICAgICAgICAgICAgICB2YXIgdHJhY2sxID0gdHJhY2suY2xv bmUoKTsKKyAgICAgICAgICAgICAgICB2YXIgdHJhY2syID0gdHJhY2suY2xvbmUoKTsKKyAgICAg ICAgICAgICAgICB2YXIgdHJhY2szID0gdHJhY2suY2xvbmUoKTsKKyAgICAgICAgICAgICAgICB2 YXIgdHJhY2s0ID0gdHJhY2suY2xvbmUoKTsKKyAgICAgICAgICAgICAgICB2YXIgdHJhY2s1ID0g dHJhY2suY2xvbmUoKTsKKyAgICAgICAgICAgICAgICB2YXIgdHJhY2s2ID0gdHJhY2suY2xvbmUo KTsKKyAgICAgICAgICAgICAgICB2YXIgbmV3U3RyZWFtID0gbmV3IE1lZGlhU3RyZWFtKFt0cmFj azEsIHRyYWNrMiwgdHJhY2szLCB0cmFjazQsIHRyYWNrNSwgdHJhY2s2XSk7CisgICAgICAgICAg ICAgICAgZmlyc3RDb25uZWN0aW9uLmFkZFRyYWNrKHRyYWNrMSwgbmV3U3RyZWFtKTsKKyAgICAg ICAgICAgICAgICBmaXJzdENvbm5lY3Rpb24uYWRkVHJhY2sodHJhY2syLCBuZXdTdHJlYW0pOwor ICAgICAgICAgICAgICAgIGZpcnN0Q29ubmVjdGlvbi5hZGRUcmFjayh0cmFjazMsIG5ld1N0cmVh bSk7CisgICAgICAgICAgICAgICAgZmlyc3RDb25uZWN0aW9uLmFkZFRyYWNrKHRyYWNrNCwgbmV3 U3RyZWFtKTsKKyAgICAgICAgICAgICAgICBmaXJzdENvbm5lY3Rpb24uYWRkVHJhY2sodHJhY2s1 LCBuZXdTdHJlYW0pOworICAgICAgICAgICAgICAgIGZpcnN0Q29ubmVjdGlvbi5hZGRUcmFjayh0 cmFjazYsIG5ld1N0cmVhbSk7CisgICAgICAgICAgICB9LCAoc2Vjb25kQ29ubmVjdGlvbikgPT4g eworICAgICAgICAgICAgICAgIHNlY29uZENvbm5lY3Rpb24ub250cmFjayA9ICh0cmFja0V2ZW50 KSA9PiB7CisgICAgICAgICAgICAgICAgICAgIHJlc29sdmUodHJhY2tFdmVudC5zdHJlYW1zWzBd KTsKKyAgICAgICAgICAgICAgICB9OworICAgICAgICAgICAgfSk7CisgICAgICAgICAgICBzZXRU aW1lb3V0KCgpID0+IHJlamVjdCgiVGVzdCB0aW1lZCBvdXQiKSwgNTAwMCk7CisgICAgICAgIH0p OworICAgIH0pLnRoZW4oKHN0cmVhbSkgPT4geworICAgICAgICB2aWRlbzEuc3JjT2JqZWN0ID0g bmV3IE1lZGlhU3RyZWFtKHN0cmVhbS5nZXRWaWRlb1RyYWNrcyhbMF0pKTsKKyAgICAgICAgdmlk ZW8yLnNyY09iamVjdCA9IG5ldyBNZWRpYVN0cmVhbShzdHJlYW0uZ2V0VmlkZW9UcmFja3MoWzFd KSk7CisgICAgICAgIHZpZGVvMy5zcmNPYmplY3QgPSBuZXcgTWVkaWFTdHJlYW0oc3RyZWFtLmdl dFZpZGVvVHJhY2tzKFsyXSkpOworICAgICAgICB2aWRlbzQuc3JjT2JqZWN0ID0gbmV3IE1lZGlh U3RyZWFtKHN0cmVhbS5nZXRWaWRlb1RyYWNrcyhbM10pKTsKKyAgICAgICAgdmlkZW81LnNyY09i amVjdCA9IG5ldyBNZWRpYVN0cmVhbShzdHJlYW0uZ2V0VmlkZW9UcmFja3MoWzRdKSk7CisgICAg ICAgIHZpZGVvNi5zcmNPYmplY3QgPSBuZXcgTWVkaWFTdHJlYW0oc3RyZWFtLmdldFZpZGVvVHJh Y2tzKFs1XSkpOworICAgICAgICByZXR1cm4gUHJvbWlzZS5hbGwoW3ZpZGVvMS5wbGF5KCksIHZp ZGVvMi5wbGF5KCksIHZpZGVvMy5wbGF5KCksIHZpZGVvNC5wbGF5KCksIHZpZGVvNS5wbGF5KCks IHZpZGVvNi5wbGF5KCldKTsKKyAgICB9KS50aGVuKCgpID0+IHsKKyAgICAgICAgcmV0dXJuIHdh aXRGb3IoMTAwKTsKKyAgICB9KS50aGVuKCgpID0+IHsKKyAgICAgICAgdGVzdEltYWdlKHZpZGVv MSk7CisgICAgICAgIHRlc3RJbWFnZSh2aWRlbzIpOworICAgICAgICB0ZXN0SW1hZ2UodmlkZW8z KTsKKyAgICAgICAgdGVzdEltYWdlKHZpZGVvNCk7CisgICAgICAgIHRlc3RJbWFnZSh2aWRlbzUp OworICAgICAgICB0ZXN0SW1hZ2UodmlkZW82KTsKKyAgICB9KTsKK30sICJCYXNpYyB2aWRlbyBl eGNoYW5nZSIpOworICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy93ZWJydGMvdmlkZW8td2l0aC1kYXRhLWNoYW5uZWwtZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXdpdGgtZGF0YS1jaGFubmVsLWV4cGVj dGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi4xZmQ4NTRmZmU5ZTgyYzVmNjA4YjUyOTVmMDM3YmQ0ZTIwM2Yx OWRiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvd2VicnRjL3ZpZGVvLXdpdGgtZGF0 YS1jaGFubmVsLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDQgQEAKKworCitQQVNTIEF1ZGlvL1Zp ZGVvIHdpdGggZGF0YSBjaGFubmVsIAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93ZWJydGMv dmlkZW8td2l0aC1kYXRhLWNoYW5uZWwuaHRtbCBiL0xheW91dFRlc3RzL3dlYnJ0Yy92aWRlby13 aXRoLWRhdGEtY2hhbm5lbC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhjZmM0YjdlM2Q3OGVmZTRhZGZlN2Q3 ODI0N2E4YjJiMTI2OTc5MGQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy93ZWJydGMv dmlkZW8td2l0aC1kYXRhLWNoYW5uZWwuaHRtbApAQCAtMCwwICsxLDgwIEBACis8IWRvY3R5cGUg aHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8bWV0YSBjaGFyc2V0PSJ1dGYtOCI+ CisgICAgICAgIDx0aXRsZT5UZXN0aW5nIGJhc2ljIHZpZGVvIGV4Y2hhbmdlIGZyb20gb2ZmZXJl ciB0byByZWNlaXZlcjwvdGl0bGU+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMv dGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vcmVzb3Vy Y2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAgPGJv ZHk+CisgICAgICAgIDx2aWRlbyBpZD0idmlkZW8iIGF1dG9wbGF5PSIiPjwvdmlkZW8+CisgICAg ICAgIDxjYW52YXMgaWQ9ImNhbnZhcyIgd2lkdGg9IjY0MCIgaGVpZ2h0PSI0ODAiPjwvY2FudmFz PgorICAgICAgICA8c2NyaXB0IHNyYyA9InJvdXRpbmVzLmpzIj48L3NjcmlwdD4KKyAgICAgICAg PHNjcmlwdD4KK3ZpZGVvID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInZpZGVvIik7CitjYW52 YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY2FudmFzIik7CisKK2Z1bmN0aW9uIHRlc3RJ bWFnZSgpCit7CisgICAgY2FudmFzLndpZHRoID0gdmlkZW8udmlkZW9XaWR0aDsKKyAgICBjYW52 YXMuaGVpZ2h0ID0gdmlkZW8udmlkZW9IZWlnaHQ7CisgICAgY2FudmFzLmdldENvbnRleHQoJzJk JykuZHJhd0ltYWdlKHZpZGVvLCAwLCAwLCBjYW52YXMud2lkdGgsIGNhbnZhcy5oZWlnaHQpOwor CisgICAgaW1hZ2VEYXRhID0gY2FudmFzLmdldENvbnRleHQoJzJkJykuZ2V0SW1hZ2VEYXRhKDEw LCAzMjUsIDI1MCwgMSk7CisgICAgZGF0YSA9IGltYWdlRGF0YS5kYXRhOworCisgICAgdmFyIGlu ZGV4ID0gMjA7CisgICAgYXNzZXJ0X3RydWUoZGF0YVtpbmRleF0gPCAxMDApOworICAgIGFzc2Vy dF90cnVlKGRhdGFbaW5kZXggKyAxXSA8IDEwMCk7CisgICAgYXNzZXJ0X3RydWUoZGF0YVtpbmRl eCArIDJdIDwgMTAwKTsKKworICAgIGluZGV4ID0gODA7CisgICAgYXNzZXJ0X3RydWUoZGF0YVtp bmRleF0gPiAyMDApOworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXggKyAxXSA+IDIwMCk7Cisg ICAgYXNzZXJ0X3RydWUoZGF0YVtpbmRleCArIDJdID4gMjAwKTsKKworICAgIGluZGV4ICs9IDgw OworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXhdID4gMjAwKTsKKyAgICBhc3NlcnRfdHJ1ZShk YXRhW2luZGV4ICsgMV0gPiAyMDApOworICAgIGFzc2VydF90cnVlKGRhdGFbaW5kZXggKyAyXSA8 IDEwMCk7Cit9CisKK3Byb21pc2VfdGVzdCgodGVzdCkgPT4geworICAgIGlmICh3aW5kb3cudGVz dFJ1bm5lcikKKyAgICAgICAgdGVzdFJ1bm5lci5zZXRVc2VyTWVkaWFQZXJtaXNzaW9uKHRydWUp OworCisgICAgcmV0dXJuIG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHsgdmlk ZW86IHRydWUsIGF1ZGlvOiB0cnVlfSkudGhlbigoc3RyZWFtKSA9PiB7CisgICAgICAgIHJldHVy biBuZXcgUHJvbWlzZSgocmVzb2x2ZSwgcmVqZWN0KSA9PiB7CisgICAgICAgICAgICB2YXIgY291 bnQgPSAwOworICAgICAgICAgICAgdmFyIGNoYW5uZWw7CisgICAgICAgICAgICB2YXIgcmVtb3Rl U3RyZWFtOworICAgICAgICAgICAgY3JlYXRlQ29ubmVjdGlvbnMoKGZpcnN0Q29ubmVjdGlvbikg PT4geworICAgICAgICAgICAgICAgIGZpcnN0Q29ubmVjdGlvbi5hZGRUcmFjayhzdHJlYW0uZ2V0 VmlkZW9UcmFja3MoKVswXSwgc3RyZWFtKTsKKyAgICAgICAgICAgICAgICBmaXJzdENvbm5lY3Rp b24uYWRkVHJhY2soc3RyZWFtLmdldEF1ZGlvVHJhY2tzKClbMF0sIHN0cmVhbSk7CisgICAgICAg ICAgICAgICAgY2hhbm5lbCA9IGZpcnN0Q29ubmVjdGlvbi5jcmVhdGVEYXRhQ2hhbm5lbCgidGVz dCIpOworICAgICAgICAgICAgfSwgKHNlY29uZENvbm5lY3Rpb24pID0+IHsKKyAgICAgICAgICAg ICAgICBzZWNvbmRDb25uZWN0aW9uLm9udHJhY2sgPSAodHJhY2tFdmVudCkgPT4geworICAgICAg ICAgICAgICAgICAgICBpZiAoY291bnQrKyA9PT0gMCkKKyAgICAgICAgICAgICAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgICAgICAgICAgICAgY2hhbm5lbC5vbm9wZW4gPSAoKSA9PiBjaGFu bmVsLnNlbmQoInRlc3QiKTsKKyAgICAgICAgICAgICAgICAgICAgcmVtb3RlU3RyZWFtID0gdHJh Y2tFdmVudC5zdHJlYW1zWzBdOworICAgICAgICAgICAgICAgIH07CisgICAgICAgICAgICAgICAg c2Vjb25kQ29ubmVjdGlvbi5vbmRhdGFjaGFubmVsID0gKGV2ZW50KSA9PiB7CisgICAgICAgICAg ICAgICAgICAgIGV2ZW50LmNoYW5uZWwub25tZXNzYWdlID0gKGV2ZW50KSA9PiB7CisgICAgICAg ICAgICAgICAgICAgICAgICBhc3NlcnRfZXF1YWxzKGV2ZW50LmRhdGEsICJ0ZXN0Iik7CisgICAg ICAgICAgICAgICAgICAgICAgICByZXNvbHZlKHJlbW90ZVN0cmVhbSk7CisgICAgICAgICAgICAg ICAgICAgIH0KKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAg IHNldFRpbWVvdXQoKCkgPT4gcmVqZWN0KCJUZXN0IHRpbWVkIG91dCIpLCA1MDAwKTsKKyAgICAg ICAgfSk7CisgICAgfSkudGhlbigoc3RyZWFtKSA9PiB7CisgICAgICAgIHZpZGVvLnNyY09iamVj dCA9IHN0cmVhbTsKKyAgICAgICAgcmV0dXJuIHZpZGVvLnBsYXkoKTsKKyAgICB9KS50aGVuKCgp ID0+IHsKKyAgICAgICAgdGVzdEltYWdlKCk7CisgICAgfSk7Cit9LCAiQXVkaW8vVmlkZW8gd2l0 aCBkYXRhIGNoYW5uZWwiKTsKKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9ib2R5PgorPC9odG1s Pgo=