15738 2007-10-28 14:33:10 -0700 a few SunSpider script improvements 2007-10-28 16:19:45 -0700 1 1 1 Unclassified WebKit Tools / Tests 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED P2 Enhancement --- 1 darin darin oldest_to_newest 59720 0 darin 2007-10-28 14:33:10 -0700 I made a couple script improvements, to get ready for a mode where we can set a baseline and do automatic comparisons with the last run. 59721 1 16920 darin 2007-10-28 14:33:47 -0700 Created attachment 16920 patch 59727 2 16920 aroben 2007-10-28 15:48:45 -0700 Comment on attachment 16920 patch +system("$jsShellPath", "-f", $prefixFile, "-f", $resultsFile, "-f", "resources/sunspider-analyze-results.js"); You could remove the quotes from around $jsShellPath while you're at it. + $foundOutput = 0; + $foundStart = 1; + $result = "[{\n"; Looks like you've got some tabs here. } else { - if (/^[}][]]$/) { + print; Did you intend to insert this print statement? + s/;*$//; Do we really expect to have multiple semi-colons here? r=me 59735 3 darin 2007-10-28 16:19:05 -0700 (In reply to comment #2) > +system("$jsShellPath", "-f", $prefixFile, "-f", $resultsFile, "-f", > "resources/sunspider-analyze-results.js"); > > You could remove the quotes from around $jsShellPath while you're at it. Done. > + $foundOutput = 0; > + $foundStart = 1; > + $result = "[{\n"; > > Looks like you've got some tabs here. Hmm, the pre-existing file seems to have some tabs. Removed > } else { > - if (/^[}][]]$/) { > + print; > > Did you intend to insert this print statement? Oops! > + s/;*$//; > > > Do we really expect to have multiple semi-colons here? I'll switch to ? instead of *. 16920 2007-10-28 14:33:47 -0700 2007-10-28 15:48:45 -0700 patch SunSpiderScriptPatch.txt text/plain 10744 darin SW5kZXg6IFN1blNwaWRlci9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU3VuU3BpZGVyL0NoYW5n ZUxvZwkocmV2aXNpb24gMjcxODkpCisrKyBTdW5TcGlkZXIvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDctMTAtMjggIERhcmluIEFkbGVyICA8ZGFyaW5AYXBw bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogcmVzb3VyY2VzL3N1bnNwaWRlci1hbmFseXplLXJlc3VsdHMuanM6IFR3ZWFrIHRoZSBvdXRw dXQgZm9ybWF0IGEgbGl0dGxlLgorICAgICAgICBDaGFuZ2Ugc28gdGhhdCB3aGVuIHRoZXJlJ3Mg b25seSBvbmUgcnVuIHdlIGRvbid0IHdyaXRlIG91dCBjb25maWRlbmNlCisgICAgICAgIGludGVy dmFscyBhdCBhbGwgcmF0aGVyIHRoYW4gd3JpdGluZyAiTmFOIiBvdmVyIGFuZCBvdmVyIGFnYWlu LgorCisgICAgICAgICogc3Vuc3BpZGVyOiBVc2UgdGhlIHRpbWUgYW5kIGRhdGUgYXMgYSBzdWZm aXggb24gdGhlIHJlc3VsdHMgZmlsZSwgdGhhdCB3YXkKKyAgICAgICAgYWxsIHRoZSByZXN1bHRz IGFyZSBsZWZ0IGJlaGluZCBpbiB0aGUgdG1wIGRpcmVjdG9yeS4gVGhpcyB3aWxsIG1ha2UgaXQg ZWFzeQorICAgICAgICBmb3IgdXMgdG8gYWRkIGZlYXR1cmVzIHRoYXQgY29tcGFyZSBwYXN0IHJl c3VsdHMgaW4gdGhlIGZ1dHVyZS4gQWxzbyByZW5hbWUKKyAgICAgICAgdGhlIC5tc2hhcmsgZmls ZXMgdXNpbmcgdGhlIHNhbWUgc2NoZW1lLgorCisgICAgICAgICogc3Vuc3BpZGVyLWNvbXBhcmUt cmVzdWx0czogUmVsYXggdGhlIHBhcnNpbmcgcnVsZXMgc28gd2UgY2FuIHBhcnNlIHRoZQorICAg ICAgICByZXN1bHRzIGZpbGUgZXhhY3RseSBhcyBpdCdzIGVtaXR0ZWQgZnJvbSBzdW5zcGlkZXIu CisKIDIwMDctMTAtMjUgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAg IFN0cmlwIGNhcnJpYWdlIHJldHVybnMgZnJvbSByZXN1bHRzCkluZGV4OiBTdW5TcGlkZXIvc3Vu c3BpZGVyCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFN1blNwaWRlci9zdW5zcGlkZXIJKHJldmlzaW9uIDI3MTgw KQorKysgU3VuU3BpZGVyL3N1bnNwaWRlcgkod29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBA QCB1c2Ugc3RyaWN0OwogdXNlIEdldG9wdDo6TG9uZzsKIHVzZSBGaWxlOjpCYXNlbmFtZTsKIHVz ZSBDd2Q7Cit1c2UgUE9TSVggcXcoc3RyZnRpbWUpOwogCiBteSAkc2hvd0hlbHAgPSAwOwogbXkg JHJ1blNoYXJrID0gMDsKQEAgLTUxLDcgKzUyLDcgQEAgR2V0T3B0aW9ucygncnVucz1pJyA9PiBc JHRlc3RSdW5zLAogICAgICAgICAgICAndGVzdHM9cycgPT4gXCR0ZXN0c1BhdHRlcm4sCiAgICAg ICAgICAgICdoZWxwJyA9PiBcJHNob3dIZWxwKTsKIAotJHRlc3RSdW5zID0gMSAgaWYgJHJ1blNo YXJrOworJHRlc3RSdW5zID0gMSBpZiAkcnVuU2hhcms7CiAKIGlmICghJGpzU2hlbGxQYXRoIHx8 ICRzaG93SGVscCkgewogICAgcHJpbnQgU1RERVJSICR1c2FnZTsKQEAgLTY2LDcgKzY3LDYgQEAg c3ViIGR1bXBUb0ZpbGUoJCQpCiAgICAgY2xvc2UgRklMRTsKIH0KIAotIyBGSVhNRTogdGhlc2Ug Z2xvYmFscyBhcmUgcmF0aGVyIHBvb3IgYWJzdHJhY3Rpb24KIG15IEB0ZXN0cyA9ICgpOwogbXkg QGNhdGVnb3JpZXMgPSAoKTsKIG15ICV1bmlxdWVDYXRlZ29yaWVzID0gKCk7CkBAIC04OSwxOSAr ODksMjMgQEAgc3ViIGxvYWRUZXN0c0xpc3QoKQogICAgIGNsb3NlIFRFU1RMSVNUOwogfQogCitt eSAkdGltZVN0cmluZyA9IHN0cmZ0aW1lICIlWS0lbS0lZC0lSDolTTolUyIsIGxvY2FsdGltZSAk XlQ7CitteSAkcHJlZml4RmlsZSA9ICJ0bXAvc3Vuc3BpZGVyLXRlc3QtcHJlZml4LmpzIjsKK215 ICRyZXN1bHRzRmlsZSA9ICJ0bXAvc3Vuc3BpZGVyLXJlc3VsdHMtJHRpbWVTdHJpbmcuanMiOwor CiBzdWIgd3JpdGVQcmVmaXhGaWxlKCkKIHsKICAgICBteSAkcHJlZml4ID0gInZhciB0ZXN0cyA9 IFsgIiAuIGpvaW4oIiwgIiwgbWFwIHsgJyInIC4gJF8gLiAnIicgfSBAdGVzdHMpIC4gIiBdO1xu IjsKICAgICAkcHJlZml4IC49ICJ2YXIgY2F0ZWdvcmllcyA9IFsgIiAuIGpvaW4oIiwgIiwgbWFw IHsgJyInIC4gJF8gLiAnIicgfSBAY2F0ZWdvcmllcykgLiAiIF07XG4iOwogCiAgICAgbWtkaXIg InRtcCI7Ci0gICAgZHVtcFRvRmlsZSgkcHJlZml4LCAidG1wL3N1bnNwaWRlci10ZXN0LXByZWZp eC5qcyIpOworICAgIGR1bXBUb0ZpbGUoJHByZWZpeCwgJHByZWZpeEZpbGUpOwogfQogCiBzdWIg cnVuVGVzdHNPbmNlKCQpCiB7CiAgICAgbXkgKCR1c2VTaGFyaykgPSBAXzsKLSAgICBteSAkc2hl bGxBcmdzID0gIi1mIHRtcC9zdW5zcGlkZXItdGVzdC1wcmVmaXguanMgLWYgcmVzb3VyY2VzL3N1 bnNwaWRlci1zdGFuZGFsb25lLWRyaXZlci5qcyAyPiAvZGV2L251bGwiOworICAgIG15ICRzaGVs bEFyZ3MgPSAiLWYgJHByZWZpeEZpbGUgLWYgcmVzb3VyY2VzL3N1bnNwaWRlci1zdGFuZGFsb25l LWRyaXZlci5qcyAyPiAvZGV2L251bGwiOwogICAgIG15ICRvdXRwdXQ7CiAgICAgaWYgKCR1c2VT aGFyaykgewogICAgICAgICAkb3V0cHV0ID0gYHNoYXJrIC1pIC0xIC1xICIkanNTaGVsbFBhdGgi ICRzaGVsbEFyZ3NgOwpAQCAtMTE4LDcgKzEyMiw3IEBAIGlmICgkdGVzdHNQYXR0ZXJuKSB7CiAg ICAgcHJpbnQgU1RERVJSICJGb3VuZCAiIC4gc2NhbGFyKEB0ZXN0cykgLiAiIHRlc3RzXG4iOwog fQogZGllICJObyB0ZXN0cyB0byBydW4iICB1bmxlc3Mgc2NhbGFyKEB0ZXN0cyk7Ci1wcmludCBT VERFUlIgIlJ1bm5pbmcgU3VuU3BpZGVyIG9uY2UgZm9yIHdhcm11cCwgdGhlbiAkdGVzdFJ1bnMg dGltZSIgLiAoJHRlc3RSdW5zID09IDEgPyAiIiA6ICJzIikgLiAoJHJ1blNoYXJrID8gIiB1bmRl ciBTaGFyayIgOiAiIikgLiAiXG4iOworcHJpbnQgU1RERVJSICJSdW5uaW5nIFN1blNwaWRlciBv bmNlIGZvciB3YXJtdXAsIHRoZW4gIiAuICgkcnVuU2hhcmsgPyAidW5kZXIgU2hhcmsiIDogIiR0 ZXN0UnVucyB0aW1lIiAuICgkdGVzdFJ1bnMgPT0gMSA/ICIiIDogInMiKSkgLiAiXG4iOwogd3Jp dGVQcmVmaXhGaWxlKCk7CiAKIHJ1blRlc3RzT25jZSgwKTsKQEAgLTE0MCw5ICsxNDQsOSBAQCB3 aGlsZSAoJGNvdW50KysgPCAkdGVzdFJ1bnMpIHsKIHByaW50ICJdXG4iOwogCiBteSAkb3V0cHV0 ID0gInZhciBvdXRwdXQgPSBbXG4iIC4gam9pbigiLFxuIiwgQHJlc3VsdHMpIC4gIlxuXTtcbiI7 Ci1kdW1wVG9GaWxlKCRvdXRwdXQsICJ0bXAvc3Vuc3BpZGVyLXJlc3VsdHMuanMiKTsKK2R1bXBU b0ZpbGUoJG91dHB1dCwgJHJlc3VsdHNGaWxlKTsKIAotc3lzdGVtKCIkanNTaGVsbFBhdGgiLCAi LWYiLCAidG1wL3N1bnNwaWRlci10ZXN0LXByZWZpeC5qcyIsICItZiIsICJ0bXAvc3Vuc3BpZGVy LXJlc3VsdHMuanMiLCAiLWYiLCAicmVzb3VyY2VzL3N1bnNwaWRlci1hbmFseXplLXJlc3VsdHMu anMiKTsKK3N5c3RlbSgiJGpzU2hlbGxQYXRoIiwgIi1mIiwgJHByZWZpeEZpbGUsICItZiIsICRy ZXN1bHRzRmlsZSwgIi1mIiwgInJlc291cmNlcy9zdW5zcGlkZXItYW5hbHl6ZS1yZXN1bHRzLmpz Iik7CiAKIGlmICgkcnVuU2hhcmspIHsKICAgICBteSAkbmV3ZXN0QWdlID0gMDsKQEAgLTE1OCw1 ICsxNjIsOSBAQCBpZiAoJHJ1blNoYXJrKSB7CiAgICAgICAgIH0KICAgICB9CiAgICAgY2xvc2Vk aXIgRElSOwotICAgIGV4ZWMgIi91c3IvYmluL29wZW4iLCAkbmV3ZXN0TVNoYXJrIGlmICRuZXdl c3RNU2hhcms7CisgICAgaWYgKCRuZXdlc3RNU2hhcmspIHsKKyAgICAgICAgbXkgJHByb2ZpbGVG aWxlID0gInRtcC9zdW5zcGlkZXItcHJvZmlsZS0kdGltZVN0cmluZy5tc2hhcmsiOworICAgICAg ICByZW5hbWUgJG5ld2VzdE1TaGFyaywgJHByb2ZpbGVGaWxlIG9yIGRpZTsKKyAgICAgICAgZXhl YyAiL3Vzci9iaW4vb3BlbiIsICRwcm9maWxlRmlsZTsKKyAgICB9CiB9CkluZGV4OiBTdW5TcGlk ZXIvc3Vuc3BpZGVyLWNvbXBhcmUtcmVzdWx0cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTdW5TcGlkZXIvc3Vu c3BpZGVyLWNvbXBhcmUtcmVzdWx0cwkocmV2aXNpb24gMjcxODApCisrKyBTdW5TcGlkZXIvc3Vu c3BpZGVyLWNvbXBhcmUtcmVzdWx0cwkod29ya2luZyBjb3B5KQpAQCAtMSw2ICsxLDYgQEAKICMh L3Vzci9iaW4vcGVybCAtdwogCi0jIENvcHlyaWdodCAoQykgMjAwNyBBcHBsZSBJbmMuICBBbGwg cmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMDcgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC01MCwxOCArNTAs MjcgQEAgc3ViIHJlYWRSZXN1bHRzRmlsZSgkKQogICAgIG15ICgkZmlsZW5hbWUpID0gQF87CiAg ICAgb3BlbiBGSUxFLCAiPCIsICRmaWxlbmFtZSBvciBkaWU7CiAgICAgbXkgJGZvdW5kU3RhcnQg PSAwOworICAgIG15ICRmb3VuZE91dHB1dCA9IDA7CiAgICAgbXkgJGZvdW5kRW5kID0gMDsKICAg ICBteSAkcmVzdWx0ID0gIiI7CiAgICAgd2hpbGUgKDxGSUxFPikgewogICAgICAgICBpZiAoISRm b3VuZFN0YXJ0KSB7Ci0JICAgIGlmICgvXltbXVt7XSQvKSB7CisJICAgIGlmICgvXlxbXHskLykg ewogCQkkZm91bmRTdGFydCA9IDE7CiAJCSRyZXN1bHQgLj0gJF87Ci0JICAgIH0KKwkgICAgfSBl bHNpZiAoL152YXIgXHcrID0gXFskLykgeworICAgICAgICAgICAgICAgICRmb3VuZE91dHB1dCA9 IDE7CisgICAgICAgICAgICB9IGVsc2lmICgkZm91bmRPdXRwdXQgJiYgL15ceyQvKSB7CisgICAg ICAgICAgICAgICAgJGZvdW5kT3V0cHV0ID0gMDsKKwkJJGZvdW5kU3RhcnQgPSAxOworICAgICAg ICAgICAgICAgICRyZXN1bHQgPSAiW3tcbiI7CisgICAgICAgICAgICB9CiAJfSBlbHNlIHsKLQkg ICAgaWYgKC9eW31dW11dJC8pIHsKKyAgICAgICAgICAgIHByaW50OworCSAgICBpZiAoL1xdOyok LykgewogCSAgICAgICAgJGZvdW5kRW5kID0gMTsKIAkJY2hvbXA7CisgICAgICAgICAgICAgICAg cy87KiQvLzsKIAkJJHJlc3VsdCAuPSAkXzsKIAkJbGFzdDsKIAkgICAgfSBlbHNlIHsKSW5kZXg6 IFN1blNwaWRlci9yZXNvdXJjZXMvc3Vuc3BpZGVyLWFuYWx5emUtcmVzdWx0cy5qcwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTdW5TcGlkZXIvcmVzb3VyY2VzL3N1bnNwaWRlci1hbmFseXplLXJlc3VsdHMuanMJ KHJldmlzaW9uIDI3MTgwKQorKysgU3VuU3BpZGVyL3Jlc291cmNlcy9zdW5zcGlkZXItYW5hbHl6 ZS1yZXN1bHRzLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xODAsNiArMTgwLDkgQEAgZnVuY3Rpb24g Zm9ybWF0UmVzdWx0KG1lYW5XaWR0aCwgbWVhbiwgcwogICAgICAgICBtZWFuU3RyaW5nID0gIiAi ICsgbWVhblN0cmluZzsKICAgICB9CiAKKyAgICBpZiAobiA9PSAxKQorICAgICAgICByZXR1cm4g bWVhblN0cmluZyArICJtcyI7CisKICAgICByZXR1cm4gbWVhblN0cmluZyArICJtcyArLy0gIiAr ICgodERpc3QobikgKiBzdGRFcnIgLyBtZWFuKSAqIDEwMCkudG9GaXhlZCgxKSArICIlIjsKIH0K IApAQCAtMjM4LDExICsyNDEsMTQgQEAgZnVuY3Rpb24gcHJpbnRPdXRwdXQoKQogICAgIHZhciBt ZWFuV2lkdGggPSBjb21wdXRlTWVhbldpZHRoKCk7CiAKICAgICBwcmludCgiXG4iKTsKLSAgICBw cmludCgiPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PSIpOwotICAgIHBy aW50KCJSRVNVTFRTIChtZWFucyBhbmQgOTUlIGNvbmZpZGVuY2UgaW50ZXJ2YWxzKSIpOwotICAg IHByaW50KCItLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tIik7CisgICAg cHJpbnQoIj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Iik7Cisg ICAgaWYgKGNvdW50ID09IDEpCisgICAgICAgIHByaW50KCJSRVNVTFRTIik7CisgICAgZWxzZQor ICAgICAgICBwcmludCgiUkVTVUxUUyAobWVhbnMgYW5kIDk1JSBjb25maWRlbmNlIGludGVydmFs cykiKTsKKyAgICBwcmludCgiLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0iKTsKICAgICBwcmludChyZXN1bHRMaW5lKGxhYmVsV2lkdGgsIDAsICJUb3RhbCIsIG1l YW5XaWR0aCwgbWVhbiwgc3RkRXJyKSk7Ci0gICAgcHJpbnQoIi0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0iKTsKKyAgICBwcmludCgiLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0iKTsKICAgICBmb3IgKHZhciBjYXRlZ29yeSBpbiBjYXRl Z29yeU1lYW5zKSB7CiAgICAgICAgIHByaW50KCIiKTsKICAgICAgICAgcHJpbnQocmVzdWx0TGlu ZShsYWJlbFdpZHRoLCAyLCBjYXRlZ29yeSwgbWVhbldpZHRoLCBjYXRlZ29yeU1lYW5zW2NhdGVn b3J5XSwgY2F0ZWdvcnlTdGRFcnJzW2NhdGVnb3J5XSkpOwpJbmRleDogV2ViS2l0VG9vbHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjcx ODkpCisrKyBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NCBAQAorMjAwNy0xMC0yOCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1z dW5zcGlkZXI6IERlZmF1bHQgdG8gIlJlbGVhc2UiIGNvbmZpZ3VyYXRpb24gcmF0aGVyIHRoYW4K KyAgICAgICAgZGVmYXVsdGluZyB0byB0aGUgbGFzdCBjb25maWd1cmF0aW9uIHVzZWQgYXMgb3Ro ZXIgc2NyaXB0cyBkby4gVGhpcyBjYW4KKyAgICAgICAgc3RpbGwgYmUgb3ZlcnJpZGVuIG9uIHRo ZSBjb21tYW5kIGxpbmUgd2l0aCAiLS1kZWJ1ZyIgaWYgdGhlcmUncyBzb21lCisgICAgICAgIHJl YXNvbiB0byBkbyBzby4gQWxzbyBmaXggYSB0eXBvLgorCisgICAgICAgICogU2NyaXB0cy9zdW5z cGlkZXItY29tcGFyZS1yZXN1bHRzOiBGaXggYSB0eXBvLgorCiAyMDA3LTEwLTI2ICBLZXZpbiBN Y0N1bGxvdWdoICA8a21jY3VsbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEFkYW0uCkluZGV4OiBXZWJLaXRUb29scy9TY3JpcHRzL3J1bi1zdW5zcGlkZXIKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4tc3Vuc3BpZGVyCShyZXZpc2lvbiAyNzE4MCkK KysrIFdlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXN1bnNwaWRlcgkod29ya2luZyBjb3B5KQpAQCAt MSw2ICsxLDYgQEAKICMhL3Vzci9iaW4vcGVybCAtdwogCi0jIENvcHlyaWdodCAoQykgMjAwNyBB cHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorIyBDb3B5cmlnaHQgKEMpIDIwMDcgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIyBDb3B5cmlnaHQgKEMpIDIwMDcgRXJpYyBT ZWlkZWwgPGVyaWNAd2Via2l0Lm9yZz4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0zMSwxMyArMzEsMTMg QEAgdXNlIGxpYiAkRmluZEJpbjo6QmluOwogdXNlIHdlYmtpdGRpcnM7CiB1c2UgUE9TSVg7CiAK LQotIyBkZXRlcm1pbmUgY29uZmlndXJhdGlvbgorIyBkZXRlcm1pbmUgY29uZmlndXJhdGlvbiwg YnV0IGRlZmF1bHQgdG8gIlJlbGVhc2UiIGluc3RlYWQgb2YgbGFzdC11c2VkIGNvbmZpZ3VyYXRp b24KK3NldENvbmZpZ3VyYXRpb24oIlJlbGVhc2UiKTsKIHNldENvbmZpZ3VyYXRpb24oKTsKIG15 ICRjb25maWd1cmF0aW9uID0gY29uZmlndXJhdGlvbigpOwogCiBteSAkcm9vdDsKLW15ICR0ZXN0 UnVucyA9IDU7ICMgVGhpcyBudW1iZXIgbWF5IGJlIGRpZmZlcmVudCBmcm9tIHdoYXQgLi9zdW5z cGlkZXIgZGVmYXVsdHMgdG8gKHRoYXQncyBPSykKK215ICR0ZXN0UnVucyA9IDU7ICMgVGhpcyBu dW1iZXIgbWF5IGJlIGRpZmZlcmVudCBmcm9tIHdoYXQgc3Vuc3BpZGVyIGRlZmF1bHRzIHRvICh0 aGF0J3MgT0spCiBteSAkcnVuU2hhcmsgPSAwOwogbXkgJHNob3dIZWxwID0gMDsKIG15ICR0ZXN0 c1BhdHRlcm47CkBAIC01OCw3ICs1OCw3IEBAIEdldE9wdGlvbnMoJ3Jvb3Q9cycgPT4gc3ViIHsg bXkgKCRhcmdOYW0KICAgICAgICAgICAgJ3Rlc3RzPXMnID0+IFwkdGVzdHNQYXR0ZXJuLAogICAg ICAgICAgICAnaGVscCcgPT4gXCRzaG93SGVscCk7CiAKLSR0ZXN0UnVucyA9IDEgIGlmICRydW5T aGFyazsKKyR0ZXN0UnVucyA9IDEgaWYgJHJ1blNoYXJrOwogCiBpZiAoJHNob3dIZWxwKSB7CiAg ICBwcmludCBTVERFUlIgJHVzYWdlOwpAQCAtNzksNyArNzksNyBAQCBzdWIgYnVpbGRUZXN0S0pT CiAgICAgfQogfQogCi1zdWIgc2V0dXBFbnZpcm9tZW50Rm9yRXhlY3V0aW9uKCQpCitzdWIgc2V0 dXBFbnZpcm9ubWVudEZvckV4ZWN1dGlvbigkKQogewogICAgIG15ICgkcHJvZHVjdERpcikgPSBA XzsKICAgICBwcmludCAiU3RhcnRpbmcgc3Vuc3BpZGVyIHdpdGggRFlMRF9GUkFNRVdPUktfUEFU SCBzZXQgdG8gcG9pbnQgdG8gYnVpbHQgSmF2YVNjcmlwdENvcmUgaW4gJHByb2R1Y3REaXIuXG4i OwpAQCAtMTA0LDEwICsxMDQsMTAgQEAgbXkgJHByb2R1Y3REaXIgPSBwcm9kdWN0RGlyKCk7CiAj IEZJWE1FOiBUaGlzIGhhY2sgc2hvdWxkIGJlIHB1c2hlZCBkb3duIGludG8gcHJvZHVjdERpcigp CiAkcHJvZHVjdERpciAuPSAiL0phdmFTY3JpcHRDb3JlIiBpZiAoaXNRdCgpIG9yIGlzR3RrKCkp OwogCi1zZXR1cEVudmlyb21lbnRGb3JFeGVjdXRpb24oJHByb2R1Y3REaXIpOworc2V0dXBFbnZp cm9ubWVudEZvckV4ZWN1dGlvbigkcHJvZHVjdERpcik7CiBteSBAYXJncyA9ICgiLS1zaGVsbCIs IHRlc3RLSlNQYXRoKCRwcm9kdWN0RGlyKSwgIi0tcnVucyIsICR0ZXN0UnVucyk7CiAjIFRoaXMg Y29kZSBjb3VsZCBiZSByZW1vdmVkIGlmIHdlIGNob3NlIHRvIHBhc3MgZXh0cmEgYXJncyB0byBz dW5zcGlkZXIgaW5zdGVhZCBvZiBYY29kZQotcHVzaChAYXJncywgIi0tc2hhcmsiKSAgaWYgJHJ1 blNoYXJrOwotcHVzaChAYXJncywgIi0tdGVzdHMiLCAkdGVzdHNQYXR0ZXJuKSAgaWYgJHRlc3Rz UGF0dGVybjsKK3B1c2ggQGFyZ3MsICItLXNoYXJrIiBpZiAkcnVuU2hhcms7CitwdXNoIEBhcmdz LCAiLS10ZXN0cyIsICR0ZXN0c1BhdHRlcm4gaWYgJHRlc3RzUGF0dGVybjsKIAogZXhlYyAiLi9z dW5zcGlkZXIiLCBAYXJnczsKSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMvc3Vuc3BpZGVyLWNv bXBhcmUtcmVzdWx0cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL3N1bnNwaWRl ci1jb21wYXJlLXJlc3VsdHMJKHJldmlzaW9uIDI3MTgwKQorKysgV2ViS2l0VG9vbHMvU2NyaXB0 cy9zdW5zcGlkZXItY29tcGFyZS1yZXN1bHRzCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw3ICszMiw2 IEBAIHVzZSBsaWIgJEZpbmRCaW46OkJpbjsKIHVzZSB3ZWJraXRkaXJzOwogdXNlIFBPU0lYOwog Ci0KICMgZGV0ZXJtaW5lIGNvbmZpZ3VyYXRpb24KIHNldENvbmZpZ3VyYXRpb24oKTsKIG15ICRj b25maWd1cmF0aW9uID0gY29uZmlndXJhdGlvbigpOwpAQCAtNjksNyArNjgsNyBAQCBzdWIgYnVp bGRUZXN0S0pTCiAgICAgfQogfQogCi1zdWIgc2V0dXBFbnZpcm9tZW50Rm9yRXhlY3V0aW9uKCQp CitzdWIgc2V0dXBFbnZpcm9ubWVudEZvckV4ZWN1dGlvbigkKQogewogICAgIG15ICgkcHJvZHVj dERpcikgPSBAXzsKICAgICBwcmludCAiU3RhcnRpbmcgc3Vuc3BpZGVyLWNvbXBhcmUtcmVzdWx0 cyB3aXRoIERZTERfRlJBTUVXT1JLX1BBVEggc2V0IHRvIHBvaW50IHRvIGJ1aWx0IEphdmFTY3Jp cHRDb3JlIGluICRwcm9kdWN0RGlyLlxuIjsKQEAgLTk0LDcgKzkzLDcgQEAgbXkgJHByb2R1Y3RE aXIgPSBwcm9kdWN0RGlyKCk7CiAjIEZJWE1FOiBUaGlzIGhhY2sgc2hvdWxkIGJlIHB1c2hlZCBk b3duIGludG8gcHJvZHVjdERpcigpCiAkcHJvZHVjdERpciAuPSAiL0phdmFTY3JpcHRDb3JlIiBp ZiAoaXNRdCgpIG9yIGlzR3RrKCkpOwogCi1zZXR1cEVudmlyb21lbnRGb3JFeGVjdXRpb24oJHBy b2R1Y3REaXIpOworc2V0dXBFbnZpcm9ubWVudEZvckV4ZWN1dGlvbigkcHJvZHVjdERpcik7CiBt eSBAYXJncyA9ICgiLS1zaGVsbCIsIHRlc3RLSlNQYXRoKCRwcm9kdWN0RGlyKSk7CiAjIFRoaXMg Y29kZSBjb3VsZCBiZSByZW1vdmVkIGlmIHdlIGNob3NlIHRvIHBhc3MgZXh0cmEgYXJncyB0byBz dW5zcGlkZXIgaW5zdGVhZCBvZiBYY29kZQogCg==