39058 2010-05-13 06:13:39 -0700 old-run-webkit-tests should use ensure-valid-python to check if it can run the websockets tests 2010-07-05 07:16:33 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 38886 41612 1 eric webkit-unassigned ap ukai oldest_to_newest 225248 0 eric 2010-05-13 06:13:39 -0700 old-run-webkit-tests should use ensure-valid-python to check if it can run the websockets tests Right now the tests are manually skipped for Tiger, which is bad. Would be better to run them automatically when we can find python 2.5+ and not when we can't. 225249 1 eric 2010-05-13 06:14:35 -0700 ensure-valid-python will need to have a --non-interactive option or some flag to make it not try to install if missing. Actually it should probably default to not installing if missing since it can't do so w/o a user sitting at the keyboard. 225334 2 ap 2010-05-13 09:08:42 -0700 I think that this should be WONTFIX. Skipping tests is bad - if we require developers to make the extra effort of installing custom python, this should be mandatory. 225388 3 eric 2010-05-13 11:13:09 -0700 It's just like how we dynamically skip tests on Windows when your machine isn't supported for hardware compositing. This came up because the Tiger bot currently has Python 2.3, and the resolution to that was to skip all the websocket tests (which is bad). I'd rather have the skip only happen if someone is missing the proper python. We can display a huge warning if you like. I'm happy to close this as WONTFIX, as it means less work for me. But I think automatically skipping with a big warning is a better behavior than our current manual skip or than making it impossible to run test at all w/o python 2.5. 225397 4 ap 2010-05-13 11:20:22 -0700 > It's just like how we dynamically skip tests on Windows when your machine > isn't supported for hardware compositing. Yes, but Tiger support WebSocket just fine. It's purely a tools issue, unlike the compositing one. 226667 5 56219 ukai 2010-05-17 00:56:05 -0700 Created attachment 56219 Patch 233630 6 56219 hamaji 2010-06-02 23:33:25 -0700 Comment on attachment 56219 Patch Hi Alexey, this patch would not be the best solution, but seems to make the situation better. If I understand correctly, now we are just skipping all websocket tests by mac-tiger/Skipped even when python 2.5 is manually installed. So, I'd like to put r+ for this patch. Or, we might want to add a flag like --skip-python25-tests-if-we-dont-have-python25 into old-run-webkit-tests and use this flag in our buildbot for now. What do you think? By the way Ukai-san, cannot we remove websocket/tests from mac-tiger/Skipped with this patch? 233633 7 ukai 2010-06-02 23:58:54 -0700 (In reply to comment #6) > By the way Ukai-san, cannot we remove websocket/tests from mac-tiger/Skipped with this patch? yes, we can. 233634 8 57738 ukai 2010-06-02 23:59:33 -0700 Created attachment 57738 Patch 233810 9 57738 ap 2010-06-03 10:19:31 -0700 Comment on attachment 57738 Patch > print "Your Python version is insuficient to run WebKit's Python code. Please update.\n"; Typo: should be "insufficient". + `./WebKitTools/Scripts/ensure-valid-python --check-only`; We normally use system(), not backticks. But there's precedent for the latter, too. 234048 10 ukai 2010-06-03 21:22:24 -0700 Committed r60652: <http://trac.webkit.org/changeset/60652> 234897 11 eric 2010-06-07 09:45:15 -0700 Can't exec "WebKitTools/Scripts/ensure-valid-python": No such file or directory at ../../Projects/WebKit/WebKitTools/Scripts/old-run-webkit-tests line 1441. WARNING: Your platform does not have Python 2.5+, which is required to run websocket server, so disabling websocket/tests. Running build-dumprendertree I get that when trying to call run-webkit-tests from outside of a webkit checkout. Seems the change didn't use the wkdirs module as it should have. 234899 12 eric 2010-06-07 09:49:17 -0700 Yes, this is the wrong way to launch scripts: 1441 `./WebKitTools/Scripts/ensure-valid-python --check-only`; The perl code is lame about how it handles paths. The python code always uses absolute paths. The other callsites make similar relative-path calls and get away with it because they're after the chdirWebKit() call in old-run-webkit-tests. I think you should instead make your path absolute using sourceDir() from webkitdirs. You could also use relativeScriptsDir(). 235188 13 eric 2010-06-08 02:14:55 -0700 Can't exec "WebKitTools/Scripts/ensure-valid-python": No such file or directory at ../WebKitTools/Scripts/old-run-webkit-tests line 1441. WARNING: Your platform does not have Python 2.5+, which is required to run websocket server, so disabling websocket/tests. I'm getting this all the time. We need to fix or roll this out (please). :) 235191 14 58125 ukai 2010-06-08 02:41:59 -0700 Created attachment 58125 Patch 235354 15 58125 eric 2010-06-08 10:53:34 -0700 Comment on attachment 58125 Patch I think its good practice for all paths to be absolute, regardless of what the current directory is. I wouldn't bother adding the comment, but this looks fine. 235356 16 57738 eric 2010-06-08 10:54:01 -0700 Comment on attachment 57738 Patch Marking this patch obsolete since it was landed. 235610 17 ukai 2010-06-08 18:03:03 -0700 Committed r60875: <http://trac.webkit.org/changeset/60875> 56219 2010-05-17 00:56:05 -0700 2010-06-02 23:59:26 -0700 Patch bug-39058-20100517005603.patch text/plain 4517 ukai ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiMjE4YjBjMWE5OTI3MTNmNTJkYWFmZjk0ZGJhMjA3OTg5ZWI0YjljLi5kYzZlNjFh YzcwMThlYzBhNTAzNmZjNGIyNTBjY2M0ZDFkMDQ3MjA3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAK IDIwMTAtMDUtMTcgIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CiAKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgb2xkLXJ1bi13ZWJraXQt dGVzdHMgc2hvdWxkIHVzZSBlbnN1cmUtdmFsaWQtcHl0aG9uIHRvIGNoZWNrIGlmIGl0IGNhbiBy dW4gdGhlIHdlYnNvY2tldHMgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM5MDU4CisKKyAgICAgICAgKiBTY3JpcHRzL2Vuc3VyZS12YWxpZC1w eXRob246CisgICAgICAgICAgLSBQZXJsIDUuOCBkb2Vzbid0IGhhdmUgRmlsZTo6VGVtcC0+bmV3 ZGlyKCkuICBVc2UgRmlsZTo6VGVtcC0+dGVtcGRpcigpIGluc3RlYWQuCisgICAgICAgICAgLSBB ZGQgLS1jaGVjay1vbmx5IGFuZCAtLWhlbHAgb3B0aW9uLgorICAgICAgICAgIC0gLS1jaGVjay1v bmx5IG9wdGlvbiBvbmx5IGNoZWNrcyBweXRob24gdmVyc2lvbiBhbmQgZG9uJ3QgdHJ5IHRvIGlu c3RhbGwgUHl0aG9uIDIuNS4KKyAgICAgICAgICAtIFNldCBleGVjdXRhYmxlIGJpdC4KKyAgICAg ICAgKiBTY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzOgorICAgICAgICAgIC0gQ2hlY2sgaWYg aXQgY2FuIHJ1biB0aGUgd2Vic29ja2V0IHRlc3RzIGJ5IGNhbGxpbmcgZW5zdXJlLXZhbGlkLXB5 dGhvbiAtLWNoZWNrLW9ubHkuCisKKzIwMTAtMDUtMTcgIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBj aHJvbWl1bS5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCiAKICAgICAg ICAgQ2hyb21pdW06IEFkZCAtLWNocm9taXVtIG9wdGlvbiB0byBuZXctcnVuLXdlYmtpdC13ZWJz b2NrZXRzZXJ2ZXIKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvZW5zdXJlLXZhbGlk LXB5dGhvbiBiL1dlYktpdFRvb2xzL1NjcmlwdHMvZW5zdXJlLXZhbGlkLXB5dGhvbgpvbGQgbW9k ZSAxMDA2NDQKbmV3IG1vZGUgMTAwNzU1CmluZGV4IGMyMWFkNGU1OGI5NjNjYjc2NGVkYmI4NDJl M2Q2YzQwNDgyNmI1ZGQuLjQxZWNiZDgzYzE0ZTNjNjNiODJjMmEyYWM2OTEwMDhkOGQ0NzllOGQK LS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9lbnN1cmUtdmFsaWQtcHl0aG9uCisrKyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvZW5zdXJlLXZhbGlkLXB5dGhvbgpAQCAtMzEsNiArMzEsNyBAQCB1c2Ug RmlsZTo6QmFzZW5hbWU7CiB1c2UgRmlsZTo6U3BlYzsKIHVzZSBGaWxlOjpUZW1wIHF3KHRlbXBk aXIpOwogdXNlIEZpbmRCaW47Cit1c2UgR2V0b3B0OjpMb25nOwogCiB1c2UgbGliICRGaW5kQmlu OjpCaW47CiB1c2Ugd2Via2l0ZGlyczsKQEAgLTQxLDcgKzQyLDcgQEAgbXkgJG1hY1B5dGhvbk1E NSA9ICI4NDQ4OWJiYTgxM2ZkYmI2MDQxYjY5ZDQzMTBhODZkYSI7CiBteSAkbWFjUHl0aG9uSW5z dGFsbGVyTmFtZSA9ICJQeXRob24ubXBrZyI7CiAKICMgV2UgY291bGQgdXNlIGEgY29uc2lzdGVu dCBkb3dubG9hZCBsb2NhdGlvbiwgbGlrZSB0aGUgc291cmNlIG9yIGJ1aWxkIGRpcmVjdG9yeS4K LW15ICR0ZW1wRGlyZWN0b3J5ID0gRmlsZTo6VGVtcC0+bmV3ZGlyKCk7CitteSAkdGVtcERpcmVj dG9yeSA9IEZpbGU6OlRlbXAtPnRlbXBkaXIoIldlYktpdFB5dGhvblhYWFgiKTsKIG15ICRkb3du bG9hZERpcmVjdG9yeSA9ICR0ZW1wRGlyZWN0b3J5OwogbXkgJG1vdW50UG9pbnQgPSBGaWxlOjpT cGVjLT5qb2luKCR0ZW1wRGlyZWN0b3J5LCAibW91bnQiKTsKIApAQCAtMTE3LDkgKzExOCwyNSBA QCBzdWIgaW5zdGFsbE1hY1B5dGhvbigpCiAKIHN1YiBtYWluKCkKIHsKKyAgICBteSAkY2hlY2tP bmx5ID0gMDsKKyAgICBteSAkc2hvd0hlbHAgPSAwOworICAgIG15ICRnZXRPcHRpb25zUmVzdWx0 ID0gR2V0T3B0aW9ucygKKyAgICAgICAgJ2NoZWNrLW9ubHkhJyA9PiBcJGNoZWNrT25seSwKKyAg ICAgICAgJ2hlbHB8aCcgPT4gXCRzaG93SGVscCwKKyAgICApOworICAgIGlmICghJGdldE9wdGlv bnNSZXN1bHQgfHwgJHNob3dIZWxwKSB7CisgICAgICAgIHByaW50IFNUREVSUiA8PEhFTFA7CitV c2FnZTogJDAgW29wdGlvbnNdCisgIC0tY2hlY2stb25seSAgICAgICAgQ2hlY2sgcHl0aG9uIHZl cnNpb24gb25seS4KKyAgLWh8LS1oZWxwICAgICAgICAgICBTaG93IHRoaXMgaGVscCBtZXNzYWdl LgorSEVMUAorICAgICAgICByZXR1cm4gMTsKKyAgICB9CiAgICAgIyBDb25ncmF0cywgeW91ciBQ eXRob24gaXMgZmluZS4KICAgICByZXR1cm4gMCBpZiBjaGVja1B5dGhvblZlcnNpb24oKTsKLSAg ICAKKworICAgIHJldHVybiAxIGlmICRjaGVja09ubHk7CisKICAgICBpZiAoIWlzVGlnZXIoKSkg ewogICAgICAgICBwcmludCAiWW91ciBQeXRob24gdmVyc2lvbiBpcyBpbnN1ZmljaWVudCB0byBy dW4gV2ViS2l0J3MgUHl0aG9uIGNvZGUuICBQbGVhc2UgdXBkYXRlLlxuIjsKICAgICAgICAgcHJp bnQgIlNlZSBodHRwOi8vdHJhYy53ZWJraXQub3JnL3dpa2kvUHl0aG9uR3VpZGVsaW5lcyBmb3Ig bW9yZSBpbmZvLlxuIjsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvb2xkLXJ1bi13 ZWJraXQtdGVzdHMgYi9XZWJLaXRUb29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzCmlu ZGV4IDc4MzYwNmQ1NGZiYmM5NjI2NjBkZGJiZTRkOTFmOTI1NWU4NjQ5ZjYuLjBjYTUyYzJiOWEx NWFmZjRjNjIwY2YzOTBiNmY4NjY1ZWU5OTE5YzQgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHMKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9vbGQt cnVuLXdlYmtpdC10ZXN0cwpAQCAtNzYsNiArNzYsNyBAQCB1c2UgUE9TSVg7CiAKIHN1YiBidWls ZFBsYXRmb3JtUmVzdWx0SGllcmFyY2h5KCk7CiBzdWIgYnVpbGRQbGF0Zm9ybVRlc3RIaWVyYXJj aHkoQCk7CitzdWIgY2hlY2tQeXRob25WZXJzaW9uKCk7CiBzdWIgY2xvc2VDeWdwYXRocygpOwog c3ViIGNsb3NlRHVtcFRvb2woKTsKIHN1YiBjbG9zZVdlYlNvY2tldFNlcnZlcigpOwpAQCAtMTQ5 LDYgKzE1MCw3IEBAIG15ICRzaG91bGRDaGVja0xlYWtzID0gMDsKIG15ICRzaG93SGVscCA9IDA7 CiBteSAkc3RyaXBFZGl0aW5nQ2FsbGJhY2tzID0gaXNDeWd3aW4oKTsKIG15ICR0ZXN0SFRUUCA9 IDE7CitteSAkdGVzdFdlYlNvY2tldCA9IDE7CiBteSAkdGVzdE1lZGlhID0gMTsKIG15ICR0bXBE aXIgPSAiL3RtcCI7CiBteSAkdGVzdFJlc3VsdHNEaXJlY3RvcnkgPSBGaWxlOjpTcGVjLT5jYXRm aWxlKCR0bXBEaXIsICJsYXlvdXQtdGVzdC1yZXN1bHRzIik7CkBAIC0yMjMsNiArMjI1LDExIEBA IGlmICghZGVmaW5lZCgkcGxhdGZvcm0pKSB7CiAgICAgJHBsYXRmb3JtID0gInVuZGVmaW5lZCI7 CiB9CiAKK2lmICghY2hlY2tQeXRob25WZXJzaW9uKCkpIHsKKyAgICBwcmludCAiV0FSTklORzog WW91ciBwbGF0Zm9ybSBkb2VzIG5vdCBoYXZlIFB5dGhvbiAyLjUrLCB3aGljaCBpcyByZXF1aXJl ZCB0byBydW4gd2Vic29ja2V0IHNlcnZlciwgc28gZGlzYWJsaW5nIHdlYnNvY2tldC90ZXN0cy5c biI7CisgICAgJHRlc3RXZWJTb2NrZXQgPSAwOworfQorCiBteSAkcHJvZ3JhbU5hbWUgPSBiYXNl bmFtZSgkMCk7CiBteSAkbGF1bmNoU2FmYXJpRGVmYXVsdCA9ICRsYXVuY2hTYWZhcmkgPyAibGF1 bmNoIiA6ICJkbyBub3QgbGF1bmNoIjsKIG15ICRodHRwRGVmYXVsdCA9ICR0ZXN0SFRUUCA/ICJy dW4iIDogImRvIG5vdCBydW4iOwpAQCAtNDU0LDYgKzQ2MSw5IEBAIGlmICghJHRlc3RIVFRQKSB7 CiAgICAgJGlnbm9yZWREaXJlY3Rvcmllc3snaHR0cCd9ID0gMTsKICAgICAkaWdub3JlZERpcmVj dG9yaWVzeyd3ZWJzb2NrZXQnfSA9IDE7CiB9CitpZiAoISR0ZXN0V2ViU29ja2V0KSB7CisgICAg JGlnbm9yZWREaXJlY3Rvcmllc3snd2Vic29ja2V0J30gPSAxOworfQogCiBpZiAoISR0ZXN0TWVk aWEpIHsKICAgICAkaWdub3JlZERpcmVjdG9yaWVzeydtZWRpYSd9ID0gMTsKQEAgLTE0MjEsNiAr MTQzMSwxMiBAQCBzdWIgY29uZmlndXJlQW5kT3BlbkhUVFBESWZOZWVkZWQoKQogICAgICRpc0h0 dHBkT3BlbiA9IG9wZW5IVFRQRChAYXJncyk7CiB9CiAKK3N1YiBjaGVja1B5dGhvblZlcnNpb24o KQoreworICAgIGAuL1dlYktpdFRvb2xzL1NjcmlwdHMvZW5zdXJlLXZhbGlkLXB5dGhvbiAtLWNo ZWNrLW9ubHlgOworICAgIHJldHVybiBleGl0U3RhdHVzKCQ/KSA9PSAwOworfQorCiBzdWIgb3Bl bldlYlNvY2tldFNlcnZlcklmTmVlZGVkKCkKIHsKICAgICByZXR1cm4gMSBpZiAkaXNXZWJTb2Nr ZXRTZXJ2ZXJPcGVuOwo= 57738 2010-06-02 23:59:33 -0700 2010-06-08 10:54:00 -0700 Patch bug-39058-20100602235931.patch text/plain 5648 ukai ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0MDEzNzk5MWY2MTlhZDA0ZDZjYjU3MWZkMTk0ZGYxNTIxYjE1MzczLi40ZWQ2Nzgz NDQyMTJmMGFkNGQzMzZhNTljMmJlMDgzN2IyOTdkOGJiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDYtMDIgIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgb2xkLXJ1bi13ZWJraXQt dGVzdHMgc2hvdWxkIHVzZSBlbnN1cmUtdmFsaWQtcHl0aG9uIHRvIGNoZWNrIGlmIGl0IGNhbiBy dW4gdGhlIHdlYnNvY2tldHMgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM5MDU4CisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMtdGlnZXIvU2tp cHBlZDoKKyAgICAgICAgLSByZW1vdmUgd2Vic29ja2V0L3Rlc3RzIGZyb20gc2tpcHBlZCBsaXN0 LgorCiAyMDEwLTA2LTAyICBEYXJpbiBGaXNoZXIgIDxkYXJpbkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQnJhZHkgRWlkc29uLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjLXRpZ2VyL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtdGln ZXIvU2tpcHBlZAppbmRleCA3ZTYyM2JlNGY3YWQwYzAwZTdiZGZlMTFjZGVlNmQ3ZWNlYjQ2ZWZm Li5kNDAwNWYwNjQzZjQxYjM2ZWY5OTI1M2U0OWYwNzc0OWI4MmUyODk4IDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtdGlnZXIvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMtdGlnZXIvU2tpcHBlZApAQCAtMTc1LDkgKzE3NSw2IEBAIGZhc3QvanMvc3B1 dG5pay9Vbmljb2RlCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z ODc0Mwogd2ViYXJjaGl2ZS90ZXN0LWxpbmstcmVsLWljb24uaHRtbAogCi0jIFB5dGhvbiAyLjUg aXMgcmVxdWlyZWQgdG8gcnVuIHdlYnNvY2tldCB0ZXN0cwotd2Vic29ja2V0L3Rlc3RzCi0KICMg SW5kZXhlZERCIGlzIG5vdCB5ZXQgZW5hYmxlZC4KIHN0b3JhZ2UvaW5kZXhlZGRiCiAKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRl eCAzNjgyZjMzZDhjYzc4NDk2OTI3Y2EyMmIxOWI4MWMzODEzMTk1YzgxLi5kZGFiMTVjZTNhNGEz ZWM2NDA3NzI2ODA5YTYxYWFlNGU2Njg2OGMxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFu Z2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAt MDUtMTcgIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgb2xkLXJ1bi13ZWJraXQtdGVzdHMg c2hvdWxkIHVzZSBlbnN1cmUtdmFsaWQtcHl0aG9uIHRvIGNoZWNrIGlmIGl0IGNhbiBydW4gdGhl IHdlYnNvY2tldHMgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTM5MDU4CisKKyAgICAgICAgKiBTY3JpcHRzL2Vuc3VyZS12YWxpZC1weXRob246 CisgICAgICAgICAgLSBQZXJsIDUuOCBkb2Vzbid0IGhhdmUgRmlsZTo6VGVtcC0+bmV3ZGlyKCku ICBVc2UgRmlsZTo6VGVtcC0+dGVtcGRpcigpIGluc3RlYWQuCisgICAgICAgICAgLSBBZGQgLS1j aGVjay1vbmx5IGFuZCAtLWhlbHAgb3B0aW9uLgorICAgICAgICAgIC0gLS1jaGVjay1vbmx5IG9w dGlvbiBvbmx5IGNoZWNrcyBweXRob24gdmVyc2lvbiBhbmQgZG9uJ3QgdHJ5IHRvIGluc3RhbGwg UHl0aG9uIDIuNS4KKyAgICAgICAgICAtIFNldCBleGVjdXRhYmxlIGJpdC4KKyAgICAgICAgKiBT Y3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzOgorICAgICAgICAgIC0gQ2hlY2sgaWYgaXQgY2Fu IHJ1biB0aGUgd2Vic29ja2V0IHRlc3RzIGJ5IGNhbGxpbmcgZW5zdXJlLXZhbGlkLXB5dGhvbiAt LWNoZWNrLW9ubHkuCisKIDIwMTAtMDYtMDIgIERpZWdvIEdvbnphbGV6ICA8ZGllZ29oY2dAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNl bi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvZW5zdXJlLXZhbGlkLXB5dGhvbiBi L1dlYktpdFRvb2xzL1NjcmlwdHMvZW5zdXJlLXZhbGlkLXB5dGhvbgpvbGQgbW9kZSAxMDA2NDQK bmV3IG1vZGUgMTAwNzU1CmluZGV4IGMyMWFkNGU1OGI5NjNjYjc2NGVkYmI4NDJlM2Q2YzQwNDgy NmI1ZGQuLjQxZWNiZDgzYzE0ZTNjNjNiODJjMmEyYWM2OTEwMDhkOGQ0NzllOGQKLS0tIGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy9lbnN1cmUtdmFsaWQtcHl0aG9uCisrKyBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvZW5zdXJlLXZhbGlkLXB5dGhvbgpAQCAtMzEsNiArMzEsNyBAQCB1c2UgRmlsZTo6QmFz ZW5hbWU7CiB1c2UgRmlsZTo6U3BlYzsKIHVzZSBGaWxlOjpUZW1wIHF3KHRlbXBkaXIpOwogdXNl IEZpbmRCaW47Cit1c2UgR2V0b3B0OjpMb25nOwogCiB1c2UgbGliICRGaW5kQmluOjpCaW47CiB1 c2Ugd2Via2l0ZGlyczsKQEAgLTQxLDcgKzQyLDcgQEAgbXkgJG1hY1B5dGhvbk1ENSA9ICI4NDQ4 OWJiYTgxM2ZkYmI2MDQxYjY5ZDQzMTBhODZkYSI7CiBteSAkbWFjUHl0aG9uSW5zdGFsbGVyTmFt ZSA9ICJQeXRob24ubXBrZyI7CiAKICMgV2UgY291bGQgdXNlIGEgY29uc2lzdGVudCBkb3dubG9h ZCBsb2NhdGlvbiwgbGlrZSB0aGUgc291cmNlIG9yIGJ1aWxkIGRpcmVjdG9yeS4KLW15ICR0ZW1w RGlyZWN0b3J5ID0gRmlsZTo6VGVtcC0+bmV3ZGlyKCk7CitteSAkdGVtcERpcmVjdG9yeSA9IEZp bGU6OlRlbXAtPnRlbXBkaXIoIldlYktpdFB5dGhvblhYWFgiKTsKIG15ICRkb3dubG9hZERpcmVj dG9yeSA9ICR0ZW1wRGlyZWN0b3J5OwogbXkgJG1vdW50UG9pbnQgPSBGaWxlOjpTcGVjLT5qb2lu KCR0ZW1wRGlyZWN0b3J5LCAibW91bnQiKTsKIApAQCAtMTE3LDkgKzExOCwyNSBAQCBzdWIgaW5z dGFsbE1hY1B5dGhvbigpCiAKIHN1YiBtYWluKCkKIHsKKyAgICBteSAkY2hlY2tPbmx5ID0gMDsK KyAgICBteSAkc2hvd0hlbHAgPSAwOworICAgIG15ICRnZXRPcHRpb25zUmVzdWx0ID0gR2V0T3B0 aW9ucygKKyAgICAgICAgJ2NoZWNrLW9ubHkhJyA9PiBcJGNoZWNrT25seSwKKyAgICAgICAgJ2hl bHB8aCcgPT4gXCRzaG93SGVscCwKKyAgICApOworICAgIGlmICghJGdldE9wdGlvbnNSZXN1bHQg fHwgJHNob3dIZWxwKSB7CisgICAgICAgIHByaW50IFNUREVSUiA8PEhFTFA7CitVc2FnZTogJDAg W29wdGlvbnNdCisgIC0tY2hlY2stb25seSAgICAgICAgQ2hlY2sgcHl0aG9uIHZlcnNpb24gb25s eS4KKyAgLWh8LS1oZWxwICAgICAgICAgICBTaG93IHRoaXMgaGVscCBtZXNzYWdlLgorSEVMUAor ICAgICAgICByZXR1cm4gMTsKKyAgICB9CiAgICAgIyBDb25ncmF0cywgeW91ciBQeXRob24gaXMg ZmluZS4KICAgICByZXR1cm4gMCBpZiBjaGVja1B5dGhvblZlcnNpb24oKTsKLSAgICAKKworICAg IHJldHVybiAxIGlmICRjaGVja09ubHk7CisKICAgICBpZiAoIWlzVGlnZXIoKSkgewogICAgICAg ICBwcmludCAiWW91ciBQeXRob24gdmVyc2lvbiBpcyBpbnN1ZmljaWVudCB0byBydW4gV2ViS2l0 J3MgUHl0aG9uIGNvZGUuICBQbGVhc2UgdXBkYXRlLlxuIjsKICAgICAgICAgcHJpbnQgIlNlZSBo dHRwOi8vdHJhYy53ZWJraXQub3JnL3dpa2kvUHl0aG9uR3VpZGVsaW5lcyBmb3IgbW9yZSBpbmZv LlxuIjsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVz dHMgYi9XZWJLaXRUb29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzCmluZGV4IDAyYzkw NjgzY2M5ZjYyYTUwZDBmZWU0OWMxY2FlZGQwODgxOTQzZjguLjRiZTlmMzU1YjQ4ZWMxMGYwNTdh ZTY1NWMzZDVjNWQ3MDg0MDE2ZTIgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvb2xk LXJ1bi13ZWJraXQtdGVzdHMKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtp dC10ZXN0cwpAQCAtNzYsNiArNzYsNyBAQCB1c2UgUE9TSVg7CiAKIHN1YiBidWlsZFBsYXRmb3Jt UmVzdWx0SGllcmFyY2h5KCk7CiBzdWIgYnVpbGRQbGF0Zm9ybVRlc3RIaWVyYXJjaHkoQCk7Citz dWIgY2hlY2tQeXRob25WZXJzaW9uKCk7CiBzdWIgY2xvc2VDeWdwYXRocygpOwogc3ViIGNsb3Nl RHVtcFRvb2woKTsKIHN1YiBjbG9zZVdlYlNvY2tldFNlcnZlcigpOwpAQCAtMTQ5LDYgKzE1MCw3 IEBAIG15ICRzaG91bGRDaGVja0xlYWtzID0gMDsKIG15ICRzaG93SGVscCA9IDA7CiBteSAkc3Ry aXBFZGl0aW5nQ2FsbGJhY2tzID0gaXNDeWd3aW4oKTsKIG15ICR0ZXN0SFRUUCA9IDE7CitteSAk dGVzdFdlYlNvY2tldCA9IDE7CiBteSAkdGVzdE1lZGlhID0gMTsKIG15ICR0bXBEaXIgPSAiL3Rt cCI7CiBteSAkdGVzdFJlc3VsdHNEaXJlY3RvcnkgPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCR0bXBE aXIsICJsYXlvdXQtdGVzdC1yZXN1bHRzIik7CkBAIC0yMjQsNiArMjI2LDExIEBAIGlmICghZGVm aW5lZCgkcGxhdGZvcm0pKSB7CiAgICAgJHBsYXRmb3JtID0gInVuZGVmaW5lZCI7CiB9CiAKK2lm ICghY2hlY2tQeXRob25WZXJzaW9uKCkpIHsKKyAgICBwcmludCAiV0FSTklORzogWW91ciBwbGF0 Zm9ybSBkb2VzIG5vdCBoYXZlIFB5dGhvbiAyLjUrLCB3aGljaCBpcyByZXF1aXJlZCB0byBydW4g d2Vic29ja2V0IHNlcnZlciwgc28gZGlzYWJsaW5nIHdlYnNvY2tldC90ZXN0cy5cbiI7CisgICAg JHRlc3RXZWJTb2NrZXQgPSAwOworfQorCiBteSAkcHJvZ3JhbU5hbWUgPSBiYXNlbmFtZSgkMCk7 CiBteSAkbGF1bmNoU2FmYXJpRGVmYXVsdCA9ICRsYXVuY2hTYWZhcmkgPyAibGF1bmNoIiA6ICJk byBub3QgbGF1bmNoIjsKIG15ICRodHRwRGVmYXVsdCA9ICR0ZXN0SFRUUCA/ICJydW4iIDogImRv IG5vdCBydW4iOwpAQCAtNDU3LDYgKzQ2NCw5IEBAIGlmICghJHRlc3RIVFRQKSB7CiAgICAgJGln bm9yZWREaXJlY3Rvcmllc3snaHR0cCd9ID0gMTsKICAgICAkaWdub3JlZERpcmVjdG9yaWVzeyd3 ZWJzb2NrZXQnfSA9IDE7CiB9CitpZiAoISR0ZXN0V2ViU29ja2V0KSB7CisgICAgJGlnbm9yZWRE aXJlY3Rvcmllc3snd2Vic29ja2V0J30gPSAxOworfQogCiBpZiAoISR0ZXN0TWVkaWEpIHsKICAg ICAkaWdub3JlZERpcmVjdG9yaWVzeydtZWRpYSd9ID0gMTsKQEAgLTE0MjYsNiArMTQzNiwxMiBA QCBzdWIgY29uZmlndXJlQW5kT3BlbkhUVFBESWZOZWVkZWQoKQogICAgICRpc0h0dHBkT3BlbiA9 IG9wZW5IVFRQRChAYXJncyk7CiB9CiAKK3N1YiBjaGVja1B5dGhvblZlcnNpb24oKQoreworICAg IGAuL1dlYktpdFRvb2xzL1NjcmlwdHMvZW5zdXJlLXZhbGlkLXB5dGhvbiAtLWNoZWNrLW9ubHlg OworICAgIHJldHVybiBleGl0U3RhdHVzKCQ/KSA9PSAwOworfQorCiBzdWIgb3BlbldlYlNvY2tl dFNlcnZlcklmTmVlZGVkKCkKIHsKICAgICByZXR1cm4gMSBpZiAkaXNXZWJTb2NrZXRTZXJ2ZXJP cGVuOwo= 58125 2010-06-08 02:41:59 -0700 2010-06-08 10:53:34 -0700 Patch bug-39058-20100608024157.patch text/plain 1304 ukai ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAwYjZkNzdhZmJiZTJjZWQ4OTA5ODcyYTljY2EwNGM3Y2ZlYzE4MmE5Li5lZmIwZjc4 ZWQ0OTRlNjNiMzE1OGVmYTU0YzUyOTM4NThlY2FjYmE4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAK KzIwMTAtMDYtMDggIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgb2xkLXJ1bi13ZWJraXQt dGVzdHMgc2hvdWxkIHVzZSBlbnN1cmUtdmFsaWQtcHl0aG9uIHRvIGNoZWNrIGlmIGl0IGNhbiBy dW4gdGhlIHdlYnNvY2tldHMgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM5MDU4CisKKyAgICAgICAgKiBTY3JpcHRzL29sZC1ydW4td2Via2l0 LXRlc3RzOgorICAgICAgICAgdXNlIHNvdXJjZURpcigpIHRvIGZpbmQgZW5zdXJlLXZhbGlkLXB5 dGhvbiBpbiBjaGVja1B5dGhvblZlcnNpb24oKQorCiAyMDEwLTA2LTA3ICBNYXJ0aW4gUm9iaW5z b24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIg SHVudC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVz dHMgYi9XZWJLaXRUb29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzCmluZGV4IGI2ZTE4 Yjc3YWNkNDA4YWRjZjk4ZTIxYWFhYmIzNzhiOGUwMDI2YWQuLmEyNWEyNGQyYmE5ZjcwNjA5YmYw MTNmYzU5ZmQxODhlODRmMjI2NDMgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvb2xk LXJ1bi13ZWJraXQtdGVzdHMKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtp dC10ZXN0cwpAQCAtMTQzOCw3ICsxNDM4LDggQEAgc3ViIGNvbmZpZ3VyZUFuZE9wZW5IVFRQRElm TmVlZGVkKCkKIAogc3ViIGNoZWNrUHl0aG9uVmVyc2lvbigpCiB7Ci0gICAgc3lzdGVtICJXZWJL aXRUb29scy9TY3JpcHRzL2Vuc3VyZS12YWxpZC1weXRob24iLCAiLS1jaGVjay1vbmx5IjsKKyAg ICAjIHdlIGhhdmUgbm90IGNoZGlyIHRvIHNvdXJjZURpciB5ZXQuCisgICAgc3lzdGVtIHNvdXJj ZURpcigpIC4gIi9XZWJLaXRUb29scy9TY3JpcHRzL2Vuc3VyZS12YWxpZC1weXRob24iLCAiLS1j aGVjay1vbmx5IjsKICAgICByZXR1cm4gZXhpdFN0YXR1cygkPykgPT0gMDsKIH0KIAo=