104298 2012-12-06 14:04:05 -0800 change --no-launch-safari to --no-show-results in scripts 2012-12-10 18:01:30 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 104601 104299 104301 1 dpranke dpranke abarth dbates eric lforschler ojan ossy webkit.review.bot wsiegrist oldest_to_newest 785241 0 dpranke 2012-12-06 14:04:05 -0800 change --no-launch-safari to --no-show-results in scripts 785243 1 178078 dpranke 2012-12-06 14:06:30 -0800 Created attachment 178078 Patch 785332 2 178078 eric 2012-12-06 15:25:35 -0800 Comment on attachment 178078 Patch Looks reasonable. 785687 3 178078 dbates 2012-12-07 00:00:26 -0800 Comment on attachment 178078 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=178078&action=review > Tools/ChangeLog:13 > + for ORWT (I didn't modify ORWT itself because making the arg parsing > + work turned out to be pretty awkward). (*) Can you elaborate on the awkwardness? > Tools/Scripts/run-webkit-tests:102 > + if (grep(/--no-show-results/, @ARGV)) { > + push(@ARGV, "--no-launch-safari"); > + @ARGV = grep { $_ ne "--no-show-results" } @ARGV; > + } Assuming we take the approach of substituting --[no-]launch-safari for --[no-]show-results (see my question (*) above), I suggest that we take advantage of the convenience function webkitdirs::checkForArgumentAndRemoveFromARGV() instead of implementing similar functionality. As its name implies, webkitdirs::checkForArgumentAndRemoveFromARGV() checks for the presence of the specified command line argument and removes it if present. The function returns true if the argument was in the list of command line arguments; otherwise, it returns false. Simplifying this code using webkitdirs::checkForArgumentAndRemoveFromARGV(), we have: push(@ARGV, "--no-launch-safari") if checkForArgumentAndRemoveFromARGV("--no-show-results"); > Tools/Scripts/run-webkit-tests:106 > + if (grep(/--show-results/, @ARGV)) { > + push(@ARGV, "--launch-safari"); > + @ARGV = grep { $_ ne "--show-results" } @ARGV; > + } Assuming we take the approach of substituting --[no-]-launch-safari for --[no-]show-results (see my question (*) above), we can similarly write this using webkitdirs::checkForArgumentAndRemoveFromARGV() as: push(@ARGV, "--launch-safari") if checkForArgumentAndRemoveFromARGV("--show-results"); 785911 4 dpranke 2012-12-07 09:01:21 -0800 (In reply to comment #3) > (From update of attachment 178078 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=178078&action=review > > > Tools/ChangeLog:13 > > + for ORWT (I didn't modify ORWT itself because making the arg parsing > > + work turned out to be pretty awkward). > > (*) Can you elaborate on the awkwardness? > I wasn't sure if you meant here or in the ChangeLog, but when I initially looked at the perl arg-parsing code I didn't see a way to easily make one option an alias for another, and since we displayed the default values for --launch-safari as well it looked like it was going to take a bunch of searching-and-replacing in multiple locations to make things work. However, I just re-checked the Getopt::Long perldoc and it looks like you can define a custom subroutine to make the args aliases, so I'll try that and if it works push all of this down into old-run-webkit-tests so we don't need to do the substitution any more. Failing all that, your suggestion below sounds fine. > > Tools/Scripts/run-webkit-tests:102 > > + if (grep(/--no-show-results/, @ARGV)) { > > + push(@ARGV, "--no-launch-safari"); > > + @ARGV = grep { $_ ne "--no-show-results" } @ARGV; > > + } > > Assuming we take the approach of substituting --[no-]launch-safari for --[no-]show-results (see my question (*) above), I suggest that we take advantage of the convenience function webkitdirs::checkForArgumentAndRemoveFromARGV() instead of implementing similar functionality. As its name implies, webkitdirs::checkForArgumentAndRemoveFromARGV() checks for the presence of the specified command line argument and removes it if present. The function returns true if the argument was in the list of command line arguments; otherwise, it returns false. Simplifying this code using webkitdirs::checkForArgumentAndRemoveFromARGV(), we have: > > push(@ARGV, "--no-launch-safari") if checkForArgumentAndRemoveFromARGV("--no-show-results"); > > > Tools/Scripts/run-webkit-tests:106 > > + if (grep(/--show-results/, @ARGV)) { > > + push(@ARGV, "--launch-safari"); > > + @ARGV = grep { $_ ne "--show-results" } @ARGV; > > + } > > Assuming we take the approach of substituting --[no-]-launch-safari for --[no-]show-results (see my question (*) above), we can similarly write this using webkitdirs::checkForArgumentAndRemoveFromARGV() as: > > push(@ARGV, "--launch-safari") if checkForArgumentAndRemoveFromARGV("--show-results"); 787756 5 178643 dpranke 2012-12-10 15:17:43 -0800 Created attachment 178643 rework to just pass --no-show-results to ORWT 787761 6 dpranke 2012-12-10 15:19:43 -0800 new patch, much simpler ... 787773 7 178643 eric 2012-12-10 15:28:37 -0800 Comment on attachment 178643 rework to just pass --no-show-results to ORWT OK. 787909 8 178643 webkit.review.bot 2012-12-10 18:01:25 -0800 Comment on attachment 178643 rework to just pass --no-show-results to ORWT Clearing flags on attachment: 178643 Committed r137237: <http://trac.webkit.org/changeset/137237> 787910 9 webkit.review.bot 2012-12-10 18:01:30 -0800 All reviewed patches have been landed. Closing bug. 178078 2012-12-06 14:06:30 -0800 2012-12-10 15:17:40 -0800 Patch bug-104298-20121206140359.patch text/plain 7441 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2ODc0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzZiNTI2N2UyMzJmNWU2NWM2Yzg5OWZjNzM4ZTUxYzFj YWY4YTRmNS4uNDNlMzdmZTFjMjEyM2M5ZTVhYWI3NzRkYTk0ZTQ3ZTkyMGUyYjc3ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTEyLTA2ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIGNoYW5nZSAtLW5vLWxhdW5jaC1zYWZhcmkgdG8gLS1uby1zaG93LXJlc3VsdHMgaW4g c2NyaXB0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTA0Mjk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U2luY2UgU2FmYXJpIG9ubHkgZXhpc3RzIG9uIHRoZSBBcHBsZSBwb3J0cywgTlJXVCBjYWxscyB0 aGUKKyAgICAgICAgY29tbWFuZCBsaW5lIGZsYWcgLS1bbm8tXXNob3ctcmVzdWx0cyBpbnN0ZWFk LiBUaGlzIHVwZGF0ZXMKKyAgICAgICAgdGhlIHNjcmlwdHMgdG8gdXNlIHRoZSBuZXcgZmxhZyAo YnV0IG5vdCB0aGUgYnVpbGRib3QgY29uZmlnIHlldCkKKyAgICAgICAgYW5kIHByb3ZpZGVzIGEg YmFja3dhcmRzLWNvbXBhdGliaWxpdHkgc2hpbSBpbiBydW4td2Via2l0LXRlc3RzCisgICAgICAg IGZvciBPUldUIChJIGRpZG4ndCBtb2RpZnkgT1JXVCBpdHNlbGYgYmVjYXVzZSBtYWtpbmcgdGhl IGFyZyBwYXJzaW5nCisgICAgICAgIHdvcmsgdHVybmVkIG91dCB0byBiZSBwcmV0dHkgYXdrd2Fy ZCkuCisKKyAgICAgICAgKiBTY3JpcHRzL2dlbmVyYXRlLWNvdmVyYWdlLWRhdGE6CisgICAgICAg ICogU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0LXRv b2xzLWNvbXBsZXRpb24uc2g6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBz L3J1bnRlc3RzLnB5OgorICAgICAgICAoUnVuVGVzdHMucnVuKToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc3RlcHMvcnVudGVzdHNfdW5pdHRlc3QucHk6CisKIDIwMTItMTItMDYg IE1heCBWdWpvdmljICA8bXZ1am92aWNAYWRvYmUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQu IEFkZCBteXNlbGYgdG8gY29tbWl0dGVycy5weS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv Z2VuZXJhdGUtY292ZXJhZ2UtZGF0YSBiL1Rvb2xzL1NjcmlwdHMvZ2VuZXJhdGUtY292ZXJhZ2Ut ZGF0YQppbmRleCBkMDZlZTk5ZGRkNjhkZTk2Y2U4OGJiM2M3MjJhZjhkYTk5M2YzMWRkLi45MzY1 OTMyMDNlMWExMjYxODdhNzQ0NzBkM2EwMGI1NzgxNmU3ODA2IDEwMDc1NQotLS0gYS9Ub29scy9T Y3JpcHRzL2dlbmVyYXRlLWNvdmVyYWdlLWRhdGEKKysrIGIvVG9vbHMvU2NyaXB0cy9nZW5lcmF0 ZS1jb3ZlcmFnZS1kYXRhCkBAIC02MCw3ICs2MCw3IEBAIHN5c3RlbSgiaWYgWyAtZCBXZWJLaXRC dWlsZCBdOyB0aGVuIGZpbmQgV2ViS2l0QnVpbGQgLW5hbWUgJyouZ2NkYScgLWRlbGV0ZTsgZmk7 CiAKIHByaW50ICJCdWlsZGluZyBhbmQgdGVzdGluZ1xuIjsKIHN5c3RlbSgiVG9vbHMvU2NyaXB0 cy9idWlsZC13ZWJraXQiLCAiLS1jb3ZlcmFnZSIsIEBBUkdWKSA9PSAwIG9yIGRpZTsKLXN5c3Rl bSAiVG9vbHMvU2NyaXB0cy9uZXctcnVuLXdlYmtpdC10ZXN0cyIsICItLW5vLWxhdW5jaC1zYWZh cmkiOworc3lzdGVtICJUb29scy9TY3JpcHRzL25ldy1ydW4td2Via2l0LXRlc3RzIiwgIi0tbm8t c2hvdy1yZXN1bHRzIjsKIHN5c3RlbSAiVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUt dGVzdHMiLCAiLS1jb3ZlcmFnZSIsIEBBUkdWOwogCiAjIENvbGxlY3QgdGhlIGRhdGEgYW5kIGdl bmVyYXRlIGEgcmVwb3J0CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVz dHMgYi9Ub29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMKaW5kZXggNGJiOGYzOTQ0ODQ2OWVk NDdlNWU3ZDI0ZGUyNjg3YTJmNWUzNzZkNS4uZjNhZTU5YjZkYmM1MDg1ZGZkMzc1ZTYzNTNlOWFl YjA3ZTAxNzI3NiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCisr KyBiL1Rvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwpAQCAtOTUsNiArOTUsMTUgQEAgaWYg KHVzZU5ld1J1bldlYktpdFRlc3RzKCkpIHsKICAgICBpZiAocnVubmluZ09uQnVpbGRCb3QoKSkg ewogICAgICAgICBwdXNoKEBBUkdWLCAiLS1kZWJ1Zy1yd3QtbG9nZ2luZyIpOwogICAgIH0KK30g ZWxzZSB7CisgICAgaWYgKGdyZXAoLy0tbm8tc2hvdy1yZXN1bHRzLywgQEFSR1YpKSB7CisgICAg ICAgIHB1c2goQEFSR1YsICItLW5vLWxhdW5jaC1zYWZhcmkiKTsKKyAgICAgICAgQEFSR1YgPSBn cmVwIHsgJF8gbmUgIi0tbm8tc2hvdy1yZXN1bHRzIiB9IEBBUkdWOworICAgIH0KKyAgICBpZiAo Z3JlcCgvLS1zaG93LXJlc3VsdHMvLCBAQVJHVikpIHsKKyAgICAgICAgcHVzaChAQVJHViwgIi0t bGF1bmNoLXNhZmFyaSIpOworICAgICAgICBAQVJHViA9IGdyZXAgeyAkXyBuZSAiLS1zaG93LXJl c3VsdHMiIH0gQEFSR1Y7CisgICAgfQogfQogCiAjIHdlYmtpdGRpcnMucG0gc3RyaXBzIC0tcXQg YW5kIC0tZ3RrIGZyb20gQEFSR1Ygd2hlbiB3ZSBjYWxsIGlzUXQvaXNHdGsuCmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdC10b29scy1jb21wbGV0aW9uLnNoIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXQtdG9vbHMtY29tcGxldGlvbi5zaAppbmRleCBkODNhNWE2Y2UyNWRmYjY4N2ZjY2Zi YWE3OWFiOThiOGE4MWFhNzU1Li5hNTdhMWFiYTViYzIzMWQ0NmQ0MjYyYmU4NGY5NDcyOTdhMmRl NTY0IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdC10b29scy1jb21wbGV0aW9uLnNo CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0LXRvb2xzLWNvbXBsZXRpb24uc2gKQEAgLTExMSw0 ICsxMTEsNCBAQCBjb21wbGV0ZSAtRiBfd2Via2l0LXBhdGNoX2NvbXBsZXRlIHdlYmtpdC1wYXRj aAogY29tcGxldGUgLW8gZGVmYXVsdCAtVyAiLS1jb250aW51ZSAtLWZpeC1tZXJnZWQgLS1oZWxw IC0tbm8tY29udGludWUgLS1uby13YXJuaW5ncyAtLXdhcm5pbmdzIC1jIC1mIC1oIC13IiByZXNv bHZlLUNoYW5nZUxvZ3MKIGNvbXBsZXRlIC1vIGRlZmF1bHQgLVcgIi0tYnVnIC0tZGlmZiAtLWdp dC1jb21taXQgLS1naXQtaW5kZXggLS1naXQtcmV2aWV3ZXIgLS1oZWxwIC0tbm8tdXBkYXRlIC0t bm8td3JpdGUgLS1vcGVuIC0tdXBkYXRlIC0td3JpdGUgLWQgLWggLW8iIHByZXBhcmUtQ2hhbmdl TG9nCiBjb21wbGV0ZSAtVyAiLS1jbGVhbiAtLWRlYnVnIC0taGVscCAtaCIgYnVpbGQtd2Via2l0 Ci1jb21wbGV0ZSAtbyBkZWZhdWx0IC1XICItLWFkZC1wbGF0Zm9ybS1leGNlcHRpb25zIC0tY29t cGxleC10ZXh0IC0tY29uZmlndXJhdGlvbiAtLWd1YXJkLW1hbGxvYyAtLWhlbHAgLS1odHRwIC0t aWdub3JlLXRlc3RzIC0tbGF1bmNoLXNhZmFyaSAtLWxlYWtzIC0tbWVyZ2UtbGVhay1kZXB0aCAt LW5ldy10ZXN0LXJlc3VsdHMgLS1uby1odHRwIC0tbm8tbGF1bmNoLXNhZmFyaSAtLW5vLW5ldy10 ZXN0LXJlc3VsdHMgLS1uby1zYW1wbGUtb24tdGltZW91dCAtLW5vLXN0cmlwLWVkaXRpbmctY2Fs bGJhY2tzIC0tcGl4ZWwtdGVzdHMgLS1wbGF0Zm9ybSAtLXBvcnQgLS1xdWlldCAtLXJhbmRvbSAt LXJlc2V0LXJlc3VsdHMgLS1yZXN1bHRzLWRpcmVjdG9yeSAtLXJldmVyc2UgLS1yb290IC0tc2Ft cGxlLW9uLXRpbWVvdXQgLS1zaW5nbHkgLS1za2lwcGVkIC0tc2xvd2VzdCAtLXN0cmljdCAtLXN0 cmlwLWVkaXRpbmctY2FsbGJhY2tzIC0tdGhyZWFkZWQgLS10aW1lb3V0IC0tdG9sZXJhbmNlIC0t dXNlLXJlbW90ZS1saW5rcy10by10ZXN0cyAtLXZhbGdyaW5kIC0tdmVyYm9zZSAtMSAtYyAtZyAt aCAtaSAtbCAtbSAtbyAtcCAtcSAtdCAtdiIgcnVuLXdlYmtpdC10ZXN0cworY29tcGxldGUgLW8g ZGVmYXVsdCAtVyAiLS1hZGQtcGxhdGZvcm0tZXhjZXB0aW9ucyAtLWNvbXBsZXgtdGV4dCAtLWNv bmZpZ3VyYXRpb24gLS1ndWFyZC1tYWxsb2MgLS1oZWxwIC0taHR0cCAtLWlnbm9yZS10ZXN0cyAt LWxhdW5jaC1zYWZhcmkgLS1sZWFrcyAtLW1lcmdlLWxlYWstZGVwdGggLS1uZXctdGVzdC1yZXN1 bHRzIC0tbm8taHR0cCAtLW5vLXNob3ctcmVzdWx0cyAtLW5vLW5ldy10ZXN0LXJlc3VsdHMgLS1u by1zYW1wbGUtb24tdGltZW91dCAtLW5vLXN0cmlwLWVkaXRpbmctY2FsbGJhY2tzIC0tcGl4ZWwt dGVzdHMgLS1wbGF0Zm9ybSAtLXBvcnQgLS1xdWlldCAtLXJhbmRvbSAtLXJlc2V0LXJlc3VsdHMg LS1yZXN1bHRzLWRpcmVjdG9yeSAtLXJldmVyc2UgLS1yb290IC0tc2FtcGxlLW9uLXRpbWVvdXQg LS1zaW5nbHkgLS1za2lwcGVkIC0tc2xvd2VzdCAtLXN0cmljdCAtLXN0cmlwLWVkaXRpbmctY2Fs bGJhY2tzIC0tdGhyZWFkZWQgLS10aW1lb3V0IC0tdG9sZXJhbmNlIC0tdXNlLXJlbW90ZS1saW5r cy10by10ZXN0cyAtLXZhbGdyaW5kIC0tdmVyYm9zZSAtMSAtYyAtZyAtaCAtaSAtbCAtbSAtbyAt cCAtcSAtdCAtdiIgcnVuLXdlYmtpdC10ZXN0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL3N0ZXBzL3J1bnRlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL3N0ZXBzL3J1bnRlc3RzLnB5CmluZGV4IDZkYzkwZjkyYzc5NTc3MmIzMzk3YWE3YzE3ZGE2 OTI4MTBiMDhjZWQuLjBiZWY5ZjdlZjU0MDZjZGFiMDkzYzQ2NzdhMGMzODZjZDk2OTk5ZTcgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9ydW50ZXN0cy5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcnVudGVzdHMucHkKQEAgLTEs OSArMSw5IEBACiAjIENvcHlyaWdodCAoQykgMjAxMCBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgotIyAKKyMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKICMgbWV0OgotIyAK KyMKICMgICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKICMgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgogIyAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmlu YXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCkBAIC0xMyw3ICsxMyw3IEBACiAjICAg ICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4gbm9yIHRoZSBuYW1lcyBvZiBpdHMK ICMgY29udHJpYnV0b3JzIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0 cyBkZXJpdmVkIGZyb20KICMgdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdy aXR0ZW4gcGVybWlzc2lvbi4KLSMgCisjCiAjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkg VEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKICMgIkFTIElTIiBBTkQgQU5Z IEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKICMgTElN SVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ VE5FU1MgRk9SCkBAIC04NCw3ICs4NCw3IEBAIGNsYXNzIFJ1blRlc3RzKEFic3RyYWN0U3RlcCk6 CiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMubm9uX2ludGVyYWN0aXZlOgogICAgICAgICAgICAg YXJncy5leHRlbmQoWwogICAgICAgICAgICAgICAgICItLW5vLW5ldy10ZXN0LXJlc3VsdHMiLAot ICAgICAgICAgICAgICAgICItLW5vLWxhdW5jaC1zYWZhcmkiLAorICAgICAgICAgICAgICAgICIt LW5vLXNob3ctcmVzdWx0cyIsCiAgICAgICAgICAgICAgICAgIi0tc2tpcC1mYWlsaW5nLXRlc3Rz IiwKICAgICAgICAgICAgICAgICAiLS1leGl0LWFmdGVyLW4tZmFpbHVyZXM9JXMiICUgc2VsZi5O T05fSU5URVJBQ1RJVkVfRkFJTFVSRV9MSU1JVF9DT1VOVCwKICAgICAgICAgICAgICAgICAiLS1y ZXN1bHRzLWRpcmVjdG9yeT0lcyIgJSBzZWxmLl90b29sLnBvcnQoKS5yZXN1bHRzX2RpcmVjdG9y eSwKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9ydW50ZXN0 c191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9ydW50ZXN0 c191bml0dGVzdC5weQppbmRleCA3OGE4NjdiMzZiMDllOGU3Mjc1NjIwYWEyM2MzZGU5ODIxN2Q2 Yzg2Li4yNTA2YzYxYTQ0NWNmOWM2ZjMxN2QxNWE3OGM4YWJkYWRhZjFiYTg0IDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcnVudGVzdHNfdW5pdHRlc3QucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3J1bnRlc3RzX3VuaXR0ZXN0 LnB5CkBAIC00MSw2ICs0MSw2IEBAIGNsYXNzIFJ1blRlc3RzVGVzdCh1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAgICAgICAgIGV4cGVjdGVkX2xvZ3MgPSAiIiJSdW5uaW5nIFdlYktpdCB1bml0IHRlc3Rz CiBNT0NLIHJ1bl9hbmRfdGhyb3dfaWZfZmFpbDogWydtb2NrLXJ1bi13ZWJraXQtdW5pdC10ZXN0 cycsICctLWd0ZXN0X291dHB1dD14bWw6L21vY2stcmVzdWx0cy93ZWJraXRfdW5pdF90ZXN0c19v dXRwdXQueG1sJ10sIGN3ZD0vbW9jay1jaGVja291dAogUnVubmluZyBydW4td2Via2l0LXRlc3Rz Ci1NT0NLIHJ1bl9hbmRfdGhyb3dfaWZfZmFpbDogWydtb2NrLXJ1bi13ZWJraXQtdGVzdHMnLCAn LS1uby1uZXctdGVzdC1yZXN1bHRzJywgJy0tbm8tbGF1bmNoLXNhZmFyaScsICctLXNraXAtZmFp bGluZy10ZXN0cycsICctLWV4aXQtYWZ0ZXItbi1mYWlsdXJlcz0zMCcsICctLXJlc3VsdHMtZGly ZWN0b3J5PS9tb2NrLXJlc3VsdHMnLCAnLS1xdWlldCddLCBjd2Q9L21vY2stY2hlY2tvdXQKK01P Q0sgcnVuX2FuZF90aHJvd19pZl9mYWlsOiBbJ21vY2stcnVuLXdlYmtpdC10ZXN0cycsICctLW5v LW5ldy10ZXN0LXJlc3VsdHMnLCAnLS1uby1zaG93LXJlc3VsdHMnLCAnLS1za2lwLWZhaWxpbmct dGVzdHMnLCAnLS1leGl0LWFmdGVyLW4tZmFpbHVyZXM9MzAnLCAnLS1yZXN1bHRzLWRpcmVjdG9y eT0vbW9jay1yZXN1bHRzJywgJy0tcXVpZXQnXSwgY3dkPS9tb2NrLWNoZWNrb3V0CiAiIiIKICAg ICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIHN0ZXAucnVuLCBbe31d LCBleHBlY3RlZF9sb2dzPWV4cGVjdGVkX2xvZ3MpCg== 178643 2012-12-10 15:17:43 -0800 2012-12-10 18:01:25 -0800 rework to just pass --no-show-results to ORWT bug-104298-20121210151508.patch text/plain 6470 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3MjA4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTEyODU4MWFjMDdlZjY3ZGQxNWMzMjkzMzExNjNmNjA0 MGRlMzJlOC4uOGI4MjU3ZTAwYWYxMDU1NGM0Yjk4NzM3ZmUzZTkzNWVlOWE2MWUyZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDEyLTEyLTA2ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIGNoYW5nZSAtLW5vLWxhdW5jaC1zYWZhcmkgdG8gLS1uby1zaG93LXJlc3VsdHMgaW4g c2NyaXB0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTA0Mjk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U2luY2UgU2FmYXJpIG9ubHkgZXhpc3RzIG9uIHRoZSBBcHBsZSBwb3J0cywgTlJXVCBjYWxscyB0 aGUKKyAgICAgICAgY29tbWFuZCBsaW5lIGZsYWcgLS1bbm8tXXNob3ctcmVzdWx0cyBpbnN0ZWFk LiBUaGlzIHVwZGF0ZXMKKyAgICAgICAgdGhlIHNjcmlwdHMgdG8gdXNlIHRoZSBuZXcgZmxhZyAo YnV0IG5vdCB0aGUgYnVpbGRib3QgY29uZmlnIHlldCkuCisKKyAgICAgICAgKiBTY3JpcHRzL2dl bmVyYXRlLWNvdmVyYWdlLWRhdGE6CisgICAgICAgICogU2NyaXB0cy93ZWJraXQtdG9vbHMtY29t cGxldGlvbi5zaDoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcnVudGVz dHMucHk6CisgICAgICAgIChSdW5UZXN0cy5ydW4pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvdG9vbC9zdGVwcy9ydW50ZXN0c191bml0dGVzdC5weToKKwogMjAxMi0xMi0xMCAgRGlyayBQ cmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBvbGQtcnVuLXdlYmtpdC10 ZXN0czogc3VwcG9ydCAtLW5vLXNob3ctcmVzdWx0cyBmb3IgY29tcGF0aWJpbGl0eSB3LyBOUldU CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2dlbmVyYXRlLWNvdmVyYWdlLWRhdGEgYi9Ub29s cy9TY3JpcHRzL2dlbmVyYXRlLWNvdmVyYWdlLWRhdGEKaW5kZXggZDA2ZWU5OWRkZDY4ZGU5NmNl ODhiYjNjNzIyYWY4ZGE5OTNmMzFkZC4uOTM2NTkzMjAzZTFhMTI2MTg3YTc0NDcwZDNhMDBiNTc4 MTZlNzgwNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9nZW5lcmF0ZS1jb3ZlcmFnZS1kYXRh CisrKyBiL1Rvb2xzL1NjcmlwdHMvZ2VuZXJhdGUtY292ZXJhZ2UtZGF0YQpAQCAtNjAsNyArNjAs NyBAQCBzeXN0ZW0oImlmIFsgLWQgV2ViS2l0QnVpbGQgXTsgdGhlbiBmaW5kIFdlYktpdEJ1aWxk IC1uYW1lICcqLmdjZGEnIC1kZWxldGU7IGZpOwogCiBwcmludCAiQnVpbGRpbmcgYW5kIHRlc3Rp bmdcbiI7CiBzeXN0ZW0oIlRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0IiwgIi0tY292ZXJhZ2Ui LCBAQVJHVikgPT0gMCBvciBkaWU7Ci1zeXN0ZW0gIlRvb2xzL1NjcmlwdHMvbmV3LXJ1bi13ZWJr aXQtdGVzdHMiLCAiLS1uby1sYXVuY2gtc2FmYXJpIjsKK3N5c3RlbSAiVG9vbHMvU2NyaXB0cy9u ZXctcnVuLXdlYmtpdC10ZXN0cyIsICItLW5vLXNob3ctcmVzdWx0cyI7CiBzeXN0ZW0gIlRvb2xz L1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzIiwgIi0tY292ZXJhZ2UiLCBAQVJHVjsK IAogIyBDb2xsZWN0IHRoZSBkYXRhIGFuZCBnZW5lcmF0ZSBhIHJlcG9ydApkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXQtdG9vbHMtY29tcGxldGlvbi5zaCBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0LXRvb2xzLWNvbXBsZXRpb24uc2gKaW5kZXggZDgzYTVhNmNlMjVkZmI2ODdmY2NmYmFh NzlhYjk4YjhhODFhYTc1NS4uYTU3YTFhYmE1YmMyMzFkNDZkNDI2MmJlODRmOTQ3Mjk3YTJkZTU2 NCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXQtdG9vbHMtY29tcGxldGlvbi5zaAor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdC10b29scy1jb21wbGV0aW9uLnNoCkBAIC0xMTEsNCAr MTExLDQgQEAgY29tcGxldGUgLUYgX3dlYmtpdC1wYXRjaF9jb21wbGV0ZSB3ZWJraXQtcGF0Y2gK IGNvbXBsZXRlIC1vIGRlZmF1bHQgLVcgIi0tY29udGludWUgLS1maXgtbWVyZ2VkIC0taGVscCAt LW5vLWNvbnRpbnVlIC0tbm8td2FybmluZ3MgLS13YXJuaW5ncyAtYyAtZiAtaCAtdyIgcmVzb2x2 ZS1DaGFuZ2VMb2dzCiBjb21wbGV0ZSAtbyBkZWZhdWx0IC1XICItLWJ1ZyAtLWRpZmYgLS1naXQt Y29tbWl0IC0tZ2l0LWluZGV4IC0tZ2l0LXJldmlld2VyIC0taGVscCAtLW5vLXVwZGF0ZSAtLW5v LXdyaXRlIC0tb3BlbiAtLXVwZGF0ZSAtLXdyaXRlIC1kIC1oIC1vIiBwcmVwYXJlLUNoYW5nZUxv ZwogY29tcGxldGUgLVcgIi0tY2xlYW4gLS1kZWJ1ZyAtLWhlbHAgLWgiIGJ1aWxkLXdlYmtpdAot Y29tcGxldGUgLW8gZGVmYXVsdCAtVyAiLS1hZGQtcGxhdGZvcm0tZXhjZXB0aW9ucyAtLWNvbXBs ZXgtdGV4dCAtLWNvbmZpZ3VyYXRpb24gLS1ndWFyZC1tYWxsb2MgLS1oZWxwIC0taHR0cCAtLWln bm9yZS10ZXN0cyAtLWxhdW5jaC1zYWZhcmkgLS1sZWFrcyAtLW1lcmdlLWxlYWstZGVwdGggLS1u ZXctdGVzdC1yZXN1bHRzIC0tbm8taHR0cCAtLW5vLWxhdW5jaC1zYWZhcmkgLS1uby1uZXctdGVz dC1yZXN1bHRzIC0tbm8tc2FtcGxlLW9uLXRpbWVvdXQgLS1uby1zdHJpcC1lZGl0aW5nLWNhbGxi YWNrcyAtLXBpeGVsLXRlc3RzIC0tcGxhdGZvcm0gLS1wb3J0IC0tcXVpZXQgLS1yYW5kb20gLS1y ZXNldC1yZXN1bHRzIC0tcmVzdWx0cy1kaXJlY3RvcnkgLS1yZXZlcnNlIC0tcm9vdCAtLXNhbXBs ZS1vbi10aW1lb3V0IC0tc2luZ2x5IC0tc2tpcHBlZCAtLXNsb3dlc3QgLS1zdHJpY3QgLS1zdHJp cC1lZGl0aW5nLWNhbGxiYWNrcyAtLXRocmVhZGVkIC0tdGltZW91dCAtLXRvbGVyYW5jZSAtLXVz ZS1yZW1vdGUtbGlua3MtdG8tdGVzdHMgLS12YWxncmluZCAtLXZlcmJvc2UgLTEgLWMgLWcgLWgg LWkgLWwgLW0gLW8gLXAgLXEgLXQgLXYiIHJ1bi13ZWJraXQtdGVzdHMKK2NvbXBsZXRlIC1vIGRl ZmF1bHQgLVcgIi0tYWRkLXBsYXRmb3JtLWV4Y2VwdGlvbnMgLS1jb21wbGV4LXRleHQgLS1jb25m aWd1cmF0aW9uIC0tZ3VhcmQtbWFsbG9jIC0taGVscCAtLWh0dHAgLS1pZ25vcmUtdGVzdHMgLS1s YXVuY2gtc2FmYXJpIC0tbGVha3MgLS1tZXJnZS1sZWFrLWRlcHRoIC0tbmV3LXRlc3QtcmVzdWx0 cyAtLW5vLWh0dHAgLS1uby1zaG93LXJlc3VsdHMgLS1uby1uZXctdGVzdC1yZXN1bHRzIC0tbm8t c2FtcGxlLW9uLXRpbWVvdXQgLS1uby1zdHJpcC1lZGl0aW5nLWNhbGxiYWNrcyAtLXBpeGVsLXRl c3RzIC0tcGxhdGZvcm0gLS1wb3J0IC0tcXVpZXQgLS1yYW5kb20gLS1yZXNldC1yZXN1bHRzIC0t cmVzdWx0cy1kaXJlY3RvcnkgLS1yZXZlcnNlIC0tcm9vdCAtLXNhbXBsZS1vbi10aW1lb3V0IC0t c2luZ2x5IC0tc2tpcHBlZCAtLXNsb3dlc3QgLS1zdHJpY3QgLS1zdHJpcC1lZGl0aW5nLWNhbGxi YWNrcyAtLXRocmVhZGVkIC0tdGltZW91dCAtLXRvbGVyYW5jZSAtLXVzZS1yZW1vdGUtbGlua3Mt dG8tdGVzdHMgLS12YWxncmluZCAtLXZlcmJvc2UgLTEgLWMgLWcgLWggLWkgLWwgLW0gLW8gLXAg LXEgLXQgLXYiIHJ1bi13ZWJraXQtdGVzdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9zdGVwcy9ydW50ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9zdGVwcy9ydW50ZXN0cy5weQppbmRleCA2ZGM5MGY5MmM3OTU3NzJiMzM5N2FhN2MxN2RhNjky ODEwYjA4Y2VkLi4wYmVmOWY3ZWY1NDA2Y2RhYjA5M2M0Njc3YTBjMzg2Y2Q5Njk5OWU3IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcnVudGVzdHMucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3J1bnRlc3RzLnB5CkBAIC0xLDkg KzEsOSBAQAogIyBDb3B5cmlnaHQgKEMpIDIwMTAgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KLSMgCisjCiAjIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCiAjIG1ldDoKLSMgCisj CiAjICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUg YWJvdmUgY29weXJpZ2h0CiAjIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KICMgICAgICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFy eSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQpAQCAtMTMsNyArMTMsNyBAQAogIyAgICAg KiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCiAj IGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMg ZGVyaXZlZCBmcm9tCiAjIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0 dGVuIHBlcm1pc3Npb24uCi0jIAorIwogIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRI RSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCiAjICJBUyBJUyIgQU5EIEFOWSBF WFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCiAjIExJTUlU RUQgVE8sIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRO RVNTIEZPUgpAQCAtODQsNyArODQsNyBAQCBjbGFzcyBSdW5UZXN0cyhBYnN0cmFjdFN0ZXApOgog ICAgICAgICBpZiBzZWxmLl9vcHRpb25zLm5vbl9pbnRlcmFjdGl2ZToKICAgICAgICAgICAgIGFy Z3MuZXh0ZW5kKFsKICAgICAgICAgICAgICAgICAiLS1uby1uZXctdGVzdC1yZXN1bHRzIiwKLSAg ICAgICAgICAgICAgICAiLS1uby1sYXVuY2gtc2FmYXJpIiwKKyAgICAgICAgICAgICAgICAiLS1u by1zaG93LXJlc3VsdHMiLAogICAgICAgICAgICAgICAgICItLXNraXAtZmFpbGluZy10ZXN0cyIs CiAgICAgICAgICAgICAgICAgIi0tZXhpdC1hZnRlci1uLWZhaWx1cmVzPSVzIiAlIHNlbGYuTk9O X0lOVEVSQUNUSVZFX0ZBSUxVUkVfTElNSVRfQ09VTlQsCiAgICAgICAgICAgICAgICAgIi0tcmVz dWx0cy1kaXJlY3Rvcnk9JXMiICUgc2VsZi5fdG9vbC5wb3J0KCkucmVzdWx0c19kaXJlY3Rvcnks CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcnVudGVzdHNf dW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc3RlcHMvcnVudGVzdHNf dW5pdHRlc3QucHkKaW5kZXggNzhhODY3YjM2YjA5ZThlNzI3NTYyMGFhMjNjM2RlOTgyMTdkNmM4 Ni4uMjUwNmM2MWE0NDVjZjljNmYzMTdkMTVhNzhjOGFiZGFkYWYxYmE4NCAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL3J1bnRlc3RzX3VuaXR0ZXN0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9ydW50ZXN0c191bml0dGVzdC5w eQpAQCAtNDEsNiArNDEsNiBAQCBjbGFzcyBSdW5UZXN0c1Rlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICBleHBlY3RlZF9sb2dzID0gIiIiUnVubmluZyBXZWJLaXQgdW5pdCB0ZXN0cwog TU9DSyBydW5fYW5kX3Rocm93X2lmX2ZhaWw6IFsnbW9jay1ydW4td2Via2l0LXVuaXQtdGVzdHMn LCAnLS1ndGVzdF9vdXRwdXQ9eG1sOi9tb2NrLXJlc3VsdHMvd2Via2l0X3VuaXRfdGVzdHNfb3V0 cHV0LnhtbCddLCBjd2Q9L21vY2stY2hlY2tvdXQKIFJ1bm5pbmcgcnVuLXdlYmtpdC10ZXN0cwot TU9DSyBydW5fYW5kX3Rocm93X2lmX2ZhaWw6IFsnbW9jay1ydW4td2Via2l0LXRlc3RzJywgJy0t bm8tbmV3LXRlc3QtcmVzdWx0cycsICctLW5vLWxhdW5jaC1zYWZhcmknLCAnLS1za2lwLWZhaWxp bmctdGVzdHMnLCAnLS1leGl0LWFmdGVyLW4tZmFpbHVyZXM9MzAnLCAnLS1yZXN1bHRzLWRpcmVj dG9yeT0vbW9jay1yZXN1bHRzJywgJy0tcXVpZXQnXSwgY3dkPS9tb2NrLWNoZWNrb3V0CitNT0NL IHJ1bl9hbmRfdGhyb3dfaWZfZmFpbDogWydtb2NrLXJ1bi13ZWJraXQtdGVzdHMnLCAnLS1uby1u ZXctdGVzdC1yZXN1bHRzJywgJy0tbm8tc2hvdy1yZXN1bHRzJywgJy0tc2tpcC1mYWlsaW5nLXRl c3RzJywgJy0tZXhpdC1hZnRlci1uLWZhaWx1cmVzPTMwJywgJy0tcmVzdWx0cy1kaXJlY3Rvcnk9 L21vY2stcmVzdWx0cycsICctLXF1aWV0J10sIGN3ZD0vbW9jay1jaGVja291dAogIiIiCiAgICAg ICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBzdGVwLnJ1biwgW3t9XSwg ZXhwZWN0ZWRfbG9ncz1leHBlY3RlZF9sb2dzKQo=