60438 2011-05-07 10:15:37 -0700 Remove references to Tiger in scripts 2011-05-07 19:57:56 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 psolanki psolanki abarth dbates ddkilzer eric mrowe psolanki simon.fraser webkit.review.bot oldest_to_newest 400080 0 psolanki 2011-05-07 10:15:37 -0700 We have a number of places in the Scripts directory where we use isTiger() to check for MacOSX Tiger. We can now remove those. 400084 1 92693 psolanki 2011-05-07 10:19:26 -0700 Created attachment 92693 Patch 400090 2 92693 eric 2011-05-07 12:08:43 -0700 Comment on attachment 92693 Patch Yay! Thank you! 400094 3 psolanki 2011-05-07 12:57:18 -0700 Committed r86007 :<http://trac.webkit.org/changeset/86007> 400110 4 simon.fraser 2011-05-07 15:24:18 -0700 This broke a bunch of bots. 400117 5 dbates 2011-05-07 16:10:52 -0700 (In reply to comment #4) > This broke a bunch of bots. Committed attempt to fix the build in changeset 86009 <http://trac.webkit.org/changeset/86009>; remove some more references to isTiger(). 400118 6 webkit.review.bot 2011-05-07 16:10:59 -0700 http://trac.webkit.org/changeset/86007 might have broken Leopard Intel Debug (Tests) 400187 7 psolanki 2011-05-07 19:57:56 -0700 Oops. Sorry. I didn't think old-run-webkit-tests was used. Thanks for fixing this Daniel. 92693 2011-05-07 10:19:26 -0700 2011-05-07 12:08:43 -0700 Patch bug-60438-20110507101925.patch text/plain 10094 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogODYwMDYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4MDdmYTdkY2E2ZWVjNDIyN2JiYTQ1YTExZjNkNDRlZWY4 MzMxMGQ2Li5kMDVhNDcyZTMyOGY4NzI5NjlkMGNiZTYzNzA3NTk3YjNkMjMzNjNiIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDUtMDcgIFByYXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSByZWZl cmVuY2VzIHRvIFRpZ2VyIGluIHNjcmlwdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTYwNDM4CisKKyAgICAgICAgUmVtb3ZlIGlzVGlnZXIoKSBhbmQg YWxsIG9mIHRoZSBjb2RlIHRoYXQgZGVwZW5kcyBvbiBpdC4KKworICAgICAgICAqIFNjcmlwdHMv YnVpbGQtd2Via2l0OgorICAgICAgICAqIFNjcmlwdHMvZW5zdXJlLXZhbGlkLXB5dGhvbjoKKyAg ICAgICAgKiBTY3JpcHRzL2dkYi1zYWZhcmk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJz LnBtOgorCiAyMDExLTA1LTA2ICBEYXZpZCBHcm9nYW4gIDxkZ3JvZ2FuQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvYnVpbGQtd2Via2l0IGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKaW5kZXggYzIy MjcyYTc3MTdhM2FhNmRhM2IyN2JjMjc0Njc2OTg3NTFiYmRkNS4uMmY2Zjg0NTQ5ZmY2YTBlNDRi NGFjZTFhYzdkOWIwMTljOTE4ODg5NCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9idWlsZC13 ZWJraXQKKysrIGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKQEAgLTEyOCwxMCArMTI4LDEw IEBAIG15ICgKIAogbXkgQGZlYXR1cmVzID0gKAogICAgIHsgb3B0aW9uID0+ICIzZC1jYW52YXMi LCBkZXNjID0+ICJUb2dnbGUgM0QgY2FudmFzIChXZWJHTCkgc3VwcG9ydCIsCi0gICAgICBkZWZp bmUgPT4gIkVOQUJMRV9XRUJHTCIsIGRlZmF1bHQgPT4gKGlzQXBwbGVNYWNXZWJLaXQoKSAmJiAh aXNUaWdlcigpICYmICFpc0xlb3BhcmQoKSksIHZhbHVlID0+IFwkdGhyZWVEQ2FudmFzU3VwcG9y dCB9LAorICAgICAgZGVmaW5lID0+ICJFTkFCTEVfV0VCR0wiLCBkZWZhdWx0ID0+IChpc0FwcGxl TWFjV2ViS2l0KCkgJiYgIWlzTGVvcGFyZCgpKSwgdmFsdWUgPT4gXCR0aHJlZURDYW52YXNTdXBw b3J0IH0sCiAKICAgICB7IG9wdGlvbiA9PiAiM2QtcmVuZGVyaW5nIiwgZGVzYyA9PiAiVG9nZ2xl IDNEIHJlbmRlcmluZyBzdXBwb3J0IiwKLSAgICAgIGRlZmluZSA9PiAiRU5BQkxFXzNEX1JFTkRF UklORyIsIGRlZmF1bHQgPT4gKGlzQXBwbGVNYWNXZWJLaXQoKSAmJiAhaXNUaWdlcigpKSwgdmFs dWUgPT4gXCR0aHJlZURSZW5kZXJpbmdTdXBwb3J0IH0sCisgICAgICBkZWZpbmUgPT4gIkVOQUJM RV8zRF9SRU5ERVJJTkciLCBkZWZhdWx0ID0+IGlzQXBwbGVNYWNXZWJLaXQoKSwgdmFsdWUgPT4g XCR0aHJlZURSZW5kZXJpbmdTdXBwb3J0IH0sCiAKICAgICB7IG9wdGlvbiA9PiAiYWNjZWxlcmF0 ZWQtMmQtY2FudmFzIiwgZGVzYyA9PiAiVG9nZ2xlIGFjY2VsZXJhdGVkIDJEIGNhbnZhcyBzdXBw b3J0IiwKICAgICAgIGRlZmluZSA9PiAiRU5BQkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZBUyIsIGRl ZmF1bHQgPT4gMCwgdmFsdWUgPT4gXCRhY2NlbGVyYXRlZDJkQ2FudmFzU3VwcG9ydCB9LApkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9lbnN1cmUtdmFsaWQtcHl0aG9uIGIvVG9vbHMvU2NyaXB0 cy9lbnN1cmUtdmFsaWQtcHl0aG9uCmluZGV4IGFlZGU4MTI5NjY2ZDUxZjEwYzljYzRjZDdiZWVi YzJjYjU4ZDQ0NzQuLmIzNjE2NDFlYThiMzM3NGQ5NjMxODNiYThkMDA3MGFkZDY1NDNjZGQgMTAw NzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvZW5zdXJlLXZhbGlkLXB5dGhvbgorKysgYi9Ub29scy9T Y3JpcHRzL2Vuc3VyZS12YWxpZC1weXRob24KQEAgLTI3LDkgKzI3LDYgQEAKIAogdXNlIHN0cmlj dDsKIAotdXNlIEZpbGU6OkJhc2VuYW1lOwotdXNlIEZpbGU6OlNwZWM7Ci11c2UgRmlsZTo6VGVt cCBxdyh0ZW1wZGlyKTsKIHVzZSBGaW5kQmluOwogdXNlIEdldG9wdDo6TG9uZzsKIApAQCAtMzcs MTUgKzM0LDYgQEAgdXNlIGxpYiAkRmluZEJpbjo6QmluOwogdXNlIHdlYmtpdGRpcnM7CiB1c2Ug VkNTVXRpbHM7CiAKLW15ICRtYWNQeXRob25VUkwgPSAiaHR0cDovL3d3dy5weXRob24ub3JnL2Z0 cC9weXRob24vMi42LjUvcHl0aG9uLTIuNi41LW1hY29zeDEwLjMtMjAxMC0wMy0yNC5kbWciOwot bXkgJG1hY1B5dGhvbk1ENSA9ICI4NDQ4OWJiYTgxM2ZkYmI2MDQxYjY5ZDQzMTBhODZkYSI7Ci1t eSAkbWFjUHl0aG9uSW5zdGFsbGVyTmFtZSA9ICJQeXRob24ubXBrZyI7Ci0KLSMgV2UgY291bGQg dXNlIGEgY29uc2lzdGVudCBkb3dubG9hZCBsb2NhdGlvbiwgbGlrZSB0aGUgc291cmNlIG9yIGJ1 aWxkIGRpcmVjdG9yeS4KLW15ICR0ZW1wRGlyZWN0b3J5ID0gRmlsZTo6VGVtcDo6dGVtcGRpcigi V2ViS2l0UHl0aG9uWFhYWCIsIFRNUERJUiA9PiAxLCBDTEVBTlVQID0+IDEpOwotbXkgJGRvd25s b2FkRGlyZWN0b3J5ID0gJHRlbXBEaXJlY3Rvcnk7Ci1teSAkbW91bnRQb2ludCA9IEZpbGU6OlNw ZWMtPmpvaW4oJHRlbXBEaXJlY3RvcnksICJtb3VudCIpOwotCiBzdWIgY2hlY2tQeXRob25WZXJz aW9uKCkKIHsKICAgICAjIFdpbGwgZXhpdCAwIGlmIFB5dGhvbiBpcyAyLjUgb3IgZ3JlYXRlciwg bm9uLXplcm8gb3RoZXJ3aXNlLgpAQCAtNTMsNjkgKzQxLDYgQEAgc3ViIGNoZWNrUHl0aG9uVmVy c2lvbigpCiAgICAgcmV0dXJuIGV4aXRTdGF0dXMoJD8pID09IDA7CiB9CiAKLXN1YiBkb3dubG9h ZEZpbGVUb1BhdGgoJCQpCi17Ci0gICAgbXkgKCRyZW1vdGVVUkwsICRsb2NhbFBhdGgpID0gQF87 Ci0gICAgcHJpbnQgIkRvd25sb2FkaW5nICRyZW1vdGVVUkwgdG8gJGxvY2FsUGF0aFxuIjsKLSAg ICBteSAkZXhpdENvZGUgPSBzeXN0ZW0oImN1cmwiLCAiLW8iLCAkbG9jYWxQYXRoLCAkcmVtb3Rl VVJMKTsKLSAgICByZXR1cm4gZXhpdFN0YXR1cygkZXhpdENvZGUpID09IDA7Ci19Ci0KLXN1YiBj aGVja01ENSgkJCkKLXsKLSAgICBteSAoJHBhdGgsICRleHBlY3RlZE1ENSkgPSBAXzsKLSAgICBt eSAkbWQ1T3V0cHV0ID0gYG1kNSAtcSAiJHBhdGgiYDsKLSAgICBjaG9tcCgkbWQ1T3V0cHV0KTsK LSAgICBteSAkaXNWYWxpZCA9ICRtZDVPdXRwdXQgZXEgJGV4cGVjdGVkTUQ1OwotICAgIHByaW50 ICInJG1kNU91dHB1dCcgZG9lcyBub3QgbWF0Y2ggZXhwZWN0ZWQ6ICckZXhwZWN0ZWRNRDUnXG4i IHVubGVzcyAkaXNWYWxpZDsKLSAgICByZXR1cm4gJGlzVmFsaWQ7Ci19Ci0KLXN1YiBtb3VudERN RygkJCkKLXsKLSAgICBteSAoJGRtZ1BhdGgsICRtb3VudFBvaW50KSA9IEBfOwotICAgIHByaW50 ICJNb3VudGluZyAkZG1nUGF0aCBhdCAkbW91bnRQb2ludFxuIjsKLSAgICByZXR1cm4gc3lzdGVt KCJoZGl1dGlsIiwgImF0dGFjaCIsICItbW91bnRwb2ludCIsICRtb3VudFBvaW50LCAiLW5vYnJv d3NlIiwgJGRtZ1BhdGgpID09IDA7Ci19Ci0KLXN1YiB1bm1vdW50RE1HKCQpCi17Ci0gICAgbXkg KCRtb3VudFBvaW50KSA9IEBfOwotICAgIHByaW50ICJVbm1vdW50aW5nIGRpc2sgaW1hZ2UgZnJv bSAkbW91bnRQb2ludFxuIjsKLSAgICBteSAkZXhpdENvZGUgPSBzeXN0ZW0oImhkaXV0aWwiLCAi ZGV0YWNoIiwgJG1vdW50UG9pbnQpOwotICAgIHJldHVybiBleGl0U3RhdHVzKCRleGl0Q29kZSkg PT0gMDsKLX0KLQotc3ViIHJ1bkluc3RhbGxlcigkKQotewotICAgIG15ICgkaW5zdGFsbGVyUGFj a2FnZSkgPSBAXzsKLSAgICBwcmludCAic3VkbyB3aWxsIG5vdyBhc2sgZm9yIHlvdXIgcGFzc3dv cmQgdG8gcnVuIHRoZSBQeXRob24gaW5zdGFsbGVyLlxuIjsKLSAgICBwcmludCAiVGhlIGluc3Rh bGxlciB3aWxsIGluc3RhbGwgUHl0aG9uIGluIC9MaWJyYXJ5L0ZyYW1ld29ya3MvUHl0aG9uLmZy YW1ld29ya1xuIjsKLSAgICBwcmludCAiYW5kIGFkZCBzeW1saW5rcyBmcm9tIC91c3IvbG9jYWwv YmluLlxuIjsKLSAgICByZXR1cm4gc3lzdGVtKCJzdWRvIiwgImluc3RhbGxlciIsICItdmVyYm9z ZSIsICItcGtnIiwgJGluc3RhbGxlclBhY2thZ2UsICItdGFyZ2V0IiwgIi8iKSA9PSAwOwotfQot Ci1zdWIgZG93bmxvYWRBbmRNb3VudE1hY1B5dGhvbkRNRygkJCkKLXsKLSAgICBteSAoJHB5dGhv blVSTCwgJHB5dGhvbk1ENSkgPSBAXzsKLSAgICBteSAkbG9jYWxGaWxlbmFtZSA9IGJhc2VuYW1l KCRweXRob25VUkwpOwotICAgIG15ICRsb2NhbFBhdGggPSBGaWxlOjpTcGVjLT5qb2luKCRkb3du bG9hZERpcmVjdG9yeSwgJGxvY2FsRmlsZW5hbWUpOwotICAgIAotICAgIGRvd25sb2FkRmlsZVRv UGF0aCgkcHl0aG9uVVJMLCAkbG9jYWxQYXRoKSBvciBkaWUgIkZhaWxlZCB0byBkb3dubG9hZCAk cHl0aG9uVVJMIjsKLSAgICBjaGVja01ENSgkbG9jYWxQYXRoLCAkcHl0aG9uTUQ1KSBvciBkaWUg Ik1ENSBjaGVjayBmYWlsZWQgb24gJGxvY2FsUGF0aCI7Ci0gICAgcmV0dXJuIG1vdW50RE1HKCRs b2NhbFBhdGgsICRtb3VudFBvaW50KTsKLX0KLQotc3ViIGluc3RhbGxNYWNQeXRob24oKQotewot ICAgIGRvd25sb2FkQW5kTW91bnRNYWNQeXRob25ETUcoJG1hY1B5dGhvblVSTCwgJG1hY1B5dGhv bk1ENSkgb3IgZGllICJGYWlsZWQgdG8gZG93bmxvYWQgYW5kIG1vdW50IGRpc2sgaW1hZ2UuIjsK LSAgICBwcmludCAiTW91bnRlZCBweXRob24gaW5zdGFsbCBpbWFnZSBhdDogJG1vdW50UG9pbnRc biI7Ci0gICAgbXkgJGluc3RhbGxlclBhY2thZ2UgPSBGaWxlOjpTcGVjLT5qb2luKCRtb3VudFBv aW50LCAkbWFjUHl0aG9uSW5zdGFsbGVyTmFtZSk7Ci0gICAgbXkgJGluc3RhbGxTdWNjZXNzID0g cnVuSW5zdGFsbGVyKCRpbnN0YWxsZXJQYWNrYWdlKTsKLSAgICB1bm1vdW50RE1HKCRtb3VudFBv aW50KSBvciBkaWUgIkZhaWxlZCB0byB1bm1vdW50IGRpc2sgaW1hZ2UgZnJvbSAkbW91bnRQb2lu dCI7Ci0gICAgcmV0dXJuICRpbnN0YWxsU3VjY2VzczsKLX0KLQogc3ViIG1haW4oKQogewogICAg IG15ICRjaGVja09ubHkgPSAwOwpAQCAtMTM3LDE2ICs2Miw5IEBAIEhFTFAKIAogICAgIHJldHVy biAxIGlmICRjaGVja09ubHk7CiAKLSAgICBpZiAoIWlzVGlnZXIoKSkgewotICAgICAgICBwcmlu dCAiWW91ciBQeXRob24gdmVyc2lvbiBpcyBpbnN1ZmZpY2llbnQgdG8gcnVuIFdlYktpdCdzIFB5 dGhvbiBjb2RlLiAgUGxlYXNlIHVwZGF0ZS5cbiI7Ci0gICAgICAgIHByaW50ICJTZWUgaHR0cDov L3RyYWMud2Via2l0Lm9yZy93aWtpL1B5dGhvbkd1aWRlbGluZXMgZm9yIG1vcmUgaW5mby5cbiI7 Ci0gICAgICAgIHJldHVybiAxOwotICAgIH0KLQotICAgIGluc3RhbGxNYWNQeXRob24oKSBvciBk aWUgIkZhaWxlZCB0byBpbnN0YWxsIFB5dGhvbi4iOwotCi0gICAgY2hlY2tQeXRob25WZXJzaW9u KCkgb3IgZGllICJGaW5hbCB2ZXJzaW9uIGNoZWNrIGZhaWxlZCwgbXVzdCBoYXZlIGZhaWxlZCB0 byB1cGRhdGUgUHl0aG9uIjsKLSAgICBwcmludCAiU3VjY2Vzc2Z1bGx5IHVwZGF0ZWQgcHl0aG9u LlxuIjsKKyAgICBwcmludCAiWW91ciBQeXRob24gdmVyc2lvbiBpcyBpbnN1ZmZpY2llbnQgdG8g cnVuIFdlYktpdCdzIFB5dGhvbiBjb2RlLiAgUGxlYXNlIHVwZGF0ZS5cbiI7CisgICAgcHJpbnQg IlNlZSBodHRwOi8vdHJhYy53ZWJraXQub3JnL3dpa2kvUHl0aG9uR3VpZGVsaW5lcyBmb3IgbW9y ZSBpbmZvLlxuIjsKKyAgICByZXR1cm4gMTsKIH0KIAogZXhpdChtYWluKCkpOwpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy9nZGItc2FmYXJpIGIvVG9vbHMvU2NyaXB0cy9nZGItc2FmYXJpCmlu ZGV4IDBjNTViZDM1MTdjNDhkOTZjNzY1NzUxZTYxNzg5YzRmMDI1OTY2NGIuLmM0YTZlMTEzMTNi NGVmY2YxYTBkZDEyNDY1ZTkwNjIyMWQxNzA2ZWQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv Z2RiLXNhZmFyaQorKysgYi9Ub29scy9TY3JpcHRzL2dkYi1zYWZhcmkKQEAgLTQ5LDUgKzQ5LDUg QEAgJEVOVntEWUxEX0ZSQU1FV09SS19QQVRIfSA9ICRwcm9kdWN0RGlyOwogJEVOVntXRUJLSVRf VU5TRVRfRFlMRF9GUkFNRVdPUktfUEFUSH0gPSAnWUVTJzsKIAogcHJpbnQgIlN0YXJ0aW5nIFNh ZmFyaSB1bmRlciBnZGIgd2l0aCBEWUxEX0ZSQU1FV09SS19QQVRIIHNldCB0byBwb2ludCB0byBi dWlsdCBXZWJLaXQgaW4gJHByb2R1Y3REaXIuXG4iOwotbXkgQGFyY2hpdGVjdHVyZUZsYWdzID0g KCItYXJjaCIsIGFyY2hpdGVjdHVyZSgpKSBpZiAhaXNUaWdlcigpOworbXkgQGFyY2hpdGVjdHVy ZUZsYWdzID0gKCItYXJjaCIsIGFyY2hpdGVjdHVyZSgpKTsKIGV4ZWMgJGdkYlBhdGgsIEBhcmNo aXRlY3R1cmVGbGFncywgIi0tYXJnIiwgJHNhZmFyaVBhdGgsIEBBUkdWIG9yIGRpZTsKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQppbmRleCBiMDA3OGIwNDE3MzhhN2Y1MTg2ZTk1NjE0YzA3NzUxZDQ4MDUyYTljLi4z M2U5MDY2MTljNjVmMjQ0MTgxNzY5YWQwMTc2ZTI5OTQ0OGE2NzFlIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt CkBAIC0yMjYsNyArMjI2LDcgQEAgc3ViIGRldGVybWluZUFyY2hpdGVjdHVyZQogICAgIGlmICgk YXJjaGl0ZWN0dXJlKSB7CiAgICAgICAgIGNob21wICRhcmNoaXRlY3R1cmU7CiAgICAgfSBlbHNl IHsKLSAgICAgICAgaWYgKGlzVGlnZXIoKSBvciBpc0xlb3BhcmQoKSkgeworICAgICAgICBpZiAo aXNMZW9wYXJkKCkpIHsKICAgICAgICAgICAgICRhcmNoaXRlY3R1cmUgPSBgYXJjaGA7CiAgICAg ICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBteSAkc3VwcG9ydHM2NEJpdCA9IGBzeXNjdGwgLW4g aHcub3B0aW9uYWwueDg2XzY0YDsKQEAgLTEwMTQsMTEgKzEwMTQsNiBAQCBzdWIgb3NYVmVyc2lv bigpCiAgICAgcmV0dXJuICRvc1hWZXJzaW9uOwogfQogCi1zdWIgaXNUaWdlcigpCi17Ci0gICAg cmV0dXJuIGlzRGFyd2luKCkgJiYgb3NYVmVyc2lvbigpLT57Im1pbm9yIn0gPT0gNDsKLX0KLQog c3ViIGlzTGVvcGFyZCgpCiB7CiAgICAgcmV0dXJuIGlzRGFyd2luKCkgJiYgb3NYVmVyc2lvbigp LT57Im1pbm9yIn0gPT0gNTsKQEAgLTE5MTAsNyArMTkwNSw3IEBAIHN1YiBydW5TYWZhcmkKICAg ICAgICAgcHJpbnQgIlN0YXJ0aW5nIFNhZmFyaSB3aXRoIERZTERfRlJBTUVXT1JLX1BBVEggc2V0 IHRvIHBvaW50IHRvIGJ1aWx0IFdlYktpdCBpbiAkcHJvZHVjdERpci5cbiI7CiAgICAgICAgICRF TlZ7RFlMRF9GUkFNRVdPUktfUEFUSH0gPSAkcHJvZHVjdERpcjsKICAgICAgICAgJEVOVntXRUJL SVRfVU5TRVRfRFlMRF9GUkFNRVdPUktfUEFUSH0gPSAiWUVTIjsKLSAgICAgICAgaWYgKCFpc1Rp Z2VyKCkgJiYgYXJjaGl0ZWN0dXJlKCkpIHsKKyAgICAgICAgaWYgKGFyY2hpdGVjdHVyZSgpKSB7 CiAgICAgICAgICAgICByZXR1cm4gc3lzdGVtICJhcmNoIiwgIi0iIC4gYXJjaGl0ZWN0dXJlKCks IHNhZmFyaVBhdGgoKSwgQEFSR1Y7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICByZXR1 cm4gc3lzdGVtIHNhZmFyaVBhdGgoKSwgQEFSR1Y7CkBAIC0xOTQzLDcgKzE5MzgsNyBAQCBzdWIg cnVuTWluaUJyb3dzZXIKICAgICAgICAgJEVOVntEWUxEX0ZSQU1FV09SS19QQVRIfSA9ICRwcm9k dWN0RGlyOwogICAgICAgICAkRU5We1dFQktJVF9VTlNFVF9EWUxEX0ZSQU1FV09SS19QQVRIfSA9 ICJZRVMiOwogICAgICAgICBteSAkbWluaUJyb3dzZXJQYXRoID0gIiRwcm9kdWN0RGlyL01pbmlC cm93c2VyLmFwcC9Db250ZW50cy9NYWNPUy9NaW5pQnJvd3NlciI7Ci0gICAgICAgIGlmICghaXNU aWdlcigpICYmIGFyY2hpdGVjdHVyZSgpKSB7CisgICAgICAgIGlmIChhcmNoaXRlY3R1cmUoKSkg ewogICAgICAgICAgICAgcmV0dXJuIHN5c3RlbSAiYXJjaCIsICItIiAuIGFyY2hpdGVjdHVyZSgp LCAkbWluaUJyb3dzZXJQYXRoLCBAQVJHVjsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg IHJldHVybiBzeXN0ZW0gJG1pbmlCcm93c2VyUGF0aCwgQEFSR1Y7CkBAIC0xOTY3LDcgKzE5NjIs NyBAQCBzdWIgZGVidWdNaW5pQnJvd3NlcgogICAgICAgICBteSAkbWluaUJyb3dzZXJQYXRoID0g IiRwcm9kdWN0RGlyL01pbmlCcm93c2VyLmFwcC9Db250ZW50cy9NYWNPUy9NaW5pQnJvd3NlciI7 CiAKICAgICAgICAgcHJpbnQgIlN0YXJ0aW5nIE1pbmlCcm93c2VyIHVuZGVyIGdkYiB3aXRoIERZ TERfRlJBTUVXT1JLX1BBVEggc2V0IHRvIHBvaW50IHRvIGJ1aWx0IFdlYktpdDIgaW4gJHByb2R1 Y3REaXIuXG4iOwotICAgICAgICBteSBAYXJjaGl0ZWN0dXJlRmxhZ3MgPSAoIi1hcmNoIiwgYXJj aGl0ZWN0dXJlKCkpIGlmICFpc1RpZ2VyKCk7CisgICAgICAgIG15IEBhcmNoaXRlY3R1cmVGbGFn cyA9ICgiLWFyY2giLCBhcmNoaXRlY3R1cmUoKSk7CiAgICAgICAgIGV4ZWMgJGdkYlBhdGgsIEBh cmNoaXRlY3R1cmVGbGFncywgJG1pbmlCcm93c2VyUGF0aCBvciBkaWU7CiAgICAgICAgIHJldHVy bjsKICAgICB9CkBAIC0xOTgzLDcgKzE5NzgsNyBAQCBzdWIgcnVuV2ViS2l0VGVzdFJ1bm5lcgog ICAgICAgICAkRU5We0RZTERfRlJBTUVXT1JLX1BBVEh9ID0gJHByb2R1Y3REaXI7CiAgICAgICAg ICRFTlZ7V0VCS0lUX1VOU0VUX0RZTERfRlJBTUVXT1JLX1BBVEh9ID0gIllFUyI7CiAgICAgICAg IG15ICR3ZWJLaXRUZXN0UnVubmVyUGF0aCA9ICIkcHJvZHVjdERpci9XZWJLaXRUZXN0UnVubmVy IjsKLSAgICAgICAgaWYgKCFpc1RpZ2VyKCkgJiYgYXJjaGl0ZWN0dXJlKCkpIHsKKyAgICAgICAg aWYgKGFyY2hpdGVjdHVyZSgpKSB7CiAgICAgICAgICAgICByZXR1cm4gc3lzdGVtICJhcmNoIiwg Ii0iIC4gYXJjaGl0ZWN0dXJlKCksICR3ZWJLaXRUZXN0UnVubmVyUGF0aCwgQEFSR1Y7CiAgICAg ICAgIH0gZWxzZSB7CiAgICAgICAgICAgICByZXR1cm4gc3lzdGVtICR3ZWJLaXRUZXN0UnVubmVy UGF0aCwgQEFSR1Y7CkBAIC0yMDA2LDcgKzIwMDEsNyBAQCBzdWIgZGVidWdXZWJLaXRUZXN0UnVu bmVyCiAgICAgICAgIG15ICR3ZWJLaXRUZXN0UnVubmVyUGF0aCA9ICIkcHJvZHVjdERpci9XZWJL aXRUZXN0UnVubmVyIjsKIAogICAgICAgICBwcmludCAiU3RhcnRpbmcgV2ViS2l0VGVzdFJ1bm5l ciB1bmRlciBnZGIgd2l0aCBEWUxEX0ZSQU1FV09SS19QQVRIIHNldCB0byBwb2ludCB0byAkcHJv ZHVjdERpci5cbiI7Ci0gICAgICAgIG15IEBhcmNoaXRlY3R1cmVGbGFncyA9ICgiLWFyY2giLCBh cmNoaXRlY3R1cmUoKSkgaWYgIWlzVGlnZXIoKTsKKyAgICAgICAgbXkgQGFyY2hpdGVjdHVyZUZs YWdzID0gKCItYXJjaCIsIGFyY2hpdGVjdHVyZSgpKTsKICAgICAgICAgZXhlYyAkZ2RiUGF0aCwg QGFyY2hpdGVjdHVyZUZsYWdzLCAkd2ViS2l0VGVzdFJ1bm5lclBhdGggb3IgZGllOwogICAgICAg ICByZXR1cm47CiAgICAgfQpAQCAtMjAyMiw3ICsyMDE3LDcgQEAgc3ViIHJ1blRlc3RXZWJLaXRB UEkKICAgICAgICAgJEVOVntEWUxEX0ZSQU1FV09SS19QQVRIfSA9ICRwcm9kdWN0RGlyOwogICAg ICAgICAkRU5We1dFQktJVF9VTlNFVF9EWUxEX0ZSQU1FV09SS19QQVRIfSA9ICJZRVMiOwogICAg ICAgICBteSAkdGVzdFdlYktpdEFQSVBhdGggPSAiJHByb2R1Y3REaXIvVGVzdFdlYktpdEFQSSI7 Ci0gICAgICAgIGlmICghaXNUaWdlcigpICYmIGFyY2hpdGVjdHVyZSgpKSB7CisgICAgICAgIGlm IChhcmNoaXRlY3R1cmUoKSkgewogICAgICAgICAgICAgcmV0dXJuIHN5c3RlbSAiYXJjaCIsICIt IiAuIGFyY2hpdGVjdHVyZSgpLCAkdGVzdFdlYktpdEFQSVBhdGgsIEBBUkdWOwogICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgcmV0dXJuIHN5c3RlbSAkdGVzdFdlYktpdEFQSVBhdGgsIEBB UkdWOwo=