22683 2008-12-05 10:29:18 -0800 gtk and qt builds fail due to --gtk and --qt not being removed from ARGV 2008-12-05 14:18:12 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 zan eric bero eric oldest_to_newest 101517 0 zan 2008-12-05 10:29:18 -0800 In revision 38973 [1], the checkArgv function was modified. Since then, the function does not return correct result unless two arguments are passed to it - at the moment, in every call only the argument we check for is passed. The problem is solved by simply adding another argument. [1]: http://trac.webkit.org/changeset/38973 101518 1 25776 zan 2008-12-05 10:40:38 -0800 Created attachment 25776 Fix of function calls Fixed function calls To explain a bit further, in the checkArgv function, shift is called twice on the arguments array. If the second shift fails, the argument we search for is not removed from the arguments array. Since it is not removed, scripts exit with a complain, for instance, that the "--gtk" is an unknown option. This fixes such problems on the Gtk+ port, but I am unsure if this behaviour is acceptable on others. 101519 2 25776 eric 2008-12-05 10:53:30 -0800 Comment on attachment 25776 Fix of function calls I intentionally changed this to fix run-javascriptcore-tests --gtk, etc. to pass --gtk along to build-jsc. Obviously we need a better solution which handles both cases. Which scripts are being passed an unfiltered @ARGV in the gtk port? We could have a global flag controlling this, or we could go back to always removing them from @ARGV (like your patch does) and add a configurationFlags() function which knows how to produce "--debug --gtk", etc. for passing to sub-scripts. I'd be interested in your thoughts? 101521 3 eric 2008-12-05 10:54:34 -0800 *** Bug 22676 has been marked as a duplicate of this bug. *** 101526 4 eric 2008-12-05 11:10:55 -0800 I'll fix this after lunch. I'm going to change the behavior back to how it was (remove the extra bool argument on checkArgV, and rename checkArgV to checkForArgumentAndRemoveFromArgV or something), and add a configurationArguments() call which knows how to create an array of all of the config arguments which we parse. It's ugly. But I don't really have a better solution. 101535 5 25781 eric 2008-12-05 12:04:21 -0800 Created attachment 25781 Fix argument handling to remove --gtk --qt, etc. from ARGV WebKitTools/ChangeLog | 14 +++++++++++ WebKitTools/Scripts/run-javascriptcore-tests | 2 + WebKitTools/Scripts/run-launcher | 3 -- WebKitTools/Scripts/run-webkit-tests | 17 +++++--------- WebKitTools/Scripts/webkitdirs.pm | 31 +++++++++++++++++-------- 5 files changed, 43 insertions(+), 24 deletions(-) 101559 6 25781 ggaren 2008-12-05 14:05:10 -0800 Comment on attachment 25781 Fix argument handling to remove --gtk --qt, etc. from ARGV r=me 101565 7 eric 2008-12-05 14:18:12 -0800 http://trac.webkit.org/changeset/39044 25776 2008-12-05 10:40:38 -0800 2008-12-05 10:53:30 -0800 Fix of function calls fix.patch text/plain 1883 zan SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDM5MDM0KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTEgQEAKKzIwMDgtMTItMDUgIFphbiBEb2JlcnNlayAgPHph bmRvYmVyc2VrQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBGaXggY2FsbHMgdG8gY2hlY2tBcmd2IGZ1bmN0aW9uIHNvIGl0IGNhbiB3 b3JrIHByb3Blcmx5LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorCiAyMDA4 LTEyLTAzICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuaWtvbGFzLnppbW1lcm1hbm5AdG9yY2htb2Jp bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IENhbWVyb24gWndhcmljaC4KSW5kZXg6IFdl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDM5MDM0KQorKysgV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC0yODIsNyArMjgyLDcgQEAg c3ViIGRldGVybWluZVBhc3NlZENvbmZpZ3VyYXRpb24KICAgICByZXR1cm4gaWYgJHNlYXJjaGVk Rm9yUGFzc2VkQ29uZmlndXJhdGlvbjsKICAgICAkc2VhcmNoZWRGb3JQYXNzZWRDb25maWd1cmF0 aW9uID0gMTsKIAotICAgIG15ICRpc1dpbkNhaXJvID0gY2hlY2tBcmd2KCItLWNhaXJvLXdpbjMy Iik7CisgICAgbXkgJGlzV2luQ2Fpcm8gPSBjaGVja0FyZ3YoIi0tY2Fpcm8td2luMzIiLCAxKTsK IAogICAgIGZvciBteSAkaSAoMCAuLiAkI0FSR1YpIHsKICAgICAgICAgbXkgJG9wdCA9ICRBUkdW WyRpXTsKQEAgLTUyOSw3ICs1MjksNyBAQCBzdWIgZGV0ZXJtaW5lSXNRdCgpCiAgICAgcmV0dXJu IGlmIGRlZmluZWQoJGlzUXQpOwogCiAgICAgIyBBbGxvdyBvdmVycmlkZSBpbiBjYXNlIFFURElS IGlzIG5vdCBzZXQuCi0gICAgaWYgKGNoZWNrQXJndigiLS1xdCIpKSB7CisgICAgaWYgKGNoZWNr QXJndigiLS1xdCIsIDEpKSB7CiAgICAgICAgICRpc1F0ID0gMTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KQEAgLTU1Miw3ICs1NTIsNyBAQCBzdWIgaXNHdGsoKQogc3ViIGRldGVybWluZUlzR3Rr KCkKIHsKICAgICByZXR1cm4gaWYgZGVmaW5lZCgkaXNHdGspOwotICAgICRpc0d0ayA9IGNoZWNr QXJndigiLS1ndGsiKTsKKyAgICAkaXNHdGsgPSBjaGVja0FyZ3YoIi0tZ3RrIiwgMSk7CiB9CiAK IHN1YiBpc1d4KCkKQEAgLTU2NCw3ICs1NjQsNyBAQCBzdWIgaXNXeCgpCiBzdWIgZGV0ZXJtaW5l SXNXeCgpCiB7CiAgICAgcmV0dXJuIGlmIGRlZmluZWQoJGlzV3gpOwotICAgICRpc1d4ID0gY2hl Y2tBcmd2KCItLXd4Iik7CisgICAgJGlzV3ggPSBjaGVja0FyZ3YoIi0td3giLCAxKTsKIH0KIAog IyBEZXRlcm1pbmUgaWYgdGhpcyBpcyBkZWJpYW4sIHVidW50dSwgbGluc3BpcmUsIG9yIHNvbWV0 aGluZyBzaW1pbGFyLgpAQCAtNTgyLDcgKzU4Miw3IEBAIHN1YiBpc0Nocm9taXVtKCkKIHN1YiBk ZXRlcm1pbmVJc0Nocm9taXVtKCkKIHsKICAgICByZXR1cm4gaWYgZGVmaW5lZCgkaXNDaHJvbWl1 bSk7Ci0gICAgJGlzQ2hyb21pdW0gPSBjaGVja0FyZ3YoIi0tY2hyb21pdW0iKTsKKyAgICAkaXND aHJvbWl1bSA9IGNoZWNrQXJndigiLS1jaHJvbWl1bSIsIDEpOwogfQogCiBzdWIgaXNDeWd3aW4o KQo= 25781 2008-12-05 12:04:21 -0800 2008-12-05 14:05:10 -0800 Fix argument handling to remove --gtk --qt, etc. from ARGV Fix-argument-handling-to-remove-gtk-qt-etc.-from-ARGV.patch text/plain 6103 eric Y2Q1YTAyYTY0MGU5OWJkZWIyOTQ0MzM0NWU0OWM4OTI5YmNlZDk4ZQpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGU2YjdjNTQu LjIyNzM3YTYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRU b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOC0xMi0wNSAgRXJpYyBTZWlkZWwg IDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisgICAgICAgIAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjI2ODMKKyAgICAgICAgRml4IGd0ayBhbmQgcXQgYnVpbGRzIHdoaWNoIGRlcGVuZCBvbiAt LXF0IGFuZCAtLWd0ayBiZWluZyByZW1vdmVkIGZyb20gQVJHVgorICAgICAgICBBZGQgYSBuZXcg YXJndW1lbnRzRm9yQ29uZmlndXJhdGlvbigpIGZ1bmN0aW9uIGFuZCBjbGVhbiB1cCBzb21lIG9s ZCBjb2RlIHRvIHVzZSBpdC4KKyAgICAgICAgUmVuYW1lIGNoZWNrQXJnViB0byBjaGVja0ZvckFy Z3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YgdG8gYmUgbW9yZSBzZWxmLWRvY3VtZW50aW5nLgorCisg ICAgICAgICogU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHM6CisgICAgICAgICogU2Ny aXB0cy9ydW4tbGF1bmNoZXI6CisgICAgICAgICogU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKwogMjAwOC0xMi0wMyAgTmlrb2xhcyBa aW1tZXJtYW5uICA8bmlrb2xhcy56aW1tZXJtYW5uQHRvcmNobW9iaWxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBDYW1lcm9uIFp3YXJpY2guCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVu LWphdmFzY3JpcHRjb3JlLXRlc3RzCmluZGV4IDc1Y2Q2ZWQuLjkwZGFhZTcgMTAwNzU1Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCisrKyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCkBAIC04Nyw2ICs4Nyw4IEBA IGlmIChpc0FwcGxlTWFjV2ViS2l0KCkgJiYgIWlzVGlnZXIoKSkgewogaWYgKCFkZWZpbmVkKCRy b290KSl7CiAgICAgY2hkaXJXZWJLaXQoKTsKIAorICAgIHB1c2goQGJ1aWxkQXJncywgYXJndW1l bnRzRm9yQ29uZmlndXJhdGlvbigpKTsKKwogICAgIG15ICRhcmNoID0gcHJlZmVycmVkQXJjaGl0 ZWN0dXJlKCJKYXZhU2NyaXB0Q29yZSIpOwogICAgIHB1c2goQGJ1aWxkQXJncywgIkFSQ0hTPSRh cmNoIikgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSk7CiAgICAgCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9TY3JpcHRzL3J1bi1sYXVuY2hlciBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLWxhdW5j aGVyCmluZGV4IGYyYjU4Y2IuLjk2ODBjYzIgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1Njcmlw dHMvcnVuLWxhdW5jaGVyCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLWxhdW5jaGVyCkBA IC01OCw5ICs1OCw2IEBAIGlmIChpc1F0KCkpIHsKIAogICAgIGlmIChpc0d0aygpKSB7CiAgICAg ICAgICRsYXVuY2hlclBhdGggPSBjYXRkaXIoJGxhdW5jaGVyUGF0aCwgIlByb2dyYW1zIiwgIkd0 a0xhdW5jaGVyIik7Ci0gICAgICAgICMgU3RyaXAgLS1ndGsgZnJvbSB0aGUgYXJnLWxpc3QsIHNp bmNlIG90aGVyd2lzZSBHdGtMYXVuY2hlciB3aWxsIHRyeSB0bwotICAgICAgICAjIGludGVycHJl dCBpdCBhcyBhIFVSTC4KLSAgICAgICAgQGFyZ3MgPSBncmVwKCEvXigtLWd0aykkLywgQGFyZ3Mp OwogICAgIH0KIAogICAgIHByaW50ICJTdGFydGluZyB3ZWJraXQgbGF1bmNoZXIuXG4iOwpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzIGIvV2ViS2l0VG9v bHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCmluZGV4IDFjNjVlZTcuLmQ1Y2Y5YmIgMTAwNzU1 Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cworKysgYi9XZWJLaXRU b29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMKQEAgLTI2Miw4ICsyNjIsNiBAQCBteSAkc2tp cHBlZE9ubHkgPSAkdHJlYXRTa2lwcGVkIGVxICJvbmx5IjsKIAogc2V0Q29uZmlndXJhdGlvbigk Y29uZmlndXJhdGlvbik7CiAKLW15ICRjb25maWd1cmF0aW9uT3B0aW9uID0gIi0tIiAuIGxjKCRj b25maWd1cmF0aW9uKTsKLQogJHRlc3RzUGVyRHVtcFRvb2wgPSAxMDAwIGlmICEkdGVzdHNQZXJE dW1wVG9vbDsKIAogJHZlcmJvc2UgPSAxIGlmICR0ZXN0c1BlckR1bXBUb29sID09IDE7CkBAIC0y ODUsMTAgKzI4Myw3IEBAIGNoZGlyV2ViS2l0KCk7CiAKIGlmICghZGVmaW5lZCgkcm9vdCkpIHsK ICAgICAjIFB1c2ggdGhlIHBhcmFtZXRlcnMgdG8gYnVpbGQtZHVtcHJlbmRlcnRyZWUgYXMgYW4g YXJyYXkKLSAgICBteSBAYXJnczsKLSAgICBwdXNoKEBhcmdzLCAkY29uZmlndXJhdGlvbk9wdGlv bik7Ci0gICAgcHVzaChAYXJncywgIi0tcXQiKSAgaWYgaXNRdCgpOwotICAgIHB1c2goQGFyZ3Ms ICItLWd0ayIpICBpZiBpc0d0aygpOworICAgIG15IEBhcmdzID0gYXJndW1lbnRzRm9yQ29uZmln dXJhdGlvbigpOwogCiAgICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewogICAgICAgICBteSAk YXJjaCA9IHByZWZlcnJlZEFyY2hpdGVjdHVyZSgpOwpAQCAtMTAwMywxNCArOTk4LDE0IEBAIHBy aW50IEhUTUwgIjwvYm9keT5cbiI7CiBwcmludCBIVE1MICI8L2h0bWw+XG4iOwogY2xvc2UgSFRN TDsKIAotaWYgKGlzUXQoKSkgewotICBzeXN0ZW0gIldlYktpdFRvb2xzL1NjcmlwdHMvcnVuLWxh dW5jaGVyIiwgIi0tcXQiLCAkY29uZmlndXJhdGlvbk9wdGlvbiwgJHRlc3RSZXN1bHRzIGlmICRs YXVuY2hTYWZhcmk7Ci19IGVsc2lmIChpc0d0aygpKSB7Ci0gIHN5c3RlbSAiV2ViS2l0VG9vbHMv U2NyaXB0cy9ydW4tbGF1bmNoZXIiLCAiLS1ndGsiLCAkY29uZmlndXJhdGlvbk9wdGlvbiwgJHRl c3RSZXN1bHRzIGlmICRsYXVuY2hTYWZhcmk7CitteSBAY29uZmlndXJhdGlvbkFyZ3MgPSBhcmd1 bWVudHNGb3JDb25maWd1cmF0aW9uKCk7CisKK2lmIChpc1F0KCkgfHwgaXNHdGsoKSkgeworICBz eXN0ZW0gIldlYktpdFRvb2xzL1NjcmlwdHMvcnVuLWxhdW5jaGVyIiwgQGNvbmZpZ3VyYXRpb25B cmdzLCAkdGVzdFJlc3VsdHMgaWYgJGxhdW5jaFNhZmFyaTsKIH0gZWxzaWYgKGlzQ3lnd2luKCkp IHsKICAgc3lzdGVtICJjeWdzdGFydCIsICR0ZXN0UmVzdWx0cyBpZiAkbGF1bmNoU2FmYXJpOwog fSBlbHNlIHsKLSAgc3lzdGVtICJXZWJLaXRUb29scy9TY3JpcHRzL3J1bi1zYWZhcmkiLCAkY29u ZmlndXJhdGlvbk9wdGlvbiwgIi1OU09wZW4iLCAkdGVzdFJlc3VsdHMgaWYgJGxhdW5jaFNhZmFy aTsKKyAgc3lzdGVtICJXZWJLaXRUb29scy9TY3JpcHRzL3J1bi1zYWZhcmkiLCBAY29uZmlndXJh dGlvbkFyZ3MsICItTlNPcGVuIiwgJHRlc3RSZXN1bHRzIGlmICRsYXVuY2hTYWZhcmk7CiB9CiAK IGNsb3NlQ3lncGF0aHMoKSBpZiBpc0N5Z3dpbigpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRkaXJzLnBtIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt CmluZGV4IDBiMGIzZGQuLjk1YzRhNmMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0ZGlycy5wbQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAg LTE2Niw2ICsxNjYsMjAgQEAgc3ViIGRldGVybWluZUNvbmZpZ3VyYXRpb24KICAgICB9CiB9CiAK K3N1YiBhcmd1bWVudHNGb3JDb25maWd1cmF0aW9uKCkKK3sKKyAgICBkZXRlcm1pbmVDb25maWd1 cmF0aW9uKCk7CisKKyAgICBteSBAYXJncyA9ICgpOworICAgIHB1c2goQGFyZ3MsICctLWRlYnVn JykgaWYgJGNvbmZpZ3VyYXRpb24gZXEgIkRlYnVnIjsKKyAgICBwdXNoKEBhcmdzLCAnLS1yZWxl YXNlJykgaWYgJGNvbmZpZ3VyYXRpb24gZXEgIlJlbGVhc2UiOworICAgIHB1c2goQGFyZ3MsICct LXF0JykgaWYgaXNRdCgpOworICAgIHB1c2goQGFyZ3MsICctLWd0aycpIGlmIGlzR3RrKCk7Cisg ICAgcHVzaChAYXJncywgJy0td3gnKSBpZiBpc1d4KCk7CisgICAgcHVzaChAYXJncywgJy0tY2hy b21pdW0nKSBpZiBpc0Nocm9taXVtKCk7CisgICAgcmV0dXJuIEBhcmdzOworfQorCiBzdWIgZGV0 ZXJtaW5lQ29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbwogewogICAgIHJldHVybiBpZiBkZWZp bmVkICRjb25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGlvOwpAQCAtMjgyLDcgKzI5Niw3IEBAIHN1 YiBkZXRlcm1pbmVQYXNzZWRDb25maWd1cmF0aW9uCiAgICAgcmV0dXJuIGlmICRzZWFyY2hlZEZv clBhc3NlZENvbmZpZ3VyYXRpb247CiAgICAgJHNlYXJjaGVkRm9yUGFzc2VkQ29uZmlndXJhdGlv biA9IDE7CiAKLSAgICBteSAkaXNXaW5DYWlybyA9IGNoZWNrQXJndigiLS1jYWlyby13aW4zMiIp OworICAgIG15ICRpc1dpbkNhaXJvID0gY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdW KCItLWNhaXJvLXdpbjMyIik7CiAKICAgICBmb3IgbXkgJGkgKDAgLi4gJCNBUkdWKSB7CiAgICAg ICAgIG15ICRvcHQgPSAkQVJHVlskaV07CkBAIC01MDksMTUgKzUyMywxMiBAQCBzdWIgaXNRdCgp CiAgICAgcmV0dXJuICRpc1F0OwogfQogCi1zdWIgY2hlY2tBcmd2CitzdWIgY2hlY2tGb3JBcmd1 bWVudEFuZFJlbW92ZUZyb21BUkdWCiB7CiAgICAgbXkgJGFyZ1RvQ2hlY2sgPSBzaGlmdDsKLSAg ICBteSAkcmVtb3ZlQXJndW1lbnRGcm9tQVJHViA9IHNoaWZ0IHx8IDA7CiAgICAgZm9yZWFjaCBt eSAkb3B0IChAQVJHVikgewogICAgICAgICBpZiAoJG9wdCA9fiAvXiRhcmdUb0NoZWNrL2kgKSB7 Ci0gICAgICAgICAgICBpZiAoJHJlbW92ZUFyZ3VtZW50RnJvbUFSR1YpIHsKLSAgICAgICAgICAg ICAgICBAQVJHViA9IGdyZXAoIS9eJGFyZ1RvQ2hlY2svaSwgQEFSR1YpOwotICAgICAgICAgICAg fQorICAgICAgICAgICAgQEFSR1YgPSBncmVwKCEvXiRhcmdUb0NoZWNrL2ksIEBBUkdWKTsKICAg ICAgICAgICAgIHJldHVybiAxOwogICAgICAgICB9CiAgICAgfQpAQCAtNTI5LDcgKzU0MCw3IEBA IHN1YiBkZXRlcm1pbmVJc1F0KCkKICAgICByZXR1cm4gaWYgZGVmaW5lZCgkaXNRdCk7CiAKICAg ICAjIEFsbG93IG92ZXJyaWRlIGluIGNhc2UgUVRESVIgaXMgbm90IHNldC4KLSAgICBpZiAoY2hl Y2tBcmd2KCItLXF0IikpIHsKKyAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21B UkdWKCItLXF0IikpIHsKICAgICAgICAgJGlzUXQgPSAxOwogICAgICAgICByZXR1cm47CiAgICAg fQpAQCAtNTUyLDcgKzU2Myw3IEBAIHN1YiBpc0d0aygpCiBzdWIgZGV0ZXJtaW5lSXNHdGsoKQog ewogICAgIHJldHVybiBpZiBkZWZpbmVkKCRpc0d0ayk7Ci0gICAgJGlzR3RrID0gY2hlY2tBcmd2 KCItLWd0ayIpOworICAgICRpc0d0ayA9IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJH VigiLS1ndGsiKTsKIH0KIAogc3ViIGlzV3goKQpAQCAtNTY0LDcgKzU3NSw3IEBAIHN1YiBpc1d4 KCkKIHN1YiBkZXRlcm1pbmVJc1d4KCkKIHsKICAgICByZXR1cm4gaWYgZGVmaW5lZCgkaXNXeCk7 Ci0gICAgJGlzV3ggPSBjaGVja0FyZ3YoIi0td3giKTsKKyAgICAkaXNXeCA9IGNoZWNrRm9yQXJn dW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS13eCIpOwogfQogCiAjIERldGVybWluZSBpZiB0aGlz IGlzIGRlYmlhbiwgdWJ1bnR1LCBsaW5zcGlyZSwgb3Igc29tZXRoaW5nIHNpbWlsYXIuCkBAIC01 ODIsNyArNTkzLDcgQEAgc3ViIGlzQ2hyb21pdW0oKQogc3ViIGRldGVybWluZUlzQ2hyb21pdW0o KQogewogICAgIHJldHVybiBpZiBkZWZpbmVkKCRpc0Nocm9taXVtKTsKLSAgICAkaXNDaHJvbWl1 bSA9IGNoZWNrQXJndigiLS1jaHJvbWl1bSIpOworICAgICRpc0Nocm9taXVtID0gY2hlY2tGb3JB cmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLWNocm9taXVtIik7CiB9CiAKIHN1YiBpc0N5Z3dp bigpCg==