71370 2011-11-02 09:17:26 -0700 webkitdirs.pm: add getArchitecture implementation for autotools ports 2011-11-09 09:40:54 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 wingo webkit-unassigned webkit.review.bot oldest_to_newest 494655 0 wingo 2011-11-02 09:17:26 -0700 If I run "Tools/Scripts/run-javascriptcore-tests --gtk" on my Linux box, it will run build-jsc with the --32-bit argument, which is not what I want, given that I have already built JSC for x86-64. The patch to be attached fixes this issue. (If I omit --gtk, even having already built JSC, I get worse results, but that's another bug.) 494656 1 113320 wingo 2011-11-02 09:20:09 -0700 Created attachment 113320 Patch 497863 2 113320 pnormand 2011-11-08 01:57:13 -0800 Comment on attachment 113320 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113320&action=review > Tools/Scripts/webkitdirs.pm:250 > + if (isGtk() or isEfl()) { > + determineConfigurationProductDir(); > + my $host_triple = `grep -E '^host = ' $configurationProductDir/GNUmakefile`; I think EFL uses CMake so this check on the GNUMakefile will likely always fail for them. Maybe remove the isEfl() test? 498098 3 114080 wingo 2011-11-08 08:31:10 -0800 Created attachment 114080 Patch 498099 4 wingo 2011-11-08 08:31:40 -0800 Updated patch. R? :) 498102 5 114080 mrobinson 2011-11-08 08:38:39 -0800 Comment on attachment 114080 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114080&action=review > Tools/Scripts/webkitdirs.pm:250 > + determineConfigurationProductDir(); > + my $host_triple = `grep -E '^host = ' $configurationProductDir/GNUmakefile`; > + $architecture = $1 if $host_triple =~ m/^host = ([^-]+)-/; In the Mac case they first check the architecture set for the build and then if it's not there, they fall back to the system architecture. I think you should do the same here. 498754 6 114228 wingo 2011-11-09 02:41:17 -0800 Created attachment 114228 Patch 499003 7 114228 xan.lopez 2011-11-09 08:41:27 -0800 Comment on attachment 114228 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114228&action=review > Tools/Scripts/webkitdirs.pm:254 > + # Fall back to output of `arch', if it is present. Ultra nitpick, you don't really have further fallbacks, so I guess the "if it is present" is a bit misleading. You'll use that or fail in some way I suppose. Anyway, this looks OK to me. 499078 8 114228 webkit.review.bot 2011-11-09 09:40:49 -0800 Comment on attachment 114228 Patch Clearing flags on attachment: 114228 Committed r99729: <http://trac.webkit.org/changeset/99729> 499079 9 webkit.review.bot 2011-11-09 09:40:54 -0800 All reviewed patches have been landed. Closing bug. 113320 2011-11-02 09:20:09 -0700 2011-11-08 08:31:03 -0800 Patch bug-71370-20111102172007.patch text/plain 2720 wingo U3VidmVyc2lvbiBSZXZpc2lvbjogOTkwNTIKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4NjBiZmFmOTM5YTM5OGU1MjQ2NmRhYmEzMGM3NzIwNWQy NmQwZTc0Li44YjIzMzE4NTE0Nzk3MjdjMTFjYjAyNmFiZmU0ZGRhMjE2ZDg1YzE0IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMTEtMDIgIEFuZHkgV2luZ28gIDx3aW5nb0BpZ2FsaWEuY29tPgorCisgICAgICAg IEFkZCB3ZWJraXRkaXJzLnBtOmdldEFyY2hpdGVjdHVyZSBpbXBsZW1lbnRhdGlvbiBmb3IgR1RL LCBFRkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcx MzcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdGRpcnMucG0gKGRldGVybWluZUFyY2hpdGVjdHVyZSk6IEFkZCBhbgorICAg ICAgICBpbXBsZW1lbnRhdGlvbiBmb3IgcG9ydHMgdXNpbmcgYXV0b3Rvb2xzLCBzbyB0aGF0IGEg dmFuaWxsYQorICAgICAgICBgcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzIC0tZ3RrJyBpbnZvY2F0 aW9uIGRvZXNuJ3QgcGFzcyAtLTMyLWJpdAorICAgICAgICB0byBidWlsZC1qc2Mgb24geDg2LTY0 IG1hY2hpbmVzLgorCiAyMDExLTExLTAyICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5u QG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdW1dLMl0gQWRkIHN1cHBvcnQgZm9yIHRvdWNoIGV2 ZW50IHRlc3RpbmcgdG8gV2ViS2l0VGVzdFJ1bm5lcgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IGM1M2Qz OThkZDgyOGZjMTg4MTlkOWFhYjIyNDRjY2MzNWIzYzhkYTAuLjY2ODViOTVjNDkxZjg1YzViZGYz MmRhODU1YzBkN2VjYmE4NjAzNGYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTI0MCwyNiArMjQwLDMy IEBAIHN1YiBkZXRlcm1pbmVDb25maWd1cmF0aW9uCiBzdWIgZGV0ZXJtaW5lQXJjaGl0ZWN0dXJl CiB7CiAgICAgcmV0dXJuIGlmIGRlZmluZWQgJGFyY2hpdGVjdHVyZTsKLSAgICAjIG1ha2Ugc3Vy ZSAkYXJjaGl0ZWN0dXJlIGlzIGRlZmluZWQgZm9yIG5vbi1hcHBsZS1tYWMgYnVpbGRzCisgICAg IyBtYWtlIHN1cmUgJGFyY2hpdGVjdHVyZSBpcyBkZWZpbmVkIGluIGFsbCBjYXNlcwogICAgICRh cmNoaXRlY3R1cmUgPSAiIjsKLSAgICByZXR1cm4gdW5sZXNzIGlzQXBwbGVNYWNXZWJLaXQoKTsK IAogICAgIGRldGVybWluZUJhc2VQcm9kdWN0RGlyKCk7Ci0gICAgaWYgKG9wZW4gQVJDSElURUNU VVJFLCAiJGJhc2VQcm9kdWN0RGlyL0FyY2hpdGVjdHVyZSIpIHsKLSAgICAgICAgJGFyY2hpdGVj dHVyZSA9IDxBUkNISVRFQ1RVUkU+OwotICAgICAgICBjbG9zZSBBUkNISVRFQ1RVUkU7Ci0gICAg fQotICAgIGlmICgkYXJjaGl0ZWN0dXJlKSB7Ci0gICAgICAgIGNob21wICRhcmNoaXRlY3R1cmU7 Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgaWYgKGlzTGVvcGFyZCgpKSB7Ci0gICAgICAgICAgICAk YXJjaGl0ZWN0dXJlID0gYGFyY2hgOworCisgICAgaWYgKGlzR3RrKCkgb3IgaXNFZmwoKSkgewor ICAgICAgICBkZXRlcm1pbmVDb25maWd1cmF0aW9uUHJvZHVjdERpcigpOworICAgICAgICBteSAk aG9zdF90cmlwbGUgPSBgZ3JlcCAtRSAnXmhvc3QgPSAnICRjb25maWd1cmF0aW9uUHJvZHVjdERp ci9HTlVtYWtlZmlsZWA7CisgICAgICAgICRhcmNoaXRlY3R1cmUgPSAkMSBpZiAkaG9zdF90cmlw bGUgPX4gbS9eaG9zdCA9IChbXi1dKyktLzsKKyAgICB9IGVsc2lmIChpc0FwcGxlTWFjV2ViS2l0 KCkpIHsKKyAgICAgICAgaWYgKG9wZW4gQVJDSElURUNUVVJFLCAiJGJhc2VQcm9kdWN0RGlyL0Fy Y2hpdGVjdHVyZSIpIHsKKyAgICAgICAgICAgICRhcmNoaXRlY3R1cmUgPSA8QVJDSElURUNUVVJF PjsKKyAgICAgICAgICAgIGNsb3NlIEFSQ0hJVEVDVFVSRTsKKyAgICAgICAgfQorICAgICAgICBp ZiAoJGFyY2hpdGVjdHVyZSkgeworICAgICAgICAgICAgY2hvbXAgJGFyY2hpdGVjdHVyZTsKICAg ICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIG15ICRzdXBwb3J0czY0Qml0ID0gYHN5c2N0bCAt biBody5vcHRpb25hbC54ODZfNjRgOwotICAgICAgICAgICAgY2hvbXAgJHN1cHBvcnRzNjRCaXQ7 Ci0gICAgICAgICAgICAkYXJjaGl0ZWN0dXJlID0gJHN1cHBvcnRzNjRCaXQgPyAneDg2XzY0JyA6 IGBhcmNoYDsKKyAgICAgICAgICAgIGlmIChpc0xlb3BhcmQoKSkgeworICAgICAgICAgICAgICAg ICRhcmNoaXRlY3R1cmUgPSBgYXJjaGA7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAg ICAgICAgIG15ICRzdXBwb3J0czY0Qml0ID0gYHN5c2N0bCAtbiBody5vcHRpb25hbC54ODZfNjRg OworICAgICAgICAgICAgICAgIGNob21wICRzdXBwb3J0czY0Qml0OworICAgICAgICAgICAgICAg ICRhcmNoaXRlY3R1cmUgPSAkc3VwcG9ydHM2NEJpdCA/ICd4ODZfNjQnIDogYGFyY2hgOworICAg ICAgICAgICAgfQorICAgICAgICAgICAgY2hvbXAgJGFyY2hpdGVjdHVyZTsKICAgICAgICAgfQot ICAgICAgICBjaG9tcCAkYXJjaGl0ZWN0dXJlOwogICAgIH0KIH0KIAo= 114080 2011-11-08 08:31:10 -0800 2011-11-09 02:41:08 -0800 Patch bug-71370-20111108173108.patch text/plain 2693 wingo U3VidmVyc2lvbiBSZXZpc2lvbjogOTk1NzIKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzOTZjMjRhNDM4YjAzNzA4ODQ4ZDg1MmI0OTRjN2Y2OGI2 MjIyYmFmLi44MDM4NzAwNTkxZTE4Y2Y3NTA3MGZjZmNkMmQ4ZjAwNGZmZTNlZTMzIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMTEtMDggIEFuZHkgV2luZ28gIDx3aW5nb0BpZ2FsaWEuY29tPgorCisgICAgICAg IEFkZCB3ZWJraXRkaXJzLnBtOmdldEFyY2hpdGVjdHVyZSBpbXBsZW1lbnRhdGlvbiBmb3IgR1RL CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTM3MAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRkaXJzLnBtIChkZXRlcm1pbmVBcmNoaXRlY3R1cmUpOiBBZGQgYW4KKyAgICAgICAg aW1wbGVtZW50YXRpb24gZm9yIHBvcnRzIHVzaW5nIGF1dG90b29scywgc28gdGhhdCBhIHZhbmls bGEKKyAgICAgICAgYHJ1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cyAtLWd0aycgaW52b2NhdGlvbiBk b2Vzbid0IHBhc3MgLS0zMi1iaXQKKyAgICAgICAgdG8gYnVpbGQtanNjIG9uIHg4Ni02NCBtYWNo aW5lcy4KKwogMjAxMS0xMS0wOCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3Jn PgogCiAgICAgICAgIFtRdF0gVW5yZXZpZXdlZCB0cml2aWFsIGZpeCBhZnRlciBidWlsZCBzeXN0 ZW0gcmVmYWN0b3JpbmcuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0g Yi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggNTg3YmMzMmVhOGVkOTdmZTI0NmNi YTgyOWE4MThiNjRiMGEzOWZlNy4uMDcxMDhkZWU4NGUzMzg5YWQ1YjZiNTU0MDZlN2YzMmNlN2Vk NWRhMiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMjM5LDI2ICsyMzksMzIgQEAgc3ViIGRldGVybWlu ZUNvbmZpZ3VyYXRpb24KIHN1YiBkZXRlcm1pbmVBcmNoaXRlY3R1cmUKIHsKICAgICByZXR1cm4g aWYgZGVmaW5lZCAkYXJjaGl0ZWN0dXJlOwotICAgICMgbWFrZSBzdXJlICRhcmNoaXRlY3R1cmUg aXMgZGVmaW5lZCBmb3Igbm9uLWFwcGxlLW1hYyBidWlsZHMKKyAgICAjIG1ha2Ugc3VyZSAkYXJj aGl0ZWN0dXJlIGlzIGRlZmluZWQgaW4gYWxsIGNhc2VzCiAgICAgJGFyY2hpdGVjdHVyZSA9ICIi OwotICAgIHJldHVybiB1bmxlc3MgaXNBcHBsZU1hY1dlYktpdCgpOwogCiAgICAgZGV0ZXJtaW5l QmFzZVByb2R1Y3REaXIoKTsKLSAgICBpZiAob3BlbiBBUkNISVRFQ1RVUkUsICIkYmFzZVByb2R1 Y3REaXIvQXJjaGl0ZWN0dXJlIikgewotICAgICAgICAkYXJjaGl0ZWN0dXJlID0gPEFSQ0hJVEVD VFVSRT47Ci0gICAgICAgIGNsb3NlIEFSQ0hJVEVDVFVSRTsKLSAgICB9Ci0gICAgaWYgKCRhcmNo aXRlY3R1cmUpIHsKLSAgICAgICAgY2hvbXAgJGFyY2hpdGVjdHVyZTsKLSAgICB9IGVsc2Ugewot ICAgICAgICBpZiAoaXNMZW9wYXJkKCkpIHsKLSAgICAgICAgICAgICRhcmNoaXRlY3R1cmUgPSBg YXJjaGA7CisKKyAgICBpZiAoaXNHdGsoKSkgeworICAgICAgICBkZXRlcm1pbmVDb25maWd1cmF0 aW9uUHJvZHVjdERpcigpOworICAgICAgICBteSAkaG9zdF90cmlwbGUgPSBgZ3JlcCAtRSAnXmhv c3QgPSAnICRjb25maWd1cmF0aW9uUHJvZHVjdERpci9HTlVtYWtlZmlsZWA7CisgICAgICAgICRh cmNoaXRlY3R1cmUgPSAkMSBpZiAkaG9zdF90cmlwbGUgPX4gbS9eaG9zdCA9IChbXi1dKyktLzsK KyAgICB9IGVsc2lmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKKyAgICAgICAgaWYgKG9wZW4gQVJD SElURUNUVVJFLCAiJGJhc2VQcm9kdWN0RGlyL0FyY2hpdGVjdHVyZSIpIHsKKyAgICAgICAgICAg ICRhcmNoaXRlY3R1cmUgPSA8QVJDSElURUNUVVJFPjsKKyAgICAgICAgICAgIGNsb3NlIEFSQ0hJ VEVDVFVSRTsKKyAgICAgICAgfQorICAgICAgICBpZiAoJGFyY2hpdGVjdHVyZSkgeworICAgICAg ICAgICAgY2hvbXAgJGFyY2hpdGVjdHVyZTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAg IG15ICRzdXBwb3J0czY0Qml0ID0gYHN5c2N0bCAtbiBody5vcHRpb25hbC54ODZfNjRgOwotICAg ICAgICAgICAgY2hvbXAgJHN1cHBvcnRzNjRCaXQ7Ci0gICAgICAgICAgICAkYXJjaGl0ZWN0dXJl ID0gJHN1cHBvcnRzNjRCaXQgPyAneDg2XzY0JyA6IGBhcmNoYDsKKyAgICAgICAgICAgIGlmIChp c0xlb3BhcmQoKSkgeworICAgICAgICAgICAgICAgICRhcmNoaXRlY3R1cmUgPSBgYXJjaGA7Cisg ICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIG15ICRzdXBwb3J0czY0Qml0ID0g YHN5c2N0bCAtbiBody5vcHRpb25hbC54ODZfNjRgOworICAgICAgICAgICAgICAgIGNob21wICRz dXBwb3J0czY0Qml0OworICAgICAgICAgICAgICAgICRhcmNoaXRlY3R1cmUgPSAkc3VwcG9ydHM2 NEJpdCA/ICd4ODZfNjQnIDogYGFyY2hgOworICAgICAgICAgICAgfQorICAgICAgICAgICAgY2hv bXAgJGFyY2hpdGVjdHVyZTsKICAgICAgICAgfQotICAgICAgICBjaG9tcCAkYXJjaGl0ZWN0dXJl OwogICAgIH0KIH0KIAo= 114228 2011-11-09 02:41:17 -0800 2011-11-09 09:40:49 -0800 Patch bug-71370-20111109114115.patch text/plain 2893 wingo U3VidmVyc2lvbiBSZXZpc2lvbjogOTk1NzIKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzOTZjMjRhNDM4YjAzNzA4ODQ4ZDg1MmI0OTRjN2Y2OGI2 MjIyYmFmLi44MDM4NzAwNTkxZTE4Y2Y3NTA3MGZjZmNkMmQ4ZjAwNGZmZTNlZTMzIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMTEtMDggIEFuZHkgV2luZ28gIDx3aW5nb0BpZ2FsaWEuY29tPgorCisgICAgICAg IEFkZCB3ZWJraXRkaXJzLnBtOmdldEFyY2hpdGVjdHVyZSBpbXBsZW1lbnRhdGlvbiBmb3IgR1RL CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTM3MAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRkaXJzLnBtIChkZXRlcm1pbmVBcmNoaXRlY3R1cmUpOiBBZGQgYW4KKyAgICAgICAg aW1wbGVtZW50YXRpb24gZm9yIHBvcnRzIHVzaW5nIGF1dG90b29scywgc28gdGhhdCBhIHZhbmls bGEKKyAgICAgICAgYHJ1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cyAtLWd0aycgaW52b2NhdGlvbiBk b2Vzbid0IHBhc3MgLS0zMi1iaXQKKyAgICAgICAgdG8gYnVpbGQtanNjIG9uIHg4Ni02NCBtYWNo aW5lcy4KKwogMjAxMS0xMS0wOCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3Jn PgogCiAgICAgICAgIFtRdF0gVW5yZXZpZXdlZCB0cml2aWFsIGZpeCBhZnRlciBidWlsZCBzeXN0 ZW0gcmVmYWN0b3JpbmcuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0g Yi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggNTg3YmMzMmVhOGVkOTdmZTI0NmNi YTgyOWE4MThiNjRiMGEzOWZlNy4uNjUxNTRlMTA2OTg0M2QzODA1YzIwMzU0Y2FiZTQxMGY0YWUz ZTFkZSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMjM5LDI2ICsyMzksMzkgQEAgc3ViIGRldGVybWlu ZUNvbmZpZ3VyYXRpb24KIHN1YiBkZXRlcm1pbmVBcmNoaXRlY3R1cmUKIHsKICAgICByZXR1cm4g aWYgZGVmaW5lZCAkYXJjaGl0ZWN0dXJlOwotICAgICMgbWFrZSBzdXJlICRhcmNoaXRlY3R1cmUg aXMgZGVmaW5lZCBmb3Igbm9uLWFwcGxlLW1hYyBidWlsZHMKKyAgICAjIG1ha2Ugc3VyZSAkYXJj aGl0ZWN0dXJlIGlzIGRlZmluZWQgaW4gYWxsIGNhc2VzCiAgICAgJGFyY2hpdGVjdHVyZSA9ICIi OwotICAgIHJldHVybiB1bmxlc3MgaXNBcHBsZU1hY1dlYktpdCgpOwogCiAgICAgZGV0ZXJtaW5l QmFzZVByb2R1Y3REaXIoKTsKLSAgICBpZiAob3BlbiBBUkNISVRFQ1RVUkUsICIkYmFzZVByb2R1 Y3REaXIvQXJjaGl0ZWN0dXJlIikgewotICAgICAgICAkYXJjaGl0ZWN0dXJlID0gPEFSQ0hJVEVD VFVSRT47Ci0gICAgICAgIGNsb3NlIEFSQ0hJVEVDVFVSRTsKLSAgICB9Ci0gICAgaWYgKCRhcmNo aXRlY3R1cmUpIHsKLSAgICAgICAgY2hvbXAgJGFyY2hpdGVjdHVyZTsKLSAgICB9IGVsc2Ugewot ICAgICAgICBpZiAoaXNMZW9wYXJkKCkpIHsKKworICAgIGlmIChpc0d0aygpKSB7CisgICAgICAg IGRldGVybWluZUNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyKCk7CisgICAgICAgIG15ICRob3N0X3Ry aXBsZSA9IGBncmVwIC1FICdeaG9zdCA9ICcgJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyL0dOVW1h a2VmaWxlYDsKKyAgICAgICAgaWYgKCRob3N0X3RyaXBsZSA9fiBtL15ob3N0ID0gKFteLV0rKS0v KSB7CisgICAgICAgICAgICAjIFdlIGhhdmUgYSBjb25maWd1cmVkIGJ1aWxkIHRyZWU7IHVzZSBp dC4KKyAgICAgICAgICAgICRhcmNoaXRlY3R1cmUgPSAkMTsKKyAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICAgICMgRmFsbCBiYWNrIHRvIG91dHB1dCBvZiBgYXJjaCcsIGlmIGl0IGlzIHByZXNl bnQuCiAgICAgICAgICAgICAkYXJjaGl0ZWN0dXJlID0gYGFyY2hgOworICAgICAgICAgICAgY2hv bXAgJGFyY2hpdGVjdHVyZTsKKyAgICAgICAgfQorICAgIH0gZWxzaWYgKGlzQXBwbGVNYWNXZWJL aXQoKSkgeworICAgICAgICBpZiAob3BlbiBBUkNISVRFQ1RVUkUsICIkYmFzZVByb2R1Y3REaXIv QXJjaGl0ZWN0dXJlIikgeworICAgICAgICAgICAgJGFyY2hpdGVjdHVyZSA9IDxBUkNISVRFQ1RV UkU+OworICAgICAgICAgICAgY2xvc2UgQVJDSElURUNUVVJFOworICAgICAgICB9CisgICAgICAg IGlmICgkYXJjaGl0ZWN0dXJlKSB7CisgICAgICAgICAgICBjaG9tcCAkYXJjaGl0ZWN0dXJlOwog ICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgbXkgJHN1cHBvcnRzNjRCaXQgPSBgc3lzY3Rs IC1uIGh3Lm9wdGlvbmFsLng4Nl82NGA7Ci0gICAgICAgICAgICBjaG9tcCAkc3VwcG9ydHM2NEJp dDsKLSAgICAgICAgICAgICRhcmNoaXRlY3R1cmUgPSAkc3VwcG9ydHM2NEJpdCA/ICd4ODZfNjQn IDogYGFyY2hgOworICAgICAgICAgICAgaWYgKGlzTGVvcGFyZCgpKSB7CisgICAgICAgICAgICAg ICAgJGFyY2hpdGVjdHVyZSA9IGBhcmNoYDsKKyAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAg ICAgICAgICAgbXkgJHN1cHBvcnRzNjRCaXQgPSBgc3lzY3RsIC1uIGh3Lm9wdGlvbmFsLng4Nl82 NGA7CisgICAgICAgICAgICAgICAgY2hvbXAgJHN1cHBvcnRzNjRCaXQ7CisgICAgICAgICAgICAg ICAgJGFyY2hpdGVjdHVyZSA9ICRzdXBwb3J0czY0Qml0ID8gJ3g4Nl82NCcgOiBgYXJjaGA7Cisg ICAgICAgICAgICB9CisgICAgICAgICAgICBjaG9tcCAkYXJjaGl0ZWN0dXJlOwogICAgICAgICB9 Ci0gICAgICAgIGNob21wICRhcmNoaXRlY3R1cmU7CiAgICAgfQogfQogCg==