121597 2013-09-19 01:12:50 -0700 DoYouEvenBench: Indentations in benchmark.js and benchmark.html are all messed up 2013-09-19 10:56:44 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa barraclough benjamin commit-queue fpizlo kling koivisto oldest_to_newest 930870 0 rniwa 2013-09-19 01:12:50 -0700 DoYouEvenBench: Indentations in benchmark.js and benchmark.html are all messed up 930871 1 212041 rniwa 2013-09-19 01:14:17 -0700 Created attachment 212041 Fixes the indentations 930872 2 rniwa 2013-09-19 01:14:59 -0700 I must have messed up my regular expression when I made the initial patch. 931011 3 rniwa 2013-09-19 10:56:44 -0700 Committed r156104: <http://trac.webkit.org/changeset/156104> 212041 2013-09-19 01:14:17 -0700 2013-09-19 10:31:38 -0700 Fixes the indentations bug-121597-20130919011417.patch text/plain 14084 rniwa SW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1h bmNlVGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxNTYwODgpCisrKyBQZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA5LTE5ICBS eW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIERvWW91RXZlbkJlbmNo OiBJbmRlbnRhdGlvbnMgaW4gYmVuY2htYXJrLmpzIGFuZCBiZW5jaG1hcmsuaHRtbCBhcmUgYWxs IG1lc3NlZCB1cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIxNTk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRml4ZWQgaW5kZW50YXRpb25zLgorCisgICAgICAgICogRG9Zb3VFdmVuQmVuY2gvYmVuY2ht YXJrLmh0bWw6CisgICAgICAgICogRG9Zb3VFdmVuQmVuY2gvYmVuY2htYXJrLmpzOgorICAgICAg ICAoU2ltcGxlUHJvbWlzZS5wcm90b3R5cGUucmVzb2x2ZS5lbHNlKToKKyAgICAgICAgKFNpbXBs ZVByb21pc2UucHJvdG90eXBlLnJlc29sdmUpOgorICAgICAgICAoQmVuY2htYXJrUnVubmVyLndh aXRGb3JFbGVtZW50LnJlc29sdmVJZlJlYWR5KToKKyAgICAgICAgKEJlbmNobWFya1J1bm5lci53 YWl0Rm9yRWxlbWVudCk6CisgICAgICAgIChCZW5jaG1hcmtSdW5uZXIuX3dhaXRBbmRXYXJtVXAu Rmlib25hY2NpKToKKyAgICAgICAgKEJlbmNobWFya1J1bm5lci5fZmluYWxpemUpOgorCiAyMDEz LTA5LTE5ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBh biBBbmd1bGFySlMgdGVzdCB0byBEb1lvdUV2ZW5CZW5jaApJbmRleDogUGVyZm9ybWFuY2VUZXN0 cy9Eb1lvdUV2ZW5CZW5jaC9iZW5jaG1hcmsuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBQZXJmb3JtYW5j ZVRlc3RzL0RvWW91RXZlbkJlbmNoL2JlbmNobWFyay5odG1sCShyZXZpc2lvbiAxNTYwODgpCisr KyBQZXJmb3JtYW5jZVRlc3RzL0RvWW91RXZlbkJlbmNoL2JlbmNobWFyay5odG1sCSh3b3JraW5n IGNvcHkpCkBAIC0xOSwyMCArMTksMjAgQEAgQmVuY2htYXJrUnVubmVyLnN1aXRlKHsKICAgICB0 ZXN0czogWwogICAgICAgICBbJ0FkZGluZycgKyBudW1iZXJPZkl0ZW1zVG9BZGQgKyAnSXRlbXMn LCBmdW5jdGlvbiAobmV3VG9kbywgY29udGVudFdpbmRvdywgY29udGVudERvY3VtZW50KSB7CiAg ICAgICAgICAgICB2YXIgdG9kb0NvbnRyb2xsZXIgPSBjb250ZW50V2luZG93LnRvZG8uY29udHJv bGxlcjsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBudW1iZXJPZkl0ZW1zVG9BZGQ7IGkr KykgewotICAgICAgICAgICAgbmV3VG9kby52YWx1ZSA9ICdTb21ldGhpbmcgdG8gZG8gJyArIGk7 Ci0gICAgICAgICAgICB0b2RvQ29udHJvbGxlci5hZGRJdGVtKHtrZXlDb2RlOiB0b2RvQ29udHJv bGxlci5FTlRFUl9LRVksIHRhcmdldDogbmV3VG9kb30pOworICAgICAgICAgICAgZm9yICh2YXIg aSA9IDA7IGkgPCBudW1iZXJPZkl0ZW1zVG9BZGQ7IGkrKykgeworICAgICAgICAgICAgICAgIG5l d1RvZG8udmFsdWUgPSAnU29tZXRoaW5nIHRvIGRvICcgKyBpOworICAgICAgICAgICAgICAgIHRv ZG9Db250cm9sbGVyLmFkZEl0ZW0oe2tleUNvZGU6IHRvZG9Db250cm9sbGVyLkVOVEVSX0tFWSwg dGFyZ2V0OiBuZXdUb2RvfSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH1dLAogICAgICAgICBb J0NvbXBsZXRpbmdBbGxJdGVtcycsIGZ1bmN0aW9uIChuZXdUb2RvLCBjb250ZW50V2luZG93LCBj b250ZW50RG9jdW1lbnQpIHsKLSAgICAgICAgdmFyIGNoZWNrYm94ZXMgPSBjb250ZW50RG9jdW1l bnQucXVlcnlTZWxlY3RvckFsbCgnLnRvZ2dsZScpOwotICAgICAgICBmb3IgKHZhciBpID0gMDsg aSA8IGNoZWNrYm94ZXMubGVuZ3RoOyBpKyspCi0gICAgICAgICAgICBjaGVja2JveGVzW2ldLmNs aWNrKCk7Ci0gICAgICAgIH1dLAotICAgICAgICAgICAgWydEZWxldGluZ0FsbEl0ZW1zJywgZnVu Y3Rpb24gKG5ld1RvZG8sIGNvbnRlbnRXaW5kb3csIGNvbnRlbnREb2N1bWVudCkgewotICAgICAg ICB2YXIgZGVsZXRlQnV0dG9ucyA9IGNvbnRlbnREb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCcu ZGVzdHJveScpOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGRlbGV0ZUJ1dHRvbnMubGVu Z3RoOyBpKyspCi0gICAgICAgICAgICBkZWxldGVCdXR0b25zW2ldLmNsaWNrKCk7CisgICAgICAg ICAgICB2YXIgY2hlY2tib3hlcyA9IGNvbnRlbnREb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCcu dG9nZ2xlJyk7CisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNoZWNrYm94ZXMubGVu Z3RoOyBpKyspCisgICAgICAgICAgICAgICAgY2hlY2tib3hlc1tpXS5jbGljaygpOworICAgICAg ICB9XSwKKyAgICAgICAgWydEZWxldGluZ0FsbEl0ZW1zJywgZnVuY3Rpb24gKG5ld1RvZG8sIGNv bnRlbnRXaW5kb3csIGNvbnRlbnREb2N1bWVudCkgeworICAgICAgICAgICAgdmFyIGRlbGV0ZUJ1 dHRvbnMgPSBjb250ZW50RG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgnLmRlc3Ryb3knKTsKKyAg ICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZGVsZXRlQnV0dG9ucy5sZW5ndGg7IGkrKykK KyAgICAgICAgICAgICAgICBkZWxldGVCdXR0b25zW2ldLmNsaWNrKCk7CiAgICAgICAgIH1dLAog ICAgIF0KIH0pOwpAQCAtNDEsMTEgKzQxLDExIEBAIEJlbmNobWFya1J1bm5lci5zdWl0ZSh7CiAg ICAgbmFtZTogJ0VtYmVySlMvVG9kb01WQycsCiAgICAgdXJsOiAndG9kb212Yy9hcmNoaXRlY3R1 cmUtZXhhbXBsZXMvZW1iZXJqcy9pbmRleC5odG1sJywKICAgICBwcmVwYXJlOiBmdW5jdGlvbiAo Y29udGVudFdpbmRvdywgY29udGVudERvY3VtZW50KSB7Ci0gICAgY29udGVudFdpbmRvdy5Ub2Rv cy5TdG9yZSA9IGNvbnRlbnRXaW5kb3cuRFMuU3RvcmUuZXh0ZW5kKHsKLSAgICByZXZpc2lvbjog MTIsCi0gICAgYWRhcHRlcjogJ1RvZG9zLkxTQWRhcHRlcicsCi0gICAgY29tbWl0OiBmdW5jdGlv biAoKSB7IH0KLSAgICB9KTsKKyAgICAgICAgY29udGVudFdpbmRvdy5Ub2Rvcy5TdG9yZSA9IGNv bnRlbnRXaW5kb3cuRFMuU3RvcmUuZXh0ZW5kKHsKKyAgICAgICAgICAgIHJldmlzaW9uOiAxMiwK KyAgICAgICAgICAgIGFkYXB0ZXI6ICdUb2Rvcy5MU0FkYXB0ZXInLAorICAgICAgICAgICAgY29t bWl0OiBmdW5jdGlvbiAoKSB7IH0KKyAgICAgICAgfSk7CiAKICAgICAgICAgcmV0dXJuIEJlbmNo bWFya1J1bm5lci53YWl0Rm9yRWxlbWVudCgnI25ldy10b2RvJykudGhlbihmdW5jdGlvbiAoZWxl bWVudCkgewogICAgICAgICAgICAgZWxlbWVudC5mb2N1cygpOwpAQCAtNTcsMjIgKzU3LDIyIEBA IEJlbmNobWFya1J1bm5lci5zdWl0ZSh7CiAgICAgfSwKICAgICB0ZXN0czogWwogICAgICAgICBb J0FkZGluZycgKyBudW1iZXJPZkl0ZW1zVG9BZGQgKyAnSXRlbXMnLCBmdW5jdGlvbiAocGFyYW1z KSB7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbnVtYmVyT2ZJdGVtc1RvQWRkOyBpKysp IHsKLSAgICAgICAgcGFyYW1zLmVtYmVyUnVuKGZ1bmN0aW9uICgpIHsgcGFyYW1zLnZpZXdzWyJu ZXctdG9kbyJdLnNldCgndmFsdWUnLCAnU29tZXRoaW5nIHRvIGRvJyArIGkpOyB9KTsKLSAgICAg ICAgcGFyYW1zLmVtYmVyUnVuKGZ1bmN0aW9uICgpIHsgcGFyYW1zLnZpZXdzWyJuZXctdG9kbyJd Lmluc2VydE5ld2xpbmUoZG9jdW1lbnQuY3JlYXRlRXZlbnQoJ0V2ZW50JykpOyB9KTsKLSAgICAg ICAgfQorICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBudW1iZXJPZkl0ZW1zVG9BZGQ7 IGkrKykgeworICAgICAgICAgICAgICAgIHBhcmFtcy5lbWJlclJ1bihmdW5jdGlvbiAoKSB7IHBh cmFtcy52aWV3c1sibmV3LXRvZG8iXS5zZXQoJ3ZhbHVlJywgJ1NvbWV0aGluZyB0byBkbycgKyBp KTsgfSk7CisgICAgICAgICAgICAgICAgcGFyYW1zLmVtYmVyUnVuKGZ1bmN0aW9uICgpIHsgcGFy YW1zLnZpZXdzWyJuZXctdG9kbyJdLmluc2VydE5ld2xpbmUoZG9jdW1lbnQuY3JlYXRlRXZlbnQo J0V2ZW50JykpOyB9KTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfV0sCiAgICAgICAgIFsnQ29t cGxldGluZ0FsbEl0ZW1zJywgZnVuY3Rpb24gKHBhcmFtcywgY29udGVudFdpbmRvdywgY29udGVu dERvY3VtZW50KSB7Ci0gICAgICAgIHZhciBjaGVja2JveGVzID0gY29udGVudERvY3VtZW50LnF1 ZXJ5U2VsZWN0b3JBbGwoJy5lbWJlci1jaGVja2JveCcpOwotICAgICAgICBmb3IgKHZhciBpID0g MDsgaSA8IGNoZWNrYm94ZXMubGVuZ3RoOyBpKyspIHsKLSAgICAgICAgdmFyIHZpZXcgPSBwYXJh bXMudmlld3NbY2hlY2tib3hlc1tpXS5pZF07Ci0gICAgICAgIHBhcmFtcy5lbWJlclJ1bihmdW5j dGlvbiAoKSB7IHZpZXcuc2V0KCdjaGVja2VkJywgdHJ1ZSk7IH0pOwotICAgICAgICB9CisgICAg ICAgICAgICB2YXIgY2hlY2tib3hlcyA9IGNvbnRlbnREb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxs KCcuZW1iZXItY2hlY2tib3gnKTsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgY2hl Y2tib3hlcy5sZW5ndGg7IGkrKykgeworICAgICAgICAgICAgICAgIHZhciB2aWV3ID0gcGFyYW1z LnZpZXdzW2NoZWNrYm94ZXNbaV0uaWRdOworICAgICAgICAgICAgICAgIHBhcmFtcy5lbWJlclJ1 bihmdW5jdGlvbiAoKSB7IHZpZXcuc2V0KCdjaGVja2VkJywgdHJ1ZSk7IH0pOworICAgICAgICAg ICAgfQogICAgICAgICB9XSwKICAgICAgICAgWydEZWxldGluZ0l0ZW1zJywgZnVuY3Rpb24gKHBh cmFtcywgY29udGVudFdpbmRvdywgY29udGVudERvY3VtZW50KSB7Ci0gICAgICAgIHZhciBkZWxl dGVCdXR0b25zID0gY29udGVudERvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJy5kZXN0cm95Jyk7 Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZGVsZXRlQnV0dG9ucy5sZW5ndGg7IGkrKykK LSAgICAgICAgcGFyYW1zLmVtYmVyUnVuKGZ1bmN0aW9uICgpIHsgZGVsZXRlQnV0dG9uc1tpXS5j bGljaygpOyB9KTsKKyAgICAgICAgICAgIHZhciBkZWxldGVCdXR0b25zID0gY29udGVudERvY3Vt ZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJy5kZXN0cm95Jyk7CisgICAgICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IGRlbGV0ZUJ1dHRvbnMubGVuZ3RoOyBpKyspCisgICAgICAgICAgICAgICAgcGFy YW1zLmVtYmVyUnVuKGZ1bmN0aW9uICgpIHsgZGVsZXRlQnV0dG9uc1tpXS5jbGljaygpOyB9KTsK ICAgICAgICAgfV0sCiAgICAgXQogfSk7CkBAIC04OSwyMiArODksMjIgQEAgQmVuY2htYXJrUnVu bmVyLnN1aXRlKHsKICAgICB9LAogICAgIHRlc3RzOiBbCiAgICAgICAgIFsnQWRkaW5nJyArIG51 bWJlck9mSXRlbXNUb0FkZCArICdJdGVtcycsIGZ1bmN0aW9uIChuZXdUb2RvLCBjb250ZW50V2lu ZG93LCBjb250ZW50RG9jdW1lbnQpIHsKLSAgICAgICAgdmFyIGFwcFZpZXcgPSBjb250ZW50V2lu ZG93LmFwcFZpZXc7Ci0gICAgICAgIHZhciBmYWtlRXZlbnQgPSB7d2hpY2g6IGNvbnRlbnRXaW5k b3cuRU5URVJfS0VZfTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBudW1iZXJPZkl0ZW1z VG9BZGQ7IGkrKykgewotICAgICAgICAgICAgbmV3VG9kby52YWx1ZSA9ICdTb21ldGhpbmcgdG8g ZG8gJyArIGk7Ci0gICAgICAgIGFwcFZpZXcuY3JlYXRlT25FbnRlcihmYWtlRXZlbnQpOworICAg ICAgICAgICAgdmFyIGFwcFZpZXcgPSBjb250ZW50V2luZG93LmFwcFZpZXc7CisgICAgICAgICAg ICB2YXIgZmFrZUV2ZW50ID0ge3doaWNoOiBjb250ZW50V2luZG93LkVOVEVSX0tFWX07CisgICAg ICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG51bWJlck9mSXRlbXNUb0FkZDsgaSsrKSB7Cisg ICAgICAgICAgICAgICAgbmV3VG9kby52YWx1ZSA9ICdTb21ldGhpbmcgdG8gZG8gJyArIGk7Cisg ICAgICAgICAgICAgICAgYXBwVmlldy5jcmVhdGVPbkVudGVyKGZha2VFdmVudCk7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH1dLAogICAgICAgICBbJ0NvbXBsZXRpbmdBbGxJdGVtcycsIGZ1bmN0 aW9uIChuZXdUb2RvLCBjb250ZW50V2luZG93LCBjb250ZW50RG9jdW1lbnQpIHsKLSAgICAgICAg dmFyIGNoZWNrYm94ZXMgPSBjb250ZW50RG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgnLnRvZ2ds ZScpOwotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNoZWNrYm94ZXMubGVuZ3RoOyBpKysp Ci0gICAgICAgICAgICBjaGVja2JveGVzW2ldLmNsaWNrKCk7Ci0gICAgICAgIH1dLAotICAgICAg ICAgICAgWydEZWxldGluZ0FsbEl0ZW1zJywgZnVuY3Rpb24gKG5ld1RvZG8sIGNvbnRlbnRXaW5k b3csIGNvbnRlbnREb2N1bWVudCkgewotICAgICAgICB2YXIgZGVsZXRlQnV0dG9ucyA9IGNvbnRl bnREb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCcuZGVzdHJveScpOwotICAgICAgICBmb3IgKHZh ciBpID0gMDsgaSA8IGRlbGV0ZUJ1dHRvbnMubGVuZ3RoOyBpKyspCi0gICAgICAgICAgICBkZWxl dGVCdXR0b25zW2ldLmNsaWNrKCk7CisgICAgICAgICAgICB2YXIgY2hlY2tib3hlcyA9IGNvbnRl bnREb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCcudG9nZ2xlJyk7CisgICAgICAgICAgICBmb3Ig KHZhciBpID0gMDsgaSA8IGNoZWNrYm94ZXMubGVuZ3RoOyBpKyspCisgICAgICAgICAgICAgICAg Y2hlY2tib3hlc1tpXS5jbGljaygpOworICAgICAgICB9XSwKKyAgICAgICAgWydEZWxldGluZ0Fs bEl0ZW1zJywgZnVuY3Rpb24gKG5ld1RvZG8sIGNvbnRlbnRXaW5kb3csIGNvbnRlbnREb2N1bWVu dCkgeworICAgICAgICAgICAgdmFyIGRlbGV0ZUJ1dHRvbnMgPSBjb250ZW50RG9jdW1lbnQucXVl cnlTZWxlY3RvckFsbCgnLmRlc3Ryb3knKTsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgZGVsZXRlQnV0dG9ucy5sZW5ndGg7IGkrKykKKyAgICAgICAgICAgICAgICBkZWxldGVCdXR0 b25zW2ldLmNsaWNrKCk7CiAgICAgICAgIH1dLAogICAgIF0KIH0pOwpAQCAtMTIxLDI0ICsxMjEs MjQgQEAgQmVuY2htYXJrUnVubmVyLnN1aXRlKHsKICAgICB9LAogICAgIHRlc3RzOiBbCiAgICAg ICAgIFsnQWRkaW5nJyArIG51bWJlck9mSXRlbXNUb0FkZCArICdJdGVtcycsIGZ1bmN0aW9uIChu ZXdUb2RvLCBjb250ZW50V2luZG93LCBjb250ZW50RG9jdW1lbnQpIHsKLSAgICAgICAgdmFyIGFw cCA9IGNvbnRlbnRXaW5kb3cuYXBwOwotICAgICAgICB2YXIgZmFrZUV2ZW50ID0ge3doaWNoOiBh cHAuRU5URVJfS0VZfTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBudW1iZXJPZkl0ZW1z VG9BZGQ7IGkrKykgewotICAgICAgICAgICAgbmV3VG9kby52YWx1ZSA9ICdTb21ldGhpbmcgdG8g ZG8gJyArIGk7Ci0gICAgICAgIGFwcC5jcmVhdGUuY2FsbChuZXdUb2RvLCBmYWtlRXZlbnQpOwot ICAgICAgICAgICAgfQorICAgICAgICAgICAgdmFyIGFwcCA9IGNvbnRlbnRXaW5kb3cuYXBwOwor ICAgICAgICAgICAgdmFyIGZha2VFdmVudCA9IHt3aGljaDogYXBwLkVOVEVSX0tFWX07CisgICAg ICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG51bWJlck9mSXRlbXNUb0FkZDsgaSsrKSB7Cisg ICAgICAgICAgICAgICAgbmV3VG9kby52YWx1ZSA9ICdTb21ldGhpbmcgdG8gZG8gJyArIGk7Cisg ICAgICAgICAgICAgICAgYXBwLmNyZWF0ZS5jYWxsKG5ld1RvZG8sIGZha2VFdmVudCk7CisgICAg ICAgICAgICAgICAgfQogICAgICAgICB9XSwKICAgICAgICAgWydDb21wbGV0aW5nQWxsSXRlbXMn LCBmdW5jdGlvbiAobmV3VG9kbywgY29udGVudFdpbmRvdywgY29udGVudERvY3VtZW50KSB7Ci0g ICAgICAgIHZhciBhcHAgPSBjb250ZW50V2luZG93LmFwcDsKLSAgICAgICAgdmFyIGNoZWNrYm94 ZXMgPSBjb250ZW50RG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgnLnRvZ2dsZScpOwotICAgICAg ICBmb3IgKHZhciBpID0gMDsgaSA8IGNoZWNrYm94ZXMubGVuZ3RoOyBpKyspCi0gICAgICAgIGFw cC50b2dnbGUuY2FsbChjaGVja2JveGVzW2ldKTsKLSAgICAgICAgfV0sCi0gICAgICAgICAgICBb J0RlbGV0aW5nQWxsSXRlbXMnLCBmdW5jdGlvbiAobmV3VG9kbywgY29udGVudFdpbmRvdywgY29u dGVudERvY3VtZW50KSB7Ci0gICAgICAgIHZhciBhcHAgPSBjb250ZW50V2luZG93LmFwcDsKLSAg ICAgICAgdmFyIGRlbGV0ZUJ1dHRvbnMgPSBjb250ZW50RG9jdW1lbnQucXVlcnlTZWxlY3RvckFs bCgnLmRlc3Ryb3knKTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBkZWxldGVCdXR0b25z Lmxlbmd0aDsgaSsrKQotICAgICAgICBhcHAuZGVzdHJveS5jYWxsKGRlbGV0ZUJ1dHRvbnNbaV0p OworICAgICAgICAgICAgdmFyIGFwcCA9IGNvbnRlbnRXaW5kb3cuYXBwOworICAgICAgICAgICAg dmFyIGNoZWNrYm94ZXMgPSBjb250ZW50RG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgnLnRvZ2ds ZScpOworICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBjaGVja2JveGVzLmxlbmd0aDsg aSsrKQorICAgICAgICAgICAgYXBwLnRvZ2dsZS5jYWxsKGNoZWNrYm94ZXNbaV0pOworICAgICAg ICB9XSwKKyAgICAgICAgWydEZWxldGluZ0FsbEl0ZW1zJywgZnVuY3Rpb24gKG5ld1RvZG8sIGNv bnRlbnRXaW5kb3csIGNvbnRlbnREb2N1bWVudCkgeworICAgICAgICAgICAgdmFyIGFwcCA9IGNv bnRlbnRXaW5kb3cuYXBwOworICAgICAgICAgICAgdmFyIGRlbGV0ZUJ1dHRvbnMgPSBjb250ZW50 RG9jdW1lbnQucXVlcnlTZWxlY3RvckFsbCgnLmRlc3Ryb3knKTsKKyAgICAgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgZGVsZXRlQnV0dG9ucy5sZW5ndGg7IGkrKykKKyAgICAgICAgICAgIGFw cC5kZXN0cm95LmNhbGwoZGVsZXRlQnV0dG9uc1tpXSk7CiAgICAgICAgIH1dLAogICAgIF0KIH0p OwpAQCAtMTU1LDI2ICsxNTUsMjYgQEAgQmVuY2htYXJrUnVubmVyLnN1aXRlKHsKICAgICB9LAog ICAgIHRlc3RzOiBbCiAgICAgICAgIFsnQWRkaW5nJyArIG51bWJlck9mSXRlbXNUb0FkZCArICdJ dGVtcycsIGZ1bmN0aW9uIChuZXdUb2RvLCBjb250ZW50V2luZG93LCBjb250ZW50RG9jdW1lbnQp IHsKLSAgICAgICAgdmFyIHRvZG9tdmMgPSBjb250ZW50V2luZG93LnRvZG9tdmM7Ci0gICAgICAg IHZhciBzdWJtaXRFdmVudCA9IGRvY3VtZW50LmNyZWF0ZUV2ZW50KCdFdmVudCcpOwotICAgICAg ICBzdWJtaXRFdmVudC5pbml0RXZlbnQoJ3N1Ym1pdCcsIHRydWUsIHRydWUpOwotICAgICAgICB2 YXIgaW5wdXRFdmVudCA9IGRvY3VtZW50LmNyZWF0ZUV2ZW50KCdFdmVudCcpOwotICAgICAgICBp bnB1dEV2ZW50LmluaXRFdmVudCgnaW5wdXQnLCB0cnVlLCB0cnVlKTsKLSAgICAgICAgZm9yICh2 YXIgaSA9IDA7IGkgPCBudW1iZXJPZkl0ZW1zVG9BZGQ7IGkrKykgewotICAgICAgICAgICAgbmV3 VG9kby52YWx1ZSA9ICdTb21ldGhpbmcgdG8gZG8gJyArIGk7Ci0gICAgICAgICAgICBuZXdUb2Rv LmRpc3BhdGNoRXZlbnQoaW5wdXRFdmVudCk7Ci0gICAgICAgICAgICBuZXdUb2RvLmZvcm0uZGlz cGF0Y2hFdmVudChzdWJtaXRFdmVudCk7CisgICAgICAgICAgICB2YXIgdG9kb212YyA9IGNvbnRl bnRXaW5kb3cudG9kb212YzsKKyAgICAgICAgICAgIHZhciBzdWJtaXRFdmVudCA9IGRvY3VtZW50 LmNyZWF0ZUV2ZW50KCdFdmVudCcpOworICAgICAgICAgICAgc3VibWl0RXZlbnQuaW5pdEV2ZW50 KCdzdWJtaXQnLCB0cnVlLCB0cnVlKTsKKyAgICAgICAgICAgIHZhciBpbnB1dEV2ZW50ID0gZG9j dW1lbnQuY3JlYXRlRXZlbnQoJ0V2ZW50Jyk7CisgICAgICAgICAgICBpbnB1dEV2ZW50LmluaXRF dmVudCgnaW5wdXQnLCB0cnVlLCB0cnVlKTsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBp IDwgbnVtYmVyT2ZJdGVtc1RvQWRkOyBpKyspIHsKKyAgICAgICAgICAgICAgICBuZXdUb2RvLnZh bHVlID0gJ1NvbWV0aGluZyB0byBkbyAnICsgaTsKKyAgICAgICAgICAgICAgICBuZXdUb2RvLmRp c3BhdGNoRXZlbnQoaW5wdXRFdmVudCk7CisgICAgICAgICAgICAgICAgbmV3VG9kby5mb3JtLmRp c3BhdGNoRXZlbnQoc3VibWl0RXZlbnQpOwogICAgICAgICAgICAgfQogICAgICAgICB9XSwKICAg ICAgICAgWydDb21wbGV0aW5nQWxsSXRlbXMnLCBmdW5jdGlvbiAobmV3VG9kbywgY29udGVudFdp bmRvdywgY29udGVudERvY3VtZW50KSB7Ci0gICAgICAgIHZhciBjaGVja2JveGVzID0gY29udGVu dERvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJy50b2dnbGUnKTsKLSAgICAgICAgZm9yICh2YXIg aSA9IDA7IGkgPCBjaGVja2JveGVzLmxlbmd0aDsgaSsrKQotICAgICAgICAgICAgY2hlY2tib3hl c1tpXS5jbGljaygpOwotICAgICAgICB9XSwKLSAgICAgICAgICAgIFsnRGVsZXRpbmdBbGxJdGVt cycsIGZ1bmN0aW9uIChuZXdUb2RvLCBjb250ZW50V2luZG93LCBjb250ZW50RG9jdW1lbnQpIHsK LSAgICAgICAgdmFyIGRlbGV0ZUJ1dHRvbnMgPSBjb250ZW50RG9jdW1lbnQucXVlcnlTZWxlY3Rv ckFsbCgnLmRlc3Ryb3knKTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBkZWxldGVCdXR0 b25zLmxlbmd0aDsgaSsrKQotICAgICAgICAgICAgZGVsZXRlQnV0dG9uc1tpXS5jbGljaygpOwor ICAgICAgICAgICAgdmFyIGNoZWNrYm94ZXMgPSBjb250ZW50RG9jdW1lbnQucXVlcnlTZWxlY3Rv ckFsbCgnLnRvZ2dsZScpOworICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBjaGVja2Jv eGVzLmxlbmd0aDsgaSsrKQorICAgICAgICAgICAgICAgIGNoZWNrYm94ZXNbaV0uY2xpY2soKTsK KyAgICAgICAgfV0sCisgICAgICAgIFsnRGVsZXRpbmdBbGxJdGVtcycsIGZ1bmN0aW9uIChuZXdU b2RvLCBjb250ZW50V2luZG93LCBjb250ZW50RG9jdW1lbnQpIHsKKyAgICAgICAgICAgIHZhciBk ZWxldGVCdXR0b25zID0gY29udGVudERvY3VtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoJy5kZXN0cm95 Jyk7CisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGRlbGV0ZUJ1dHRvbnMubGVuZ3Ro OyBpKyspCisgICAgICAgICAgICAgICAgZGVsZXRlQnV0dG9uc1tpXS5jbGljaygpOwogICAgICAg ICB9XSwKICAgICBdCiB9KTsKSW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvRG9Zb3VFdmVuQmVuY2gv YmVuY2htYXJrLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1hbmNlVGVzdHMvRG9Zb3VFdmVuQmVu Y2gvYmVuY2htYXJrLmpzCShyZXZpc2lvbiAxNTYwNzMpCisrKyBQZXJmb3JtYW5jZVRlc3RzL0Rv WW91RXZlbkJlbmNoL2JlbmNobWFyay5qcwkod29ya2luZyBjb3B5KQpAQCAtMjIsMTUgKzIyLDE1 IEBAIFNpbXBsZVByb21pc2UucHJvdG90eXBlLnJlc29sdmUgPSBmdW5jdGkKICAgICBpZiAoIXRo aXMuX2NhbGxiYWNrKSB7CiAgICAgICAgIHRoaXMuX3Jlc29sdmVkID0gdHJ1ZTsKICAgICAgICAg dGhpcy5fcmVzb2x2ZWRWYWx1ZSA9IHZhbHVlOwotICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJu OwogICAgIH0KIAogICAgIHZhciByZXN1bHQgPSB0aGlzLl9jYWxsYmFjayh2YWx1ZSk7CiAgICAg aWYgKHJlc3VsdCBpbnN0YW5jZW9mIFNpbXBsZVByb21pc2UpIHsKLSAgICB2YXIgY2hhaW5lZFBy b21pc2UgPSB0aGlzLl9jaGFpbmVkUHJvbWlzZTsKLSAgICByZXN1bHQudGhlbihmdW5jdGlvbiAo cmVzdWx0KSB7IGNoYWluZWRQcm9taXNlLnJlc29sdmUocmVzdWx0KTsgfSk7CisgICAgICAgIHZh ciBjaGFpbmVkUHJvbWlzZSA9IHRoaXMuX2NoYWluZWRQcm9taXNlOworICAgICAgICByZXN1bHQu dGhlbihmdW5jdGlvbiAocmVzdWx0KSB7IGNoYWluZWRQcm9taXNlLnJlc29sdmUocmVzdWx0KTsg fSk7CiAgICAgfSBlbHNlCi0gICAgdGhpcy5fY2hhaW5lZFByb21pc2UucmVzb2x2ZShyZXN1bHQp OworICAgICAgICB0aGlzLl9jaGFpbmVkUHJvbWlzZS5yZXNvbHZlKHJlc3VsdCk7CiB9CiAKIHZh ciBCZW5jaG1hcmtSdW5uZXIgPSB7X3N1aXRlczogW10sIF9wcmVwYXJlUmV0dXJuVmFsdWU6IG51 bGwsIF9tZWFzdXJlZFZhbHVlczoge319OwpAQCAtNDcsOCArNDcsOCBAQCBCZW5jaG1hcmtSdW5u ZXIud2FpdEZvckVsZW1lbnQgPSBmdW5jdGlvCiAKICAgICBmdW5jdGlvbiByZXNvbHZlSWZSZWFk eSgpIHsKICAgICAgICAgdmFyIGVsZW1lbnQgPSBjb250ZW50RG9jdW1lbnQucXVlcnlTZWxlY3Rv cihzZWxlY3Rvcik7Ci0gICAgaWYgKGVsZW1lbnQpCi0gICAgICAgIHJldHVybiBwcm9taXNlLnJl c29sdmUoZWxlbWVudCk7CisgICAgICAgIGlmIChlbGVtZW50KQorICAgICAgICAgICAgcmV0dXJu IHByb21pc2UucmVzb2x2ZShlbGVtZW50KTsKICAgICAgICAgc2V0VGltZW91dChyZXNvbHZlSWZS ZWFkeSwgNTApOwogICAgIH0KIApAQCAtNzYsMTkgKzc2LDE5IEBAIEJlbmNobWFya1J1bm5lci5f d2FpdEFuZFdhcm1VcCA9IGZ1bmN0aW8KICAgICB2YXIgc3RhcnRUaW1lID0gRGF0ZS5ub3coKTsK IAogICAgIGZ1bmN0aW9uIEZpYm9uYWNjaShuKSB7Ci0gICAgaWYgKERhdGUubm93KCkgLSBzdGFy dFRpbWUgPiAxMDApCi0gICAgcmV0dXJuOwotICAgIGlmIChuIDw9IDApCi0gICAgcmV0dXJuIDA7 Ci0gICAgZWxzZSBpZiAobiA9PSAxKQotICAgIHJldHVybiAxOwotICAgIHJldHVybiBGaWJvbmFj Y2kobiAtIDIpICsgRmlib25hY2NpKG4gLSAxKTsKKyAgICAgICAgaWYgKERhdGUubm93KCkgLSBz dGFydFRpbWUgPiAxMDApCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlmIChuIDw9IDAp CisgICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgZWxzZSBpZiAobiA9PSAxKQorICAgICAg ICAgICAgcmV0dXJuIDE7CisgICAgICAgIHJldHVybiBGaWJvbmFjY2kobiAtIDIpICsgRmlib25h Y2NpKG4gLSAxKTsKICAgICB9CiAKICAgICB2YXIgcHJvbWlzZSA9IG5ldyBTaW1wbGVQcm9taXNl OwogICAgIHNldFRpbWVvdXQoZnVuY3Rpb24gKCkgewotICAgIEZpYm9uYWNjaSgxMDApOwotICAg IHByb21pc2UucmVzb2x2ZSgpOworICAgICAgICBGaWJvbmFjY2koMTAwKTsKKyAgICAgICAgcHJv bWlzZS5yZXNvbHZlKCk7CiAgICAgfSwgMjAwKTsKICAgICByZXR1cm4gcHJvbWlzZTsKIH0KQEAg LTEwOSw4ICsxMDksOCBAQCBCZW5jaG1hcmtSdW5uZXIuX3J1blRlc3QgPSBmdW5jdGlvbihzdWl0 CiAKICAgICB2YXIgc3RhcnRUaW1lID0gbm93KCk7CiAgICAgc2V0VGltZW91dChmdW5jdGlvbiAo KSB7Ci0gICAgdmFyIGVuZFRpbWUgPSBub3coKTsKLSAgICBjYWxsYmFjayhzeW5jVGltZSwgZW5k VGltZSAtIHN0YXJ0VGltZSk7CisgICAgICAgIHZhciBlbmRUaW1lID0gbm93KCk7CisgICAgICAg IGNhbGxiYWNrKHN5bmNUaW1lLCBlbmRUaW1lIC0gc3RhcnRUaW1lKTsKICAgICB9LCAwKTsKIH0K IApAQCAtMjk5LDggKzI5OSw4IEBAIEJlbmNobWFya1J1bm5lci5fZmluYWxpemUgPSBmdW5jdGlv biAoKSAKICAgICB2YXIgcmVzdWx0cyA9ICcnOwogICAgIHZhciB0b3RhbCA9IDA7IC8vIEZJWE1F OiBDb21wdXRlIHRoZSB0b3RhbCBwcm9wZXJseS4KICAgICBmb3IgKHZhciB0aXRsZSBpbiBzZWxm Ll9tZWFzdXJlZFZhbHVlcykgewotICAgIHJlc3VsdHMgKz0gdGl0bGUgKyAnIDogJyArIHNlbGYu X21lYXN1cmVkVmFsdWVzW3RpdGxlXSArICcgbXNcbic7Ci0gICAgdG90YWwgKz0gc2VsZi5fbWVh c3VyZWRWYWx1ZXNbdGl0bGVdOworICAgICAgICByZXN1bHRzICs9IHRpdGxlICsgJyA6ICcgKyBz ZWxmLl9tZWFzdXJlZFZhbHVlc1t0aXRsZV0gKyAnIG1zXG4nOworICAgICAgICB0b3RhbCArPSBz ZWxmLl9tZWFzdXJlZFZhbHVlc1t0aXRsZV07CiAgICAgfQogICAgIHJlc3VsdHMgKz0gJ1RvdGFs IDogJyArICh0b3RhbCAvIDIpICsgJyBtc1xuJzsKICAgICBzZWxmLl9tZWFzdXJlZFZhbHVlcyA9 IHt9Owo=