15223 2007-09-16 14:11:42 -0700 webkitdir.pm::isQt() is not working properly in run-webkit-tests under Linux/Qt 2007-09-20 04:14:25 -0700 1 1 1 Unclassified WebKit Tools / Tests 523.x (Safari 3) PC Linux RESOLVED FIXED P2 Normal --- 1 jchaffraix webkit-unassigned oldest_to_newest 437 0 jchaffraix 2007-09-16 14:11:42 -0700 webkitdir.pm::isQt() parses the variables given by the user and in case it cannot find out the option "--qt" it uses the variable ${QTDIR}. In run-webkit-tests and without defining ${QTDIR}, this would only work for the first call to it because GetOptions removes the options it can resolve from ARGV. In addition, without defining ${QTDIR}, the calling of build-dumprendertree from run-webkit-tests will not be able to detect Qt platform through isQt() because it is called in a new context without the argument from the main script. 439 1 16301 jchaffraix 2007-09-16 14:47:51 -0700 Created attachment 16301 proposed patch With this patch, when calling isQt (same for isGdk), the comparison is done once. The result is stored in a global variable and is given in the following code. The global variables ($isQt and $isGdk) are now exported to be used in buid-dumprendertree. The saving / regeneration of $isQt was removed in run-webkit-tests as it is not necessary anymore (done directly in isQt()). 429 2 16301 aroben 2007-09-16 15:28:05 -0700 Comment on attachment 16301 proposed patch We prefer not to export global variables from perl modules. I think you should follow the "x()/determineX()" pattern we use throughout webkitdirs.pm: my $isQt; sub determineIsQt() { return if defined($isQt); $isQt = <something>; } sub isQt() { determineIsQt(); return $isQt; } 427 3 16302 jchaffraix 2007-09-16 17:26:23 -0700 Created attachment 16302 Modified patch using the pattern of webkitdir.pm 390 4 16302 aroben 2007-09-17 22:22:16 -0700 Comment on attachment 16302 Modified patch using the pattern of webkitdir.pm - } else { - $buildResult = system "WebKitTools/Scripts/build-dumprendertree", $configurationOption; + #On linux, we give the platform to build-dumprendertree as a parameter + } elsif (isQt()) { + $buildResult = system "WebKitTools/Scripts/build-dumprendertree", $configurationOption, "--qt"; + } elsif (isGdk()) { + $buildResult = system "WebKitTools/Scripts/build-dumprendertree", $configurationOption, "--gdk"; } A couple of comments here: 1) It looks like you've broken this script on OS X here because there's no case that OS X would fall into now (before it fell into the else). 2) I think it would be nice to store the final argument in a variable so that we don't need all these elsifs. This would also solve problem number (1). +sub determineIsQt() { We normally put the opening brace of a function on its own line. +sub determineIsGdk () { Ditto, and we don't put a space before the (). Overall, this looks great, but r- so that we can fix this on OS X and these small style issues. 341 5 16313 jchaffraix 2007-09-18 11:32:09 -0700 Created attachment 16313 Updated patch Added a variable to hold the platform that is provided just with for linux platforms (Qt or Gdk). The build on MacOSX should now work. Corrected the coding style errors. 352 6 16313 aroben 2007-09-18 13:28:44 -0700 Comment on attachment 16313 Updated patch +sub determineIsGdk () Please remove the space before the parentheses. + if (defined($platformParameter)) { + $buildResult = system "WebKitTools/Scripts/build-dumprendertree", $configurationOption, $platformParameter; + } else { + $buildResult = system "WebKitTools/Scripts/build-dumprendertree", $configurationOption; + } You don't need to check defined($platformParameter) here. You can just pass it to system, since passing undef is the same as not passing anything at all. Thanks for all the fixes so far! 291 7 16327 jchaffraix 2007-09-19 12:50:53 -0700 Created attachment 16327 Updated patch Corrected the coding style (I hope for good). Now the arguments are passed in a array to build-dumprendertree as seen with aroben. 283 8 16327 aroben 2007-09-19 13:43:15 -0700 Comment on attachment 16327 Updated patch r=me! 257 9 ddkilzer 2007-09-20 04:14:25 -0700 Committed revision 25670. In the future, please be sure to use spaces instead of tabs in the ChangeLog. Thanks! 16301 2007-09-16 14:47:51 -0700 2007-09-20 04:05:26 -0700 proposed patch bug15223.patch text/plain 3804 jchaffraix SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI1NTkw KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMDctMDkt MTYgIEp1bGllbiBDaGFmZnJhaXggIDxqdWxpZW4uY2hhZmZyYWl4QGdtYWlsLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworCUZpeCA6IGh0dHA6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjIzCisKKwlpc1F0IGFuZCBpc0dkayBhcmUgbm93 IGluaWFsaXplZCBvbmx5IG9uY2UgOyAgdGhlIHJlc3VsdCBpcyBzdG9yZWQgYW5kCisJZ2l2ZW4g aW4gdGhlIGZvbGxvd2luZyBjYWxscy4KKwlUd28gZ2xvYmFsIHZhcmlhYmxlcyAoJGlzUXQgYW5k ICRpc0dkaykgYXJlIGFkZGVkIHRvIGJlIHVzZWQgaW4gYnVpbGQtZHVtcHJlbmRlci10cmVlIAor CXRvIGFjcXVpcmUgdGhlIGNvcnJlY3QgY29udGV4dC4KKworICAgICAgICAqIFNjcmlwdHMvYnVp bGQtZHVtcHJlbmRlcnRyZWU6CisgICAgICAgICogU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKwogMjAwNy0wOS0xNSAgTWFyayBSb3dl ICA8bXJvd2VAYXBwbGUuY29tPgogCiAgICAgICAgIEJ1aWxkIGZpeCBmb3IgRHVtcFJlbmRlclRy ZWUuCkluZGV4OiBTY3JpcHRzL2J1aWxkLWR1bXByZW5kZXJ0cmVlCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNj cmlwdHMvYnVpbGQtZHVtcHJlbmRlcnRyZWUJKHJldmlzaW9uIDI1NTkwKQorKysgU2NyaXB0cy9i dWlsZC1kdW1wcmVuZGVydHJlZQkod29ya2luZyBjb3B5KQpAQCAtMzYsNiArMzYsOSBAQCB1c2Ug bGliICRGaW5kQmluOjpCaW47CiB1c2Ugd2Via2l0ZGlyczsKIHVzZSBQT1NJWDsKIAorI2ltcG9y dCBnbG9iYWwgZGVmaW5pdGlvbgordXNlIHdlYmtpdGRpcnMgcXcoJGlzUXQpOworCiBjaGVja1Jl cXVpcmVkU3lzdGVtQ29uZmlnKCk7CiBzZXRDb25maWd1cmF0aW9uKCk7CiBjaGRpcldlYktpdCgp OwpAQCAtNDgsNyArNTEsNyBAQCBpZiAoaXNPU1goKSkgewogICAgICRyZXN1bHQgPSBzeXN0ZW0g Inhjb2RlYnVpbGQiLCAiLXByb2plY3QiLCAiRHVtcFJlbmRlclRyZWUueGNvZGVwcm9qIiwgQG9w dGlvbnM7CiB9IGVsc2lmIChpc0N5Z3dpbigpKSB7CiAgICAgJHJlc3VsdCA9IGJ1aWxkVmlzdWFs U3R1ZGlvUHJvamVjdCgiRHVtcFJlbmRlclRyZWUudmNwcm9qL0R1bXBSZW5kZXJUcmVlLnNsbiIp OwotfSBlbHNpZiAoaXNRdCgpKSB7Cit9IGVsc2lmICgkaXNRdCkgewogICAgICMgUXQvTGludXgg YnVpbGRzIGV2ZXJ5dGhpbmcgaW4gb25lLXNob3QuIE5vIG5lZWQgdG8gYnVpbGQgYW55dGhpbmcg aGVyZS4KICAgICAkcmVzdWx0ID0gMDsKIH0gZWxzZSB7CkluZGV4OiBTY3JpcHRzL3J1bi13ZWJr aXQtdGVzdHMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCShyZXZpc2lv biAyNTU5MCkKKysrIFNjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwkod29ya2luZyBjb3B5KQpAQCAt MjU1LDcgKzI1NSw3IEBAIGlmKCFkZWZpbmVkKCRyb290KSl7CiAgICAgbXkgJGJ1aWxkUmVzdWx0 OwogICAgIGlmIChpc0N5Z3dpbigpKSB7CiAgICAgICAgICRidWlsZFJlc3VsdCA9IGJ1aWxkVmlz dWFsU3R1ZGlvUHJvamVjdCgiV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRy ZWUudmNwcm9qL0R1bXBSZW5kZXJUcmVlLnNsbiIpOwotICAgIH0gZWxzZSB7IAorICAgIH0gZWxz ZSB7CiAgICAgICAgICRidWlsZFJlc3VsdCA9IHN5c3RlbSAiV2ViS2l0VG9vbHMvU2NyaXB0cy9i dWlsZC1kdW1wcmVuZGVydHJlZSIsICRjb25maWd1cmF0aW9uT3B0aW9uOwogICAgIH0KIApAQCAt MTEyMCw5ICsxMTIwLDggQEAgc3ViIG9wZW5EdW1wVG9vbCgpCiAgICAgbXkgJGhvbWVEcml2ZSA9 ICRFTlZ7J0hPTUVEUklWRSd9OwogICAgIG15ICRob21lUGF0aCA9ICRFTlZ7J0hPTUVQQVRIJ307 CiAgICAgICAgIAotICAgIG15ICRpc1F0ID0gaXNRdCgpOwogICAgIGxvY2FsICVFTlY7Ci0gICAg aWYgKCRpc1F0KSB7CisgICAgaWYgKGlzUXQoKSkgewogICAgICAgICBpZiAoZGVmaW5lZCAkZGlz cGxheSkgewogICAgICAgICAgICAgJEVOVntESVNQTEFZfSA9ICRkaXNwbGF5OwogICAgICAgICB9 IGVsc2UgewpJbmRleDogU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNjcmlw dHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gMjU1OTApCisrKyBTY3JpcHRzL3dlYmtpdGRpcnMu cG0JKHdvcmtpbmcgY29weSkKQEAgLTU0LDYgKzU0LDExIEBAIG15ICRvc1hWZXJzaW9uOwogbXkg JHZjQnVpbGRQYXRoOwogbXkgJHdpbmRvd3NUbXBQYXRoOwogCisjRXhwb3J0ZWQgZW52aXJvbm1l bnQgZGVmaW5pdGlvbgordXNlIHZhcnMgcXcgKCRpc1F0ICRpc0dkayk7CitvdXIgJGlzUXQgPSAt MTsKK291ciAkaXNHZGsgPSAtMTsKKwogc3ViIGRldGVybWluZVNvdXJjZURpcgogewogICAgIHJl dHVybiBpZiAkc291cmNlRGlyOwpAQCAtMzg0LDI1ICszODksMzMgQEAgc3ViIGNoZWNrV2ViQ29y ZVNWR1N1cHBvcnQKIAogc3ViIGlzUXQoKQogewotICAgICMgQWxsb3cgb3ZlcnJpZGUgaW4gY2Fz ZSBRVERJUiBpcyBub3Qgc2V0LgotICAgIGZvciBteSAkaSAoMCAuLiAkI0FSR1YpIHsKLSAgICAg ICAgbXkgJG9wdCA9ICRBUkdWWyRpXTsKLSAgICAgICAgaWYgKCRvcHQgPX4gL14tLXF0L2kgKSB7 Ci0gICAgICAgICAgICByZXR1cm4gMTsKKyAgICBpZiAoJGlzUXQgPT0gLTEpIHsKKyAgICAgICAg IyBBbGxvdyBvdmVycmlkZSBpbiBjYXNlIFFURElSIGlzIG5vdCBzZXQuCisgICAgICAgIGZvciBt eSAkaSAoMCAuLiAkI0FSR1YpIHsKKyAgICAgICAgICAgIG15ICRvcHQgPSAkQVJHVlskaV07Cisg ICAgICAgICAgICBpZiAoJG9wdCA9fiAvXi0tcXQvaSApIHsKKyAgICAgICAgICAgICAgICAkaXNR dCA9IDE7CisgICAgICAgICAgICAgICAgcmV0dXJuICRpc1F0OworICAgICAgICAgICAgfQogICAg ICAgICB9CisgICAgICAgICRpc1F0ID0gZGVmaW5lZCgkRU5WeydRVERJUid9KTsKICAgICB9Ci0g ICAgcmV0dXJuIGRlZmluZWQoJEVOVnsnUVRESVInfSkKKyAgICByZXR1cm4gJGlzUXQ7CiB9CiAK IHN1YiBpc0dkaygpCiB7Ci0gICAgZm9yIG15ICRpICgwIC4uICQjQVJHVikgewotICAgICAgICBt eSAkb3B0ID0gJEFSR1ZbJGldOwotICAgICAgICBpZiAoJG9wdCA9fiAvXi0tZ2RrJC9pICkgewot ICAgICAgICAgICAgcmV0dXJuIDE7CisgICAgaWYgKCRpc0dkayA9PSAtMSkgeworICAgICAgICBm b3IgbXkgJGkgKDAgLi4gJCNBUkdWKSB7CisgICAgICAgICAgICBteSAkb3B0ID0gJEFSR1ZbJGld OworICAgICAgICAgICAgaWYgKCRvcHQgPX4gL14tLWdkayQvaSApIHsKKyAgICAgICAgICAgICAg ICAkaXNHZGsgPSAxOworICAgICAgICAgICAgICAgIHJldHVybiAkaXNHZGs7CisgICAgICAgICAg ICB9CiAgICAgICAgIH0KKyAgICAgICAgJGlzR2RrID0gMDsKICAgICB9Ci0gICAgcmV0dXJuIDA7 CisgICAgcmV0dXJuICRpc0dkazsKIH0KIAogc3ViIGlzQ3lnd2luKCkK 16302 2007-09-16 17:26:23 -0700 2007-09-20 04:05:51 -0700 Modified patch using the pattern of webkitdir.pm bug15223.patch text/plain 3109 jchaffraix SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI1NTkw KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDctMDkt MTYgIEp1bGllbiBDaGFmZnJhaXggIDxqdWxpZW4uY2hhZmZyYWl4QGdtYWlsLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworCUZpeCA6IGh0dHA6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjIzCisKKwlBZGRlZCBkZXRlcm1pbmVJc1F0KCkg YW5kIGRldGVybWluZUlzR2RrKCkgdG8gd2Via2l0ZGlycy5wbS4KKwlOb3cgaXNRdCgpIGFuZCBp c0dkaygpIHVzZSBnbG9iYWwgdmFyaWFibGVzIHRoYXQgYXJlIG9ubHkgc2V0IG9uY2UuCisJVG8g a2VlcCB0aGUgcGxhdGZvcm0gb24gbGludXgsIGl0IGlzIHByb3ZpZGVkIGFzIGEgcGFyYW1ldGVy IHRvIGJ1aWxkLWR1bXByZW5kZXJ0cmVlLgorCisgICAgICAgICogU2NyaXB0cy9idWlsZC1kdW1w cmVuZGVydHJlZToKKyAgICAgICAgKiBTY3JpcHRzL3J1bi13ZWJraXQtdGVzdHM6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorCiAyMDA3LTA5LTE1ICBNYXJrIFJvd2UgIDxtcm93 ZUBhcHBsZS5jb20+CiAKICAgICAgICAgQnVpbGQgZml4IGZvciBEdW1wUmVuZGVyVHJlZS4KSW5k ZXg6IFNjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTY3JpcHRzL3J1bi13 ZWJraXQtdGVzdHMJKHJldmlzaW9uIDI1NTkwKQorKysgU2NyaXB0cy9ydW4td2Via2l0LXRlc3Rz CSh3b3JraW5nIGNvcHkpCkBAIC0yNTUsOCArMjU1LDExIEBAIGlmKCFkZWZpbmVkKCRyb290KSl7 CiAgICAgbXkgJGJ1aWxkUmVzdWx0OwogICAgIGlmIChpc0N5Z3dpbigpKSB7CiAgICAgICAgICRi dWlsZFJlc3VsdCA9IGJ1aWxkVmlzdWFsU3R1ZGlvUHJvamVjdCgiV2ViS2l0VG9vbHMvRHVtcFJl bmRlclRyZWUvRHVtcFJlbmRlclRyZWUudmNwcm9qL0R1bXBSZW5kZXJUcmVlLnNsbiIpOwotICAg IH0gZWxzZSB7IAotICAgICAgICAkYnVpbGRSZXN1bHQgPSBzeXN0ZW0gIldlYktpdFRvb2xzL1Nj cmlwdHMvYnVpbGQtZHVtcHJlbmRlcnRyZWUiLCAkY29uZmlndXJhdGlvbk9wdGlvbjsKKyAgICAj T24gbGludXgsIHdlIGdpdmUgdGhlIHBsYXRmb3JtIHRvIGJ1aWxkLWR1bXByZW5kZXJ0cmVlIGFz IGEgcGFyYW1ldGVyCisgICAgfSBlbHNpZiAoaXNRdCgpKSB7CisgICAgICAgICRidWlsZFJlc3Vs dCA9IHN5c3RlbSAiV2ViS2l0VG9vbHMvU2NyaXB0cy9idWlsZC1kdW1wcmVuZGVydHJlZSIsICRj b25maWd1cmF0aW9uT3B0aW9uLCAiLS1xdCI7CisgICAgfSBlbHNpZiAoaXNHZGsoKSkgeworICAg ICAgICAkYnVpbGRSZXN1bHQgPSBzeXN0ZW0gIldlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtZHVt cHJlbmRlcnRyZWUiLCAkY29uZmlndXJhdGlvbk9wdGlvbiwgIi0tZ2RrIjsKICAgICB9CiAKICAg ICBpZiAoJGJ1aWxkUmVzdWx0KSB7CkBAIC0xMTIwLDkgKzExMjMsOCBAQCBzdWIgb3BlbkR1bXBU b29sKCkKICAgICBteSAkaG9tZURyaXZlID0gJEVOVnsnSE9NRURSSVZFJ307CiAgICAgbXkgJGhv bWVQYXRoID0gJEVOVnsnSE9NRVBBVEgnfTsKICAgICAgICAgCi0gICAgbXkgJGlzUXQgPSBpc1F0 KCk7CiAgICAgbG9jYWwgJUVOVjsKLSAgICBpZiAoJGlzUXQpIHsKKyAgICBpZiAoaXNRdCgpKSB7 CiAgICAgICAgIGlmIChkZWZpbmVkICRkaXNwbGF5KSB7CiAgICAgICAgICAgICAkRU5We0RJU1BM QVl9ID0gJGRpc3BsYXk7CiAgICAgICAgIH0gZWxzZSB7CkluZGV4OiBTY3JpcHRzL3dlYmtpdGRp cnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiAyNTU5 MCkKKysrIFNjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtNDksNiArNDks OCBAQCBteSAkY29uZmlndXJhdGlvblByb2R1Y3REaXI7CiBteSAkc291cmNlRGlyOwogbXkgJGN1 cnJlbnRTVk5SZXZpc2lvbjsKIG15ICRvc1hWZXJzaW9uOworbXkgJGlzUXQ7CitteSAkaXNHZGs7 CiAKICMgVmFyaWFibGVzIGZvciBXaW4zMiBzdXBwb3J0CiBteSAkdmNCdWlsZFBhdGg7CkBAIC0z ODQsMjUgKzM4Niw0MCBAQCBzdWIgY2hlY2tXZWJDb3JlU1ZHU3VwcG9ydAogCiBzdWIgaXNRdCgp CiB7CisgICAgIGRldGVybWluZUlzUXQoKTsKKyAgICAgcmV0dXJuICRpc1F0OworfQorCitzdWIg ZGV0ZXJtaW5lSXNRdCgpIHsKKyAgICByZXR1cm4gaWYgZGVmaW5lZCgkaXNRdCk7CiAgICAgIyBB bGxvdyBvdmVycmlkZSBpbiBjYXNlIFFURElSIGlzIG5vdCBzZXQuCiAgICAgZm9yIG15ICRpICgw IC4uICQjQVJHVikgewogICAgICAgICBteSAkb3B0ID0gJEFSR1ZbJGldOwogICAgICAgICBpZiAo JG9wdCA9fiAvXi0tcXQvaSApIHsKLSAgICAgICAgICAgIHJldHVybiAxOworICAgICAgICAgICAg JGlzUXQgPSAxOworICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQotICAgIHJl dHVybiBkZWZpbmVkKCRFTlZ7J1FURElSJ30pCisgICAgJGlzUXQgPSBkZWZpbmVkKCRFTlZ7J1FU RElSJ30pOwogfQogCiBzdWIgaXNHZGsoKQogeworICAgIGRldGVybWluZUlzR2RrKCk7CisgICAg cmV0dXJuICRpc0dkazsKK30KKworc3ViIGRldGVybWluZUlzR2RrICgpIHsKKyAgICByZXR1cm4g aWYgZGVmaW5lZCgkaXNHZGspOworCiAgICAgZm9yIG15ICRpICgwIC4uICQjQVJHVikgewogICAg ICAgICBteSAkb3B0ID0gJEFSR1ZbJGldOwogICAgICAgICBpZiAoJG9wdCA9fiAvXi0tZ2RrJC9p ICkgewotICAgICAgICAgICAgcmV0dXJuIDE7CisgICAgICAgICAgICAkaXNHZGsgPSAxOworICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQotICAgIHJldHVybiAwOworICAgICRp c0dkayA9IDA7CiB9CiAKIHN1YiBpc0N5Z3dpbigpCg== 16313 2007-09-18 11:32:09 -0700 2007-09-20 04:06:11 -0700 Updated patch bug15223.patch text/plain 2471 jchaffraix SW5kZXg6IHdlYmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gd2Via2l0ZGlycy5wbQkocmV2aXNp b24gMjU1OTEpCisrKyB3ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC00OSw2ICs0OSw4 IEBACiBteSAkc291cmNlRGlyOwogbXkgJGN1cnJlbnRTVk5SZXZpc2lvbjsKIG15ICRvc1hWZXJz aW9uOworbXkgJGlzUXQ7CitteSAkaXNHZGs7CiAKICMgVmFyaWFibGVzIGZvciBXaW4zMiBzdXBw b3J0CiBteSAkdmNCdWlsZFBhdGg7CkBAIC0zODQsMjUgKzM4Niw0MiBAQAogCiBzdWIgaXNRdCgp CiB7CisgICAgZGV0ZXJtaW5lSXNRdCgpOworICAgIHJldHVybiAkaXNRdDsKK30KKworc3ViIGRl dGVybWluZUlzUXQoKQoreworICAgIHJldHVybiBpZiBkZWZpbmVkKCRpc1F0KTsKICAgICAjIEFs bG93IG92ZXJyaWRlIGluIGNhc2UgUVRESVIgaXMgbm90IHNldC4KICAgICBmb3IgbXkgJGkgKDAg Li4gJCNBUkdWKSB7CiAgICAgICAgIG15ICRvcHQgPSAkQVJHVlskaV07CiAgICAgICAgIGlmICgk b3B0ID1+IC9eLS1xdC9pICkgewotICAgICAgICAgICAgcmV0dXJuIDE7CisgICAgICAgICAgICAk aXNRdCA9IDE7CisgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9Ci0gICAgcmV0 dXJuIGRlZmluZWQoJEVOVnsnUVRESVInfSkKKyAgICAkaXNRdCA9IGRlZmluZWQoJEVOVnsnUVRE SVInfSk7CiB9CiAKIHN1YiBpc0dkaygpCiB7CisgICAgZGV0ZXJtaW5lSXNHZGsoKTsKKyAgICBy ZXR1cm4gJGlzR2RrOworfQorCitzdWIgZGV0ZXJtaW5lSXNHZGsgKCkKK3sKKyAgICByZXR1cm4g aWYgZGVmaW5lZCgkaXNHZGspOworCiAgICAgZm9yIG15ICRpICgwIC4uICQjQVJHVikgewogICAg ICAgICBteSAkb3B0ID0gJEFSR1ZbJGldOwogICAgICAgICBpZiAoJG9wdCA9fiAvXi0tZ2RrJC9p ICkgewotICAgICAgICAgICAgcmV0dXJuIDE7CisgICAgICAgICAgICAkaXNHZGsgPSAxOworICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQotICAgIHJldHVybiAwOworICAgICRp c0dkayA9IDA7CiB9CiAKIHN1YiBpc0N5Z3dpbigpCkluZGV4OiBydW4td2Via2l0LXRlc3RzCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIHJ1bi13ZWJraXQtdGVzdHMJKHJldmlzaW9uIDI1NTkxKQorKysgcnVuLXdl YmtpdC10ZXN0cwkod29ya2luZyBjb3B5KQpAQCAtMjU1LDggKzI1NSwyMiBAQAogICAgIG15ICRi dWlsZFJlc3VsdDsKICAgICBpZiAoaXNDeWd3aW4oKSkgewogICAgICAgICAkYnVpbGRSZXN1bHQg PSBidWlsZFZpc3VhbFN0dWRpb1Byb2plY3QoIldlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1 bXBSZW5kZXJUcmVlLnZjcHJvai9EdW1wUmVuZGVyVHJlZS5zbG4iKTsKLSAgICB9IGVsc2UgeyAK LSAgICAgICAgJGJ1aWxkUmVzdWx0ID0gc3lzdGVtICJXZWJLaXRUb29scy9TY3JpcHRzL2J1aWxk LWR1bXByZW5kZXJ0cmVlIiwgJGNvbmZpZ3VyYXRpb25PcHRpb247CisgICAgfSBlbHNlIHsKKyAg ICAgICAgI09uIGxpbnV4LCB3ZSBnaXZlIHRoZSBwbGF0Zm9ybSB0byBidWlsZC1kdW1wcmVuZGVy dHJlZSBhcyBhIHBhcmFtZXRlcgorICAgICAgICBteSAkcGxhdGZvcm1QYXJhbWV0ZXI7CisgICAg ICAgIGlmIChpc1F0KCkpIHsKKyAgICAgICAgICAgICRwbGF0Zm9ybVBhcmFtZXRlciA9ICItLXF0 IjsKKyAgICAgICAgfSBlbHNpZiAoaXNHZGsoKSkgeworICAgICAgICAgICAgJHBsYXRmb3JtUGFy YW1ldGVyID0gIi0tZ2RrIjsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChkZWZpbmVkKCRwbGF0 Zm9ybVBhcmFtZXRlcikpIHsKKyAgICAgICAgICAgICRidWlsZFJlc3VsdCA9IHN5c3RlbSAiV2Vi S2l0VG9vbHMvU2NyaXB0cy9idWlsZC1kdW1wcmVuZGVydHJlZSIsICRjb25maWd1cmF0aW9uT3B0 aW9uLCAkcGxhdGZvcm1QYXJhbWV0ZXI7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAk YnVpbGRSZXN1bHQgPSBzeXN0ZW0gIldlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtZHVtcHJlbmRl cnRyZWUiLCAkY29uZmlndXJhdGlvbk9wdGlvbjsgCisgICAgICAgIH0KKworICAgIAogICAgIH0K IAogICAgIGlmICgkYnVpbGRSZXN1bHQpIHsKQEAgLTExMjAsOSArMTEzNCw4IEBACiAgICAgbXkg JGhvbWVEcml2ZSA9ICRFTlZ7J0hPTUVEUklWRSd9OwogICAgIG15ICRob21lUGF0aCA9ICRFTlZ7 J0hPTUVQQVRIJ307CiAgICAgICAgIAotICAgIG15ICRpc1F0ID0gaXNRdCgpOwogICAgIGxvY2Fs ICVFTlY7Ci0gICAgaWYgKCRpc1F0KSB7CisgICAgaWYgKGlzUXQoKSkgewogICAgICAgICBpZiAo ZGVmaW5lZCAkZGlzcGxheSkgewogICAgICAgICAgICAgJEVOVntESVNQTEFZfSA9ICRkaXNwbGF5 OwogICAgICAgICB9IGVsc2Ugewo= 16327 2007-09-19 12:50:53 -0700 2007-09-19 13:43:15 -0700 Updated patch bug15223.patch text/plain 3374 jchaffraix SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI1NjQx KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDctMDkt MjEgIEp1bGllbiBDaGFmZnJhaXggIDxqdWxpZW4uY2hhZmZyYWl4QGdtYWlsLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworCUZpeCA6IGh0dHA6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjIzCisKKwlBZGRlZCBkZXRlcm1pbmVJc1F0KCkg YW5kIGRldGVybWluZUlzR2RrKCkgdG8gd2Via2l0ZGlycy5wbS4KKwlOb3cgaXNRdCgpIGFuZCBp c0dkaygpIHVzZSBnbG9iYWwgdmFyaWFibGVzIHRoYXQgYXJlIG9ubHkgc2V0IG9uY2UuCisJCisJ QW4gYXJyYXkgb2YgYWxsIHRoZSBwYXJhbWV0ZXJzIGlzIG5vdyBnaXZlbiB0byBidWlsZC1kdW1w cmVuZGVyIHdoaWNoIGluY2x1ZGVzCisJdGhlIHBsYXRmb3JtIG9uIGxpbnV4LgorCisgICAgICAg ICogU2NyaXB0cy9idWlsZC1kdW1wcmVuZGVydHJlZToKKyAgICAgICAgKiBTY3JpcHRzL3J1bi13 ZWJraXQtdGVzdHM6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorCiAyMDA3LTA5 LTE5ICBUdXVra2EgSGFzdHJ1cCAgPFR1dWtrYS5IYXN0cnVwQGlraS5maT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEYXZpZCBLaWx6ZXIuCkluZGV4OiBTY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCShyZXZpc2lvbiAyNTY0MSkK KysrIFNjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cwkod29ya2luZyBjb3B5KQpAQCAtMTMxLDYgKzEz MSw4IEBAIGlmIChpc1RpZ2VyKCkpIHsKICAgICAkcGxhdGZvcm0gPSAibWFjIjsKIH0gZWxzaWYg KGlzUXQoKSkgewogICAgICRwbGF0Zm9ybSA9ICJxdCI7Cit9IGVsc2lmIChpc0dkaygpKSB7Cisg ICAgJHBsYXRmb3JtID0gImdkayI7CiB9IGVsc2lmIChpc0N5Z3dpbigpKSB7CiAgICAgIyBGSVhN RTogVGhlIHR3byBsaW5lcyBiZWxvdyBhcmUgYSBoYWNrIHRvIHJlcHJlc2VudCB0aGF0IG9uIFdp bmRvd3Mgd2UKICAgICAjIGN1cnJlbnRseSB3YW50IHRvCkBAIC0yNTYsNyArMjU4LDE3IEBAIGlm KCFkZWZpbmVkKCRyb290KSl7CiAgICAgaWYgKGlzQ3lnd2luKCkpIHsKICAgICAgICAgJGJ1aWxk UmVzdWx0ID0gYnVpbGRWaXN1YWxTdHVkaW9Qcm9qZWN0KCJXZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9EdW1wUmVuZGVyVHJlZS5zbG4iKTsKICAgICB9IGVsc2UgewotICAgICAgICAkYnVpbGRS ZXN1bHQgPSBzeXN0ZW0gIldlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQtZHVtcHJlbmRlcnRyZWUi LCAkY29uZmlndXJhdGlvbk9wdGlvbjsKKyAgICAgICAgIyBQdXNoIHRoZSBwYXJhbWV0ZXJzIHRv IGJ1aWxkLWR1bXByZW5kZXJ0cmVlIGFzIGFuIGFycmF5CisgICAgICAgIG15IEBhcmdzOworICAg ICAgICBwdXNoKEBhcmdzLCAkY29uZmlndXJhdGlvbik7CisKKyAgICAgICAgaWYgKGlzUXQoKSkg eworICAgICAgICAgICAgcHVzaChAYXJncywgIi0tcXQiKTsKKyAgICAgICAgfSBlbHNpZiAoaXNH ZGsoKSkgeworICAgICAgICAgICAgcHVzaChAYXJncywgIi0tZ2RrIik7CisgICAgICAgIH0KKwor ICAgICAgICAkYnVpbGRSZXN1bHQgPSBzeXN0ZW0gIldlYktpdFRvb2xzL1NjcmlwdHMvYnVpbGQt ZHVtcHJlbmRlcnRyZWUiLCBAYXJnczsKICAgICB9CiAKICAgICBpZiAoJGJ1aWxkUmVzdWx0KSB7 CkBAIC0xMTIwLDkgKzExMzIsOCBAQCBzdWIgb3BlbkR1bXBUb29sKCkKICAgICBteSAkaG9tZURy aXZlID0gJEVOVnsnSE9NRURSSVZFJ307CiAgICAgbXkgJGhvbWVQYXRoID0gJEVOVnsnSE9NRVBB VEgnfTsKICAgICAgICAgCi0gICAgbXkgJGlzUXQgPSBpc1F0KCk7CiAgICAgbG9jYWwgJUVOVjsK LSAgICBpZiAoJGlzUXQpIHsKKyAgICBpZiAoaXNRdCgpKSB7CiAgICAgICAgIGlmIChkZWZpbmVk ICRkaXNwbGF5KSB7CiAgICAgICAgICAgICAkRU5We0RJU1BMQVl9ID0gJGRpc3BsYXk7CiAgICAg ICAgIH0gZWxzZSB7CkluZGV4OiBTY3JpcHRzL3dlYmtpdGRpcnMucG0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U2NyaXB0cy93ZWJraXRkaXJzLnBtCShyZXZpc2lvbiAyNTY0MSkKKysrIFNjcmlwdHMvd2Via2l0 ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtNDksNiArNDksOCBAQCBteSAkY29uZmlndXJhdGlv blByb2R1Y3REaXI7CiBteSAkc291cmNlRGlyOwogbXkgJGN1cnJlbnRTVk5SZXZpc2lvbjsKIG15 ICRvc1hWZXJzaW9uOworbXkgJGlzUXQ7CitteSAkaXNHZGs7CiAKICMgVmFyaWFibGVzIGZvciBX aW4zMiBzdXBwb3J0CiBteSAkdmNCdWlsZFBhdGg7CkBAIC0zODQsMjUgKzM4Niw0MyBAQCBzdWIg Y2hlY2tXZWJDb3JlU1ZHU3VwcG9ydAogCiBzdWIgaXNRdCgpCiB7CisgICAgZGV0ZXJtaW5lSXNR dCgpOworICAgIHJldHVybiAkaXNRdDsKK30KKworc3ViIGRldGVybWluZUlzUXQoKQoreworICAg IHJldHVybiBpZiBkZWZpbmVkKCRpc1F0KTsKKwogICAgICMgQWxsb3cgb3ZlcnJpZGUgaW4gY2Fz ZSBRVERJUiBpcyBub3Qgc2V0LgogICAgIGZvciBteSAkaSAoMCAuLiAkI0FSR1YpIHsKICAgICAg ICAgbXkgJG9wdCA9ICRBUkdWWyRpXTsKICAgICAgICAgaWYgKCRvcHQgPX4gL14tLXF0L2kgKSB7 Ci0gICAgICAgICAgICByZXR1cm4gMTsKKyAgICAgICAgICAgICRpc1F0ID0gMTsKKyAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQogICAgIH0KLSAgICByZXR1cm4gZGVmaW5lZCgkRU5WeydR VERJUid9KQorICAgICRpc1F0ID0gZGVmaW5lZCgkRU5WeydRVERJUid9KTsKIH0KIAogc3ViIGlz R2RrKCkKIHsKKyAgICBkZXRlcm1pbmVJc0dkaygpOworICAgIHJldHVybiAkaXNHZGs7Cit9CisK K3N1YiBkZXRlcm1pbmVJc0dkaygpCit7CisgICAgcmV0dXJuIGlmIGRlZmluZWQoJGlzR2RrKTsK KwogICAgIGZvciBteSAkaSAoMCAuLiAkI0FSR1YpIHsKICAgICAgICAgbXkgJG9wdCA9ICRBUkdW WyRpXTsKICAgICAgICAgaWYgKCRvcHQgPX4gL14tLWdkayQvaSApIHsKLSAgICAgICAgICAgIHJl dHVybiAxOworICAgICAgICAgICAgJGlzR2RrID0gMTsKKyAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgfQogICAgIH0KLSAgICByZXR1cm4gMDsKKyAgICAkaXNHZGsgPSAwOwogfQogCiBzdWIg aXNDeWd3aW4oKQo=