25101 2009-04-08 14:22:53 -0700 run-webkit-tests should launch DumpRenderTree and the image diff tool in a way compatible with threads. 2009-04-09 09:15:48 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 10906 1 levin levin aroben ddkilzer eric mrowe oldest_to_newest 116929 0 levin 2009-04-08 14:22:53 -0700 run-webkit-tests sets up ENV correctly and launches these programs, but on a perl threads use the main thread's environment instead of the current thread. 116932 1 29346 levin 2009-04-08 14:45:06 -0700 Created attachment 29346 Proposed fix. 116934 2 eric 2009-04-08 14:59:09 -0700 Yeah, this is something ddkilzer or bdash or darin adler would want to review (as our local perl gurus). 116973 3 29346 ddkilzer 2009-04-08 18:03:59 -0700 Comment on attachment 29346 Proposed fix. Overall this patch looks great, but I have two concerns: 1. The serialization of %ENV using regular expressions is very clever, but I think it would be more straight-forward if Data::Dumper were used to do the serializing, and "eval" to do the deserializing. The Data::Dumper module is present in all "modern" installations of Perl and it would simplify the code in run-webkit-tests and the utility script (ExecAppWithEnv.pm). Try this: $ perl -e 'use Data::Dumper; my $d = Data::Dumper->new([\%ENV], [qw(ENV)]); $d->Indent(0); $d->Purity(1); print $d->Dump();' Also, instead of using "escape" and "unescape", I think it's clearer to use "serialize" and "deserialize" when describing the process of moving %ENV to the subprocess. 2. Please rename "ExecAppWithEnv.pm" to something that resembles a script name like "execAppWithEnv". Naming it "ExecAppWithEnv.pm" made me think it was a Perl module, but it's not. It's a Perl script that is invoked by run-webkit-tests. r- to resolve the above issues. Thanks! 116991 4 29358 levin 2009-04-08 22:20:27 -0700 Created attachment 29358 Proposed fix. Addressed feedback. 117031 5 29358 ddkilzer 2009-04-09 06:10:18 -0700 Comment on attachment 29358 Proposed fix. r=me Thanks! 117032 6 29358 ddkilzer 2009-04-09 06:11:25 -0700 Comment on attachment 29358 Proposed fix. >+ * Scripts/execAppWithEnv.pm: Added. Oops! This should just be "Scripts/execAppWithEnv". :) 117041 7 levin 2009-04-09 09:15:48 -0700 Committed <http://trac.webkit.org/changeset/42359> 29346 2009-04-08 14:45:06 -0700 2009-04-08 22:20:27 -0700 Proposed fix. bug25101.txt text/plain 7381 levin ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwODA4YzI2Li5lYTIzODA0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDQt MDggIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yNTEwMQorCisgICAgICAgIExhdW5jaCBEdW1wUmVuZGVyVHJlZSBhbmQg dGhlIGltYWdlIGRpZmYgdG9vbCBpbiBhIHdheSB0aGF0IHdpbGwgd29yayBmcm9tIHBlcmwgdGhy ZWFkcy4KKyAgICAgICAgVGhpcyBpcyBhIHdvcmthcm91bmQgZHVlIHRvIGEgcGVybCBsaW1pdGF0 aW9uLiBXaGVuIHBlcmwgZG9lcyBvcGVuKiBjYWxscyBvbiBhIHRocmVhZCwgaXQgaWdub3Jlcwor ICAgICAgICB0aGUgZW52aXJvbm1lbnQgb2YgdGhlIGN1cnJlbnQgdGhyZWFkIGFuZCBzaW1wbHkg dXNlcyB0aGUgZW52aXJvbm1lbnQgb2YgdGhlIG1haW4gdGhyZWFkIGluc3RlYWQuCisKKyAgICAg ICAgKiBTY3JpcHRzL0V4ZWNBcHBXaXRoRW52LnBtOiBBZGRlZC4KKyAgICAgICAgKiBTY3JpcHRz L3J1bi13ZWJraXQtdGVzdHM6CisKIDIwMDktMDQtMDcgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBw bGUuY29tPgogCiAgICAgICAgIFByaW50IHRoZSBudW1iZXIgb2YgZmlsZXMgYmVpbmcgY29tcGls ZWQgd2hlbiB1c2luZyBwZGV2ZW52CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL0V4 ZWNBcHBXaXRoRW52LnBtIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9FeGVjQXBwV2l0aEVudi5wbQpu ZXcgZmlsZSBtb2RlIDEwMDc1NQppbmRleCAwMDAwMDAwLi44MzdjZDdmCi0tLSAvZGV2L251bGwK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9FeGVjQXBwV2l0aEVudi5wbQpAQCAtMCwwICsxLDYw IEBACisjIS91c3IvYmluL3BlcmwKKworIyBDb3B5cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3Vy Y2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyMg bWV0OgorIworIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRh aW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBp biBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyMgY29weXJpZ2h0IG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgor IyBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdp dGggdGhlCisjIGRpc3RyaWJ1dGlvbi4KKyMgICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29n bGUgSW5jLiBub3IgdGhlIG5hbWVzIG9mIGl0cworIyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQg dG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorIyB0aGlzIHNvZnR3 YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorIworIyBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJ QlVUT1JTCisjICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywg SU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMg T0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9T RSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05F UiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwKKyMgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMg KElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElU VVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsg T1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRI RU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJ TiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURW SVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKKyMgVGhpcyBzY3JpcHQg bGF1bmNoZXMgYSBwcm9ncmFtIHdpdGggYSBnaXZlbiBlbnZpcm9tZW50LgorIyBJdCBpcyBhIHdv cmthcm91bmQgZm9yIGEgcGVybCBidWcgdGhhdCBhcHBzIGxhdW5jaGVkIGZyb20gcGVybCB0aHJl YWRzCisjIHVzZSB0aGUgZW52aXJvbm1lbnQgb2YgdGhlIG1haW4gdGhyZWFkIGluc3RlYWQgb2Yg dGhlIGN1cnJlbnQgdGhyZWFkLgorCitzdWIgdW5lc2NhcGVFbnZWYXIoJCkKK3sKKyAgICBteSAo JGVudlZhcikgPSBAXzsKKworICAgICMgVW5lc2NhcGUgY2hhcmFjdGVyczogUmVwbGFjZSBALiB3 aXRoIC4KKyAgICAjCisgICAgIyBAIHdhcyBwaWNrZWQgdG8gYmUgdGhlIHNlcGFyYXRvciBiZWNh dXNlIGl0IHdhcworICAgICMgYSBmYWlybHkgbmV1dHJhbCBjaGFyYWN0ZXIgdW5saWtlIHwgb3Ig JiBvciBcLgorICAgICRlbnZWYXIgPX4gcy9cQCguKS8kMS9nOworICAgIHJldHVybiAkZW52VmFy OworfQorCitteSAoJHVuc3BsaXRFbnZWYXIsIEBhcHApID0gQEFSR1Y7CisKKyVFTlYgPSAoKTsK KworIyBTcGxpdCBvbiB1bmVzY2FwZWQgQAorbXkgQGVudlZhcnMgPSBzcGxpdCgvKD88IVxAKSg/ OlxAXEApKlxAKD8hXEApLywgJHVuc3BsaXRFbnZWYXIpOworZm9yIG15ICRlbnZWYXIgKEBlbnZW YXJzKSB7CisgICAgIyBTcGxpdCBvbiB1bmVzY2FwZWQgPQorICAgIG15ICgkdmFyaWFibGUsICR2 YWx1ZSkgPSBzcGxpdCgvKD88IVxAKSg/OlxAXEApKj0vLCAkZW52VmFyKTsKKyAgICAkRU5We3Vu ZXNjYXBlRW52VmFyKCR2YXJpYWJsZSl9ID0gdW5lc2NhcGVFbnZWYXIoJHZhbHVlKTsKK30KKwor ZXhlYyhAYXBwKTsKKwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0 LXRlc3RzIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCmluZGV4IGNhMWQ3 YzQuLjBjNmQ3NWYgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10 ZXN0cworKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMKQEAgLTQsNiAr NCw3IEBACiAjIENvcHlyaWdodCAoQykgMjAwNiBBbGV4ZXkgUHJvc2t1cnlha292IChhcEBueXBv cC5jb20pCiAjIENvcHlyaWdodCAoQykgMjAwNyBNYXR0IExpbGVrIChwZXd0ZXJtb29zZUBnbWFp bC5jb20pCiAjIENvcHlyaWdodCAoQykgMjAwNyBFcmljIFNlaWRlbCA8ZXJpY0B3ZWJraXQub3Jn PgorIyBDb3B5cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0 aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNjgsNiArNjksOSBAQCB1c2Ugd2Via2l0 ZGlyczsKIHVzZSBWQ1NVdGlsczsKIHVzZSBQT1NJWDsKIAorc3ViIGVzY2FwZUVudlZhcigkKTsK K3N1YiBsYXVuY2hXaXRoQ3VycmVudEVudihAKTsKK3N1YiBvcGVuRGlmZlRvb2woKTsKIHN1YiBv cGVuRHVtcFRvb2woKTsKIHN1YiBjbG9zZUR1bXBUb29sKCk7CiBzdWIgZHVtcFRvb2xEaWRDcmFz aCgpOwpAQCAtNDg0LDE3ICs0ODgsMTEgQEAgcHVzaCBAZGlmZlRvb2xBcmdzLCAiLS10b2xlcmFu Y2UiLCAkdG9sZXJhbmNlOwogCiAkfCA9IDE7CiAKLW15ICRpbWFnZURpZmZUb29sUElEOwotaWYg KCRwaXhlbFRlc3RzKSB7Ci0gICAgbG9jYWwgJUVOVjsKLSAgICAkRU5We01hbGxvY1N0YWNrTG9n Z2luZ30gPSAxIGlmICRzaG91bGRDaGVja0xlYWtzOwotICAgICRpbWFnZURpZmZUb29sUElEID0g b3BlbjIoXCpESUZGSU4sIFwqRElGRk9VVCwgJGltYWdlRGlmZlRvb2wsIEBkaWZmVG9vbEFyZ3Mp IG9yIGRpZSAidW5hYmxlIHRvIG9wZW4gJGltYWdlRGlmZlRvb2xcbiI7Ci0gICAgJEVOVntNYWxs b2NTdGFja0xvZ2dpbmd9ID0gMCBpZiAkc2hvdWxkQ2hlY2tMZWFrczsKLX0KLQogbXkgJGR1bXBU b29sUElEOwogbXkgJGlzRHVtcFRvb2xPcGVuID0gMDsKIG15ICRkdW1wVG9vbENyYXNoZWQgPSAw OworbXkgJGltYWdlRGlmZlRvb2xQSUQ7CitteSAkaXNEaWZmVG9vbE9wZW4gPSAwOwogCiBteSAk YXRMaW5lU3RhcnQgPSAxOwogbXkgJGxhc3REaXJlY3RvcnkgPSAiIjsKQEAgLTcwNSw2ICs3MDMs NyBAQCBmb3IgbXkgJHRlc3QgKEB0ZXN0cykgewogICAgICAgICAgICAgICAgIG9wZW4gRVhQRUNU RURQTkcsICIkZXhwZWN0ZWRQaXhlbERpci8kYmFzZS0kZXhwZWN0ZWRUYWcucG5nIjsKICAgICAg ICAgICAgICAgICByZWFkKEVYUEVDVEVEUE5HLCAkZXhwZWN0ZWRQTkcsICRleHBlY3RlZFBOR1Np emUpOwogCisgICAgICAgICAgICAgICAgb3BlbkRpZmZUb29sKCk7CiAgICAgICAgICAgICAgICAg cHJpbnQgRElGRk9VVCAiQ29udGVudC1MZW5ndGg6ICRhY3R1YWxQTkdTaXplXG4iOwogICAgICAg ICAgICAgICAgIHByaW50IERJRkZPVVQgJGFjdHVhbFBORzsKIApAQCAtOTMyLDcgKzkzMSw3IEBA IGNsb3NlSFRUUEQoKTsKICMgc3lzdGVtICJybSAvdG1wL0xheW91dFRlc3RzIjsKIAogIyBGSVhN RTogRG8gd2UgcmVhbGx5IHdhbnQgdG8gY2hlY2sgdGhlIGltYWdlLWNvbXBhcmlzb24gdG9vbCBm b3IgbGVha3MgZXZlcnkgdGltZT8KLWlmICgkc2hvdWxkQ2hlY2tMZWFrcyAmJiAkcGl4ZWxUZXN0 cykgeworaWYgKCRpc0RpZmZUb29sT3BlbiAmJiAkc2hvdWxkQ2hlY2tMZWFrcykgewogICAgICR0 b3RhbExlYWtzICs9IGNvdW50QW5kUHJpbnRMZWFrcygiSW1hZ2VEaWZmIiwgJGltYWdlRGlmZlRv b2xQSUQsICIkdGVzdFJlc3VsdHNEaXJlY3RvcnkvSW1hZ2VEaWZmLWxlYWtzLnR4dCIpOwogfQog CkBAIC0xMTk4LDExICsxMTk3LDQ5IEBAIHN1YiBzbG93ZXN0Y21wKCQkKQogICAgIHJldHVybiBw YXRoY21wKCR0ZXN0YSwgJHRlc3RiKTsKIH0KIAorc3ViIGVzY2FwZUVudlZhcigkKQoreworICAg IG15ICgkZW52VmFyKSA9IEBfOworCisgICAgIyBVc2UgQCB0byBlc2NhcGUgQCBhbmQgPS4KKyAg ICAjIEAgd2FzIHBpY2tlZCB0byBiZSB0aGUgc2VwYXJhdG9yIGJlY2F1c2UgaXQgd2FzCisgICAg IyBhIGZhaXJseSBuZXV0cmFsIGNoYXJhY3RlciB1bmxpa2UgfCBvciAmIG9yIFwuCisgICAgJGVu dlZhciA9fiBzLyhcQHw9KS9cQCQxL2c7CisgICAgcmV0dXJuICRlbnZWYXI7Cit9CisKK3N1YiBs YXVuY2hXaXRoQ3VycmVudEVudihAKQoreworICAgIG15IChAYXJncykgPSBAXzsKKworICAgIG15 ICRhbGxFbnZWYXJzID0gIiI7CisgICAgZm9yIG15ICR2YXIgKGtleXMgJUVOVikgeworICAgICAg ICAkYWxsRW52VmFycyAuPSAiQCIgaWYgJGFsbEVudlZhcnM7CisgICAgICAgICRhbGxFbnZWYXJz IC49IGVzY2FwZUVudlZhcigkdmFyKSAuICI9IiAuIGVzY2FwZUVudlZhcigkRU5WeyR2YXJ9KTsK KyAgICB9CisgICAgdW5zaGlmdCBAYXJncywgJGFsbEVudlZhcnM7CisgICAgbXkgJHJlbGF0aXZl U2NyaXB0c1BhdGggPSByZWxhdGl2ZVNjcmlwdHNEaXIoKTsKKyAgICB1bnNoaWZ0IEBhcmdzLCAi JHJlbGF0aXZlU2NyaXB0c1BhdGgvRXhlY0FwcFdpdGhFbnYucG0iOworICAgIHJldHVybiBAYXJn czsKK30KKworc3ViIG9wZW5EaWZmVG9vbCgpCit7CisgICAgcmV0dXJuIGlmICRpc0RpZmZUb29s T3BlbjsKKyAgICByZXR1cm4gaWYgISRwaXhlbFRlc3RzOworCisgICAgbG9jYWwgJUVOVjsKKyAg ICAkRU5We01hbGxvY1N0YWNrTG9nZ2luZ30gPSAxIGlmICRzaG91bGRDaGVja0xlYWtzOworICAg ICRpbWFnZURpZmZUb29sUElEID0gb3BlbjIoXCpESUZGSU4sIFwqRElGRk9VVCwgJGltYWdlRGlm ZlRvb2wsIGxhdW5jaFdpdGhDdXJyZW50RW52KEBkaWZmVG9vbEFyZ3MpKSBvciBkaWUgInVuYWJs ZSB0byBvcGVuICRpbWFnZURpZmZUb29sXG4iOworICAgICRFTlZ7TWFsbG9jU3RhY2tMb2dnaW5n fSA9IDAgaWYgJHNob3VsZENoZWNrTGVha3M7CisgICAgJGlzRGlmZlRvb2xPcGVuID0gMTsKK30K Kwogc3ViIG9wZW5EdW1wVG9vbCgpCiB7CiAgICAgcmV0dXJuIGlmICRpc0R1bXBUb29sT3BlbjsK IAotICAgICMgU2F2ZSBzb21lIHJlcXVpcmVzIHZhcmlhYmxlcyBmb3IgdGhlIGxpbnV4IGVudmly b25tZW50Li4uCisgICAgIyBTYXZlIGVudmlyb25tZW50IHZhcmlhYmxlcyByZXF1aXJlZCBmb3Ig dGhlIGxpbnV4IGVudmlyb25tZW50LgogICAgIG15ICRob21lRGlyID0gJEVOVnsnSE9NRSd9Owog ICAgIG15ICRsaWJyYXJ5UGF0aCA9ICRFTlZ7J0xEX0xJQlJBUllfUEFUSCd9OwogICAgIG15ICRk eWxkTGlicmFyeVBhdGggPSAkRU5WeydEWUxEX0xJQlJBUllfUEFUSCd9OwpAQCAtMTI1NSw3ICsx MjkyLDcgQEAgc3ViIG9wZW5EdW1wVG9vbCgpCiAgICAgfSAKICAgICAKICAgICAkRU5We01hbGxv Y1N0YWNrTG9nZ2luZ30gPSAxIGlmICRzaG91bGRDaGVja0xlYWtzOwotICAgICRkdW1wVG9vbFBJ RCA9IG9wZW4zKFwqT1VULCBcKklOLCBcKkVSUk9SLCBAYXJncykgb3IgZGllICJGYWlsZWQgdG8g c3RhcnQgdG9vbDogJGR1bXBUb29sXG4iOworICAgICRkdW1wVG9vbFBJRCA9IG9wZW4zKFwqT1VU LCBcKklOLCBcKkVSUk9SLCBsYXVuY2hXaXRoQ3VycmVudEVudihAYXJncykpIG9yIGRpZSAiRmFp bGVkIHRvIHN0YXJ0IHRvb2w6ICRkdW1wVG9vbFxuIjsKICAgICAkRU5We01hbGxvY1N0YWNrTG9n Z2luZ30gPSAwIGlmICRzaG91bGRDaGVja0xlYWtzOwogICAgICRpc0R1bXBUb29sT3BlbiA9IDE7 CiAgICAgJGR1bXBUb29sQ3Jhc2hlZCA9IDA7Cg== 29358 2009-04-08 22:20:27 -0700 2009-04-09 06:10:18 -0700 Proposed fix. bug25101.txt text/plain 6930 levin ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwODA4YzI2Li4wM2E3YzgyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDQt MDggIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yNTEwMQorCisgICAgICAgIExhdW5jaCBEdW1wUmVuZGVyVHJlZSBhbmQg dGhlIGltYWdlIGRpZmYgdG9vbCBpbiBhIHdheSB0aGF0IHdpbGwgd29yayBmcm9tIHBlcmwgdGhy ZWFkcy4KKyAgICAgICAgVGhpcyBpcyBhIHdvcmthcm91bmQgZHVlIHRvIGEgcGVybCBsaW1pdGF0 aW9uLiBXaGVuIHBlcmwgZG9lcyBvcGVuKiBjYWxscyBvbiBhIHRocmVhZCwgaXQgaWdub3Jlcwor ICAgICAgICB0aGUgZW52aXJvbm1lbnQgb2YgdGhlIGN1cnJlbnQgdGhyZWFkIGFuZCBzaW1wbHkg dXNlcyB0aGUgZW52aXJvbm1lbnQgb2YgdGhlIG1haW4gdGhyZWFkIGluc3RlYWQuCisKKyAgICAg ICAgKiBTY3JpcHRzL2V4ZWNBcHBXaXRoRW52LnBtOiBBZGRlZC4KKyAgICAgICAgKiBTY3JpcHRz L3J1bi13ZWJraXQtdGVzdHM6CisKIDIwMDktMDQtMDcgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBw bGUuY29tPgogCiAgICAgICAgIFByaW50IHRoZSBudW1iZXIgb2YgZmlsZXMgYmVpbmcgY29tcGls ZWQgd2hlbiB1c2luZyBwZGV2ZW52CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL2V4 ZWNBcHBXaXRoRW52IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9leGVjQXBwV2l0aEVudgpuZXcgZmls ZSBtb2RlIDEwMDc1NQppbmRleCAwMDAwMDAwLi5kMTg1ZTJmCi0tLSAvZGV2L251bGwKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy9leGVjQXBwV2l0aEVudgpAQCAtMCwwICsxLDM4IEBACisjIS91 c3IvYmluL3BlcmwKKworIyBDb3B5cmlnaHQgKEMpIDIwMDkgR29vZ2xlIEluYy4gQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKKyMgbWV0OgorIwor IyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFi b3ZlIGNvcHlyaWdodAorIyBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIuCisjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkg Zm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgorIyBpbiB0aGUg ZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisj IGRpc3RyaWJ1dGlvbi4KKyMgICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBu b3IgdGhlIG5hbWVzIG9mIGl0cworIyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3Jz ZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdpdGhv dXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorIworIyBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisj ICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5H LCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hB TlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorIyBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElT Q0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorIyBPV05FUiBPUiBDT05U UklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwK KyMgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElO RywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RT IE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyMgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5F U1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisjIFRIRU9SWSBPRiBM SUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQK KyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZ IE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKKyMgVGhpcyBzY3JpcHQgbGF1bmNoZXMg YSBwcm9ncmFtIHdpdGggYSBnaXZlbiBlbnZpcm9tZW50LgorIyBJdCBpcyBhIHdvcmthcm91bmQg Zm9yIGEgcGVybCBidWcgdGhhdCBhcHBzIGxhdW5jaGVkIGZyb20gcGVybCB0aHJlYWRzCisjIHVz ZSB0aGUgZW52aXJvbm1lbnQgb2YgdGhlIG1haW4gdGhyZWFkIGluc3RlYWQgb2YgdGhlIGN1cnJl bnQgdGhyZWFkLgorCitteSAoJHVuc3BsaXRFbnZWYXIsIEBhcHApID0gQEFSR1Y7CisjIFRoZSBm aXJzdCBhcmd1bWVudCB0byB0aGlzIHNjcmlwdCBzaG91bGQgYmUgcGVybCBjb2RlIChpbiBxdW90 ZXMpIHRoYXQgc2V0cyB0aGUgZW52aXJvbm1lbnQuCitldmFsIHN1YnN0cigkdW5zcGxpdEVudlZh ciwgMSwgLTEpOworZXhlYyhAYXBwKTsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMv cnVuLXdlYmtpdC10ZXN0cyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwpp bmRleCBjYTFkN2M0Li41ZjViM2QwIDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3J1 bi13ZWJraXQtdGVzdHMKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3Rz CkBAIC00LDYgKzQsNyBAQAogIyBDb3B5cmlnaHQgKEMpIDIwMDYgQWxleGV5IFByb3NrdXJ5YWtv diAoYXBAbnlwb3AuY29tKQogIyBDb3B5cmlnaHQgKEMpIDIwMDcgTWF0dCBMaWxlayAocGV3dGVy bW9vc2VAZ21haWwuY29tKQogIyBDb3B5cmlnaHQgKEMpIDIwMDcgRXJpYyBTZWlkZWwgPGVyaWNA d2Via2l0Lm9yZz4KKyMgQ29weXJpZ2h0IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTQ4LDYgKzQ5LDcgQEAg dXNlIHN0cmljdDsKIHVzZSB3YXJuaW5nczsKIAogdXNlIEN3ZDsKK3VzZSBEYXRhOjpEdW1wZXI7 CiB1c2UgRmNudGwgcXcoRl9HRVRGTCBGX1NFVEZMIE9fTk9OQkxPQ0spOwogdXNlIEZpbGU6OkJh c2VuYW1lOwogdXNlIEZpbGU6OkNvcHk7CkBAIC02OCw2ICs3MCw4IEBAIHVzZSB3ZWJraXRkaXJz OwogdXNlIFZDU1V0aWxzOwogdXNlIFBPU0lYOwogCitzdWIgbGF1bmNoV2l0aEN1cnJlbnRFbnYo QCk7CitzdWIgb3BlbkRpZmZUb29sKCk7CiBzdWIgb3BlbkR1bXBUb29sKCk7CiBzdWIgY2xvc2VE dW1wVG9vbCgpOwogc3ViIGR1bXBUb29sRGlkQ3Jhc2goKTsKQEAgLTQ4NCwxNyArNDg4LDExIEBA IHB1c2ggQGRpZmZUb29sQXJncywgIi0tdG9sZXJhbmNlIiwgJHRvbGVyYW5jZTsKIAogJHwgPSAx OwogCi1teSAkaW1hZ2VEaWZmVG9vbFBJRDsKLWlmICgkcGl4ZWxUZXN0cykgewotICAgIGxvY2Fs ICVFTlY7Ci0gICAgJEVOVntNYWxsb2NTdGFja0xvZ2dpbmd9ID0gMSBpZiAkc2hvdWxkQ2hlY2tM ZWFrczsKLSAgICAkaW1hZ2VEaWZmVG9vbFBJRCA9IG9wZW4yKFwqRElGRklOLCBcKkRJRkZPVVQs ICRpbWFnZURpZmZUb29sLCBAZGlmZlRvb2xBcmdzKSBvciBkaWUgInVuYWJsZSB0byBvcGVuICRp bWFnZURpZmZUb29sXG4iOwotICAgICRFTlZ7TWFsbG9jU3RhY2tMb2dnaW5nfSA9IDAgaWYgJHNo b3VsZENoZWNrTGVha3M7Ci19Ci0KIG15ICRkdW1wVG9vbFBJRDsKIG15ICRpc0R1bXBUb29sT3Bl biA9IDA7CiBteSAkZHVtcFRvb2xDcmFzaGVkID0gMDsKK215ICRpbWFnZURpZmZUb29sUElEOwor bXkgJGlzRGlmZlRvb2xPcGVuID0gMDsKIAogbXkgJGF0TGluZVN0YXJ0ID0gMTsKIG15ICRsYXN0 RGlyZWN0b3J5ID0gIiI7CkBAIC03MDUsNiArNzAzLDcgQEAgZm9yIG15ICR0ZXN0IChAdGVzdHMp IHsKICAgICAgICAgICAgICAgICBvcGVuIEVYUEVDVEVEUE5HLCAiJGV4cGVjdGVkUGl4ZWxEaXIv JGJhc2UtJGV4cGVjdGVkVGFnLnBuZyI7CiAgICAgICAgICAgICAgICAgcmVhZChFWFBFQ1RFRFBO RywgJGV4cGVjdGVkUE5HLCAkZXhwZWN0ZWRQTkdTaXplKTsKIAorICAgICAgICAgICAgICAgIG9w ZW5EaWZmVG9vbCgpOwogICAgICAgICAgICAgICAgIHByaW50IERJRkZPVVQgIkNvbnRlbnQtTGVu Z3RoOiAkYWN0dWFsUE5HU2l6ZVxuIjsKICAgICAgICAgICAgICAgICBwcmludCBESUZGT1VUICRh Y3R1YWxQTkc7CiAKQEAgLTkzMiw3ICs5MzEsNyBAQCBjbG9zZUhUVFBEKCk7CiAjIHN5c3RlbSAi cm0gL3RtcC9MYXlvdXRUZXN0cyI7CiAKICMgRklYTUU6IERvIHdlIHJlYWxseSB3YW50IHRvIGNo ZWNrIHRoZSBpbWFnZS1jb21wYXJpc29uIHRvb2wgZm9yIGxlYWtzIGV2ZXJ5IHRpbWU/Ci1pZiAo JHNob3VsZENoZWNrTGVha3MgJiYgJHBpeGVsVGVzdHMpIHsKK2lmICgkaXNEaWZmVG9vbE9wZW4g JiYgJHNob3VsZENoZWNrTGVha3MpIHsKICAgICAkdG90YWxMZWFrcyArPSBjb3VudEFuZFByaW50 TGVha3MoIkltYWdlRGlmZiIsICRpbWFnZURpZmZUb29sUElELCAiJHRlc3RSZXN1bHRzRGlyZWN0 b3J5L0ltYWdlRGlmZi1sZWFrcy50eHQiKTsKIH0KIApAQCAtMTE5OCwxMSArMTE5NywzOSBAQCBz dWIgc2xvd2VzdGNtcCgkJCkKICAgICByZXR1cm4gcGF0aGNtcCgkdGVzdGEsICR0ZXN0Yik7CiB9 CiAKK3N1YiBsYXVuY2hXaXRoQ3VycmVudEVudihAKQoreworICAgIG15IChAYXJncykgPSBAXzsK KworICAgICMgRHVtcCB0aGUgY3VycmVudCBlbnZpcm9ubWVudCBhcyBwZXJsIGNvZGUgYW5kIHRo ZW4gcHV0IGl0IGluIHF1b3RlcyBzbyBpdCBpcyBvbmUgcGFyYW1ldGVyLgorICAgIG15ICRlbnZp cm9ubWVudER1bXBlciA9IERhdGE6OkR1bXBlci0+bmV3KFtcJUVOVl0sIFtxdygqRU5WKV0pOwor ICAgICRlbnZpcm9ubWVudER1bXBlci0+SW5kZW50KDApOworICAgICRlbnZpcm9ubWVudER1bXBl ci0+UHVyaXR5KDEpOworICAgIG15ICRhbGxFbnZWYXJzID0gJGVudmlyb25tZW50RHVtcGVyLT5E dW1wKCk7CisgICAgdW5zaGlmdCBAYXJncywgIlwiJGFsbEVudlZhcnNcIiI7CisKKyAgICBteSAk cmVsYXRpdmVTY3JpcHRzUGF0aCA9IHJlbGF0aXZlU2NyaXB0c0RpcigpOworICAgIHVuc2hpZnQg QGFyZ3MsICIkcmVsYXRpdmVTY3JpcHRzUGF0aC9leGVjQXBwV2l0aEVudiI7CisgICAgcmV0dXJu IEBhcmdzOworfQorCitzdWIgb3BlbkRpZmZUb29sKCkKK3sKKyAgICByZXR1cm4gaWYgJGlzRGlm ZlRvb2xPcGVuOworICAgIHJldHVybiBpZiAhJHBpeGVsVGVzdHM7CisKKyAgICBsb2NhbCAlRU5W OworICAgICRFTlZ7TWFsbG9jU3RhY2tMb2dnaW5nfSA9IDEgaWYgJHNob3VsZENoZWNrTGVha3M7 CisgICAgJGltYWdlRGlmZlRvb2xQSUQgPSBvcGVuMihcKkRJRkZJTiwgXCpESUZGT1VULCAkaW1h Z2VEaWZmVG9vbCwgbGF1bmNoV2l0aEN1cnJlbnRFbnYoQGRpZmZUb29sQXJncykpIG9yIGRpZSAi dW5hYmxlIHRvIG9wZW4gJGltYWdlRGlmZlRvb2xcbiI7CisgICAgJEVOVntNYWxsb2NTdGFja0xv Z2dpbmd9ID0gMCBpZiAkc2hvdWxkQ2hlY2tMZWFrczsKKyAgICAkaXNEaWZmVG9vbE9wZW4gPSAx OworfQorCiBzdWIgb3BlbkR1bXBUb29sKCkKIHsKICAgICByZXR1cm4gaWYgJGlzRHVtcFRvb2xP cGVuOwogCi0gICAgIyBTYXZlIHNvbWUgcmVxdWlyZXMgdmFyaWFibGVzIGZvciB0aGUgbGludXgg ZW52aXJvbm1lbnQuLi4KKyAgICAjIFNhdmUgZW52aXJvbm1lbnQgdmFyaWFibGVzIHJlcXVpcmVk IGZvciB0aGUgbGludXggZW52aXJvbm1lbnQuCiAgICAgbXkgJGhvbWVEaXIgPSAkRU5WeydIT01F J307CiAgICAgbXkgJGxpYnJhcnlQYXRoID0gJEVOVnsnTERfTElCUkFSWV9QQVRIJ307CiAgICAg bXkgJGR5bGRMaWJyYXJ5UGF0aCA9ICRFTlZ7J0RZTERfTElCUkFSWV9QQVRIJ307CkBAIC0xMjU1 LDcgKzEyODIsNyBAQCBzdWIgb3BlbkR1bXBUb29sKCkKICAgICB9IAogICAgIAogICAgICRFTlZ7 TWFsbG9jU3RhY2tMb2dnaW5nfSA9IDEgaWYgJHNob3VsZENoZWNrTGVha3M7Ci0gICAgJGR1bXBU b29sUElEID0gb3BlbjMoXCpPVVQsIFwqSU4sIFwqRVJST1IsIEBhcmdzKSBvciBkaWUgIkZhaWxl ZCB0byBzdGFydCB0b29sOiAkZHVtcFRvb2xcbiI7CisgICAgJGR1bXBUb29sUElEID0gb3BlbjMo XCpPVVQsIFwqSU4sIFwqRVJST1IsIGxhdW5jaFdpdGhDdXJyZW50RW52KEBhcmdzKSkgb3IgZGll ICJGYWlsZWQgdG8gc3RhcnQgdG9vbDogJGR1bXBUb29sXG4iOwogICAgICRFTlZ7TWFsbG9jU3Rh Y2tMb2dnaW5nfSA9IDAgaWYgJHNob3VsZENoZWNrTGVha3M7CiAgICAgJGlzRHVtcFRvb2xPcGVu ID0gMTsKICAgICAkZHVtcFRvb2xDcmFzaGVkID0gMDsK