149718 2015-10-01 12:24:03 -0700 [Win] Fix behavior of webkit-build-directory script 2015-10-01 12:43:00 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build PC All RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham achristensen bfulgham commit-queue dbates lforschler oldest_to_newest 1129996 0 bfulgham 2015-10-01 12:24:03 -0700 The behavior of webkit-build-directory is wrong on Windows. It should be returning: $ webkit-build-directory /cygdrive/c/Projects/WebKit/OpenSource/WebKitBuild /cygdrive/c/Projects/WebKit/OpenSource/WebKitBuild/Release Instead, it is returning: $ ../Scripts/webkit-build-directory /cygdrive/c/Projects/WebKit/OpenSource/WebKitBuild /cygdrive/c/Projects/WebKit/OpenSource/WebKitBuild/Release/bin32 This causes other scripts to break. This patch corrects this behavior, and modifies scripts that had relied on the old improper behavior. 1129997 1 262275 bfulgham 2015-10-01 12:27:57 -0700 Created attachment 262275 Patch 1129999 2 262277 bfulgham 2015-10-01 12:30:25 -0700 Created attachment 262277 Patch 1130001 3 262277 achristensen 2015-10-01 12:35:32 -0700 Comment on attachment 262277 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262277&action=review > Tools/Scripts/webkitdirs.pm:2003 > + my $binDir = isWin64() ? "bin64" : "bin32"; > + my $productBinaryDir = File::Spec->catdir(productDir(), $binDir); these two lines could be before the if, then you could remove the duplicate code. 1130005 4 bfulgham 2015-10-01 12:39:12 -0700 Committed r190424: <http://trac.webkit.org/changeset/190424> 1130007 5 bfulgham 2015-10-01 12:43:00 -0700 (In reply to comment #3) > Comment on attachment 262277 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=262277&action=review > > > Tools/Scripts/webkitdirs.pm:2003 > > + my $binDir = isWin64() ? "bin64" : "bin32"; > > + my $productBinaryDir = File::Spec->catdir(productDir(), $binDir); > > these two lines could be before the if, then you could remove the duplicate > code. Good idea. Fixed. 262275 2015-10-01 12:27:57 -0700 2015-10-01 12:30:22 -0700 Patch bug-149718-20151001124341.patch text/plain 4294 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5MDQyMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI5IEBACisyMDE1LTEwLTAxICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIEZpeCBiZWhhdmlvciBvZiB3ZWJraXQtYnVpbGQtZGlyZWN0b3J5 IHNjcmlwdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ5NzE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVDb25maWd1cmF0aW9u UHJvZHVjdERpcik6IERvIG5vdCBpbmNsdWRlIHRoZSBiaW5hcnkKKyAgICAgICAgc3ViLWRpcmVj dG9yeSBpbiB0aGUgY29uZmlndXJhdGlvbiBwcm9kdWN0IGRpcmVjdG9yeSBvdXRwdXQuCisgICAg ICAgIChqc2NQcm9kdWN0RGlyKTogQXBwZW5kIGNvcnJlY3QgYmluYXJ5IHBhdGggZm9yIFdpbmRv d3MgYnVpbGQuCisgICAgICAgIChzZXRQYXRoRm9yUnVubmluZ1dlYktpdEFwcCk6IEluY2x1ZGUg cHJvcGVybHkgYmluYXJ5IHN1YmRpcmVjdG9yaWVzLgorICAgICAgICAocnVuU2FmYXJpKTogVXBk YXRlIGZvciByZXZpc2VkIHByb2R1Y3REaXIgYmVoYXZpb3IuCisgICAgICAgIChydW5NaW5pQnJv d3Nlcik6IERpdHRvLgorCisyMDE1LTA5LTMwICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBw bGUuY29tPgorCisgICAgICAgIE5lZWQgYSBzaG9ydCBkZXNjcmlwdGlvbiAoT09QUyEpLgorICAg ICAgICBOZWVkIHRoZSBidWcgVVJMIChPT1BTISkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAg IChjYW5Vc2VOaW5qYSk6CisgICAgICAgIChjYW5Vc2VFY2xpcHNlKToKKwogMjAxNS0xMC0wMSAg QWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAgICBTdG9wIGJ1aWxk aW5nIExheW91dFRlc3RSZWxheSBmb3Igbm93LiBJdCdzIGEgTWFjIHByb2plY3QsIGJ1dCBidWls ZC13ZWJraXQgdHJpZXMgdG8KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDE5MDQyMCkK KysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtNTU5LDgg KzU1OSw3IEBAIHN1YiBkZXRlcm1pbmVDb25maWd1cmF0aW9uUHJvZHVjdERpcgogICAgIGRldGVy bWluZUJhc2VQcm9kdWN0RGlyKCk7CiAgICAgZGV0ZXJtaW5lQ29uZmlndXJhdGlvbigpOwogICAg IGlmIChpc0FwcGxlV2luV2ViS2l0KCkgfHwgaXNXaW5DYWlybygpKSB7Ci0gICAgICAgIG15ICRi aW5EaXIgPSBpc1dpbjY0KCkgPyAiYmluNjQiIDogImJpbjMyIjsKLSAgICAgICAgJGNvbmZpZ3Vy YXRpb25Qcm9kdWN0RGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRiYXNlUHJvZHVjdERpciwgJGNv bmZpZ3VyYXRpb24sICRiaW5EaXIpOworICAgICAgICAkY29uZmlndXJhdGlvblByb2R1Y3REaXIg PSBGaWxlOjpTcGVjLT5jYXRkaXIoJGJhc2VQcm9kdWN0RGlyLCAkY29uZmlndXJhdGlvbik7CiAg ICAgfSBlbHNlIHsKICAgICAgICAgaWYgKHVzZXNQZXJDb25maWd1cmF0aW9uQnVpbGREaXJlY3Rv cnkoKSkgewogICAgICAgICAgICAgJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyID0gIiRiYXNlUHJv ZHVjdERpciI7CkBAIC02MTUsNiArNjE0LDEwIEBAIHN1YiBqc2NQcm9kdWN0RGlyCiB7CiAgICAg bXkgJHByb2R1Y3REaXIgPSBwcm9kdWN0RGlyKCk7CiAgICAgJHByb2R1Y3REaXIgLj0gIi9iaW4i IGlmIChpc0VmbCgpIHx8IGlzR3RrKCkpOworICAgIGlmIChpc0FueVdpbmRvd3MoKSkgeworICAg ICAgICBteSAkYmluRGlyID0gaXNXaW42NCgpID8gImJpbjY0IiA6ICJiaW4zMiI7CisgICAgICAg ICRwcm9kdWN0RGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKCRwcm9kdWN0RGlyLCAkYmluRGlyKTsK KyAgICB9CiAKICAgICByZXR1cm4gJHByb2R1Y3REaXI7CiB9CkBAIC0xOTk2LDExICsxOTk5LDE1 IEBAIHN1YiBzZXRQYXRoRm9yUnVubmluZ1dlYktpdEFwcAogICAgIG15ICgkZW52KSA9IEBfOwog CiAgICAgaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSkgewotICAgICAgICAkZW52LT57UEFUSH0gPSBq b2luKCc6JywgcHJvZHVjdERpcigpLCBhcHBsZUFwcGxpY2F0aW9uU3VwcG9ydFBhdGgoKSwgJGVu di0+e1BBVEh9IHx8ICIiKTsKKyAgICAgICAgbXkgJGJpbkRpciA9IGlzV2luNjQoKSA/ICJiaW42 NCIgOiAiYmluMzIiOworICAgICAgICBteSAkcHJvZHVjdEJpbmFyeURpciA9IEZpbGU6OlNwZWMt PmNhdGRpcihwcm9kdWN0RGlyKCksICRiaW5EaXIpOworICAgICAgICAkZW52LT57UEFUSH0gPSBq b2luKCc6JywgJHByb2R1Y3RCaW5hcnlEaXIsIGFwcGxlQXBwbGljYXRpb25TdXBwb3J0UGF0aCgp LCAkZW52LT57UEFUSH0gfHwgIiIpOwogICAgIH0gZWxzaWYgKGlzV2luQ2Fpcm8oKSkgewogICAg ICAgICBteSAkd2luQ2Fpcm9CaW4gPSBzb3VyY2VEaXIoKSAuICIvV2ViS2l0TGlicmFyaWVzL3dp bi8iIC4gKGlzV2luNjQoKSA/ICJiaW42NC8iIDogImJpbjMyLyIpOwogICAgICAgICBteSAkZ3N0 cmVhbWVyQmluID0gaXNXaW42NCgpID8gJEVOVnsiR1NUUkVBTUVSXzFfMF9ST09UX1g4Nl82NCJ9 IC4gImJpbiIgOiAkRU5WeyJHU1RSRUFNRVJfMV8wX1JPT1RfWDg2In0gLiAiYmluIjsKLSAgICAg ICAgJGVudi0+e1BBVEh9ID0gam9pbignOicsIHByb2R1Y3REaXIoKSwgJHdpbkNhaXJvQmluLCAk Z3N0cmVhbWVyQmluLCAkZW52LT57UEFUSH0gfHwgIiIpOworICAgICAgICBteSAkYmluRGlyID0g aXNXaW42NCgpID8gImJpbjY0IiA6ICJiaW4zMiI7CisgICAgICAgIG15ICRwcm9kdWN0QmluYXJ5 RGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKHByb2R1Y3REaXIoKSwgJGJpbkRpcik7CisgICAgICAg ICRlbnYtPntQQVRIfSA9IGpvaW4oJzonLCAkcHJvZHVjdEJpbmFyeURpciwgJHdpbkNhaXJvQmlu LCAkZ3N0cmVhbWVyQmluLCAkZW52LT57UEFUSH0gfHwgIiIpOwogICAgIH0KIH0KIApAQCAtMjQw MSw3ICsyNDA4LDggQEAgc3ViIHJ1blNhZmFyaQogICAgIGlmIChpc0FwcGxlV2luV2ViS2l0KCkp IHsKICAgICAgICAgbXkgJHJlc3VsdDsKICAgICAgICAgbXkgJHByb2R1Y3REaXIgPSBwcm9kdWN0 RGlyKCk7Ci0gICAgICAgIG15ICR3ZWJLaXRMYXVuY2hlclBhdGggPSBGaWxlOjpTcGVjLT5jYXRm aWxlKHByb2R1Y3REaXIoKSwgIldpbkxhdW5jaGVyLmV4ZSIpOworICAgICAgICBteSAkYmluRGly ID0gaXNXaW42NCgpID8gImJpbjY0IiA6ICJiaW4zMiI7CisgICAgICAgIG15ICR3ZWJLaXRMYXVu Y2hlclBhdGggPSBGaWxlOjpTcGVjLT5jYXRmaWxlKHByb2R1Y3REaXIoKSwgJGJpbkRpciwgIk1p bmlCcm93c2VyLmV4ZSIpOwogICAgICAgICByZXR1cm4gc3lzdGVtIHsgJHdlYktpdExhdW5jaGVy UGF0aCB9ICR3ZWJLaXRMYXVuY2hlclBhdGgsIEBBUkdWOwogICAgIH0KIApAQCAtMjQxMiw2ICsy NDIwLDEyIEBAIHN1YiBydW5NaW5pQnJvd3NlcgogewogICAgIGlmIChpc0FwcGxlTWFjV2ViS2l0 KCkpIHsKICAgICAgICAgcmV0dXJuIHJ1bk1hY1dlYktpdEFwcChGaWxlOjpTcGVjLT5jYXRmaWxl KHByb2R1Y3REaXIoKSwgIk1pbmlCcm93c2VyLmFwcCIsICJDb250ZW50cyIsICJNYWNPUyIsICJN aW5pQnJvd3NlciIpKTsKKyAgICB9IGVsc2lmIChpc0FwcGxlV2luV2ViS2l0KCkpIHsKKyAgICAg ICAgbXkgJHJlc3VsdDsKKyAgICAgICAgbXkgJHByb2R1Y3REaXIgPSBwcm9kdWN0RGlyKCk7Cisg ICAgICAgIG15ICRiaW5EaXIgPSBpc1dpbjY0KCkgPyAiYmluNjQiIDogImJpbjMyIjsKKyAgICAg ICAgbXkgJHdlYktpdExhdW5jaGVyUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUocHJvZHVjdERp cigpLCAkYmluRGlyLCAiTWluaUJyb3dzZXIuZXhlIik7CisgICAgICAgIHJldHVybiBzeXN0ZW0g eyAkd2ViS2l0TGF1bmNoZXJQYXRoIH0gJHdlYktpdExhdW5jaGVyUGF0aCwgQEFSR1Y7CiAgICAg fQogCiAgICAgcmV0dXJuIDE7Cg== 262277 2015-10-01 12:30:25 -0700 2015-10-01 12:35:32 -0700 Patch bug-149718-20151001124609.patch text/plain 4038 bfulgham SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE5MDQyMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE1LTEwLTAxICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29t PgorCisgICAgICAgIFtXaW5dIEZpeCBiZWhhdmlvciBvZiB3ZWJraXQtYnVpbGQtZGlyZWN0b3J5 IHNjcmlwdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ5NzE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVDb25maWd1cmF0aW9u UHJvZHVjdERpcik6IERvIG5vdCBpbmNsdWRlIHRoZSBiaW5hcnkKKyAgICAgICAgc3ViLWRpcmVj dG9yeSBpbiB0aGUgY29uZmlndXJhdGlvbiBwcm9kdWN0IGRpcmVjdG9yeSBvdXRwdXQuCisgICAg ICAgIChqc2NQcm9kdWN0RGlyKTogQXBwZW5kIGNvcnJlY3QgYmluYXJ5IHBhdGggZm9yIFdpbmRv d3MgYnVpbGQuCisgICAgICAgIChzZXRQYXRoRm9yUnVubmluZ1dlYktpdEFwcCk6IEluY2x1ZGUg cHJvcGVybHkgYmluYXJ5IHN1YmRpcmVjdG9yaWVzLgorICAgICAgICAocnVuU2FmYXJpKTogVXBk YXRlIGZvciByZXZpc2VkIHByb2R1Y3REaXIgYmVoYXZpb3IuCisgICAgICAgIChydW5NaW5pQnJv d3Nlcik6IERpdHRvLgorCiAyMDE1LTEwLTAxICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBw bGUuY29tPgogCiAgICAgICAgIFN0b3AgYnVpbGRpbmcgTGF5b3V0VGVzdFJlbGF5IGZvciBub3cu IEl0J3MgYSBNYWMgcHJvamVjdCwgYnV0IGJ1aWxkLXdlYmtpdCB0cmllcyB0bwpJbmRleDogVG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbQkocmV2aXNpb24gMTkwNDIwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJz LnBtCSh3b3JraW5nIGNvcHkpCkBAIC01NTksOCArNTU5LDcgQEAgc3ViIGRldGVybWluZUNvbmZp Z3VyYXRpb25Qcm9kdWN0RGlyCiAgICAgZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIoKTsKICAgICBk ZXRlcm1pbmVDb25maWd1cmF0aW9uKCk7CiAgICAgaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSB8fCBp c1dpbkNhaXJvKCkpIHsKLSAgICAgICAgbXkgJGJpbkRpciA9IGlzV2luNjQoKSA/ICJiaW42NCIg OiAiYmluMzIiOwotICAgICAgICAkY29uZmlndXJhdGlvblByb2R1Y3REaXIgPSBGaWxlOjpTcGVj LT5jYXRkaXIoJGJhc2VQcm9kdWN0RGlyLCAkY29uZmlndXJhdGlvbiwgJGJpbkRpcik7CisgICAg ICAgICRjb25maWd1cmF0aW9uUHJvZHVjdERpciA9IEZpbGU6OlNwZWMtPmNhdGRpcigkYmFzZVBy b2R1Y3REaXIsICRjb25maWd1cmF0aW9uKTsKICAgICB9IGVsc2UgewogICAgICAgICBpZiAodXNl c1BlckNvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSgpKSB7CiAgICAgICAgICAgICAkY29uZmln dXJhdGlvblByb2R1Y3REaXIgPSAiJGJhc2VQcm9kdWN0RGlyIjsKQEAgLTYxNSw2ICs2MTQsMTAg QEAgc3ViIGpzY1Byb2R1Y3REaXIKIHsKICAgICBteSAkcHJvZHVjdERpciA9IHByb2R1Y3REaXIo KTsKICAgICAkcHJvZHVjdERpciAuPSAiL2JpbiIgaWYgKGlzRWZsKCkgfHwgaXNHdGsoKSk7Cisg ICAgaWYgKGlzQW55V2luZG93cygpKSB7CisgICAgICAgIG15ICRiaW5EaXIgPSBpc1dpbjY0KCkg PyAiYmluNjQiIDogImJpbjMyIjsKKyAgICAgICAgJHByb2R1Y3REaXIgPSBGaWxlOjpTcGVjLT5j YXRkaXIoJHByb2R1Y3REaXIsICRiaW5EaXIpOworICAgIH0KIAogICAgIHJldHVybiAkcHJvZHVj dERpcjsKIH0KQEAgLTE5OTYsMTEgKzE5OTksMTUgQEAgc3ViIHNldFBhdGhGb3JSdW5uaW5nV2Vi S2l0QXBwCiAgICAgbXkgKCRlbnYpID0gQF87CiAKICAgICBpZiAoaXNBcHBsZVdpbldlYktpdCgp KSB7Ci0gICAgICAgICRlbnYtPntQQVRIfSA9IGpvaW4oJzonLCBwcm9kdWN0RGlyKCksIGFwcGxl QXBwbGljYXRpb25TdXBwb3J0UGF0aCgpLCAkZW52LT57UEFUSH0gfHwgIiIpOworICAgICAgICBt eSAkYmluRGlyID0gaXNXaW42NCgpID8gImJpbjY0IiA6ICJiaW4zMiI7CisgICAgICAgIG15ICRw cm9kdWN0QmluYXJ5RGlyID0gRmlsZTo6U3BlYy0+Y2F0ZGlyKHByb2R1Y3REaXIoKSwgJGJpbkRp cik7CisgICAgICAgICRlbnYtPntQQVRIfSA9IGpvaW4oJzonLCAkcHJvZHVjdEJpbmFyeURpciwg YXBwbGVBcHBsaWNhdGlvblN1cHBvcnRQYXRoKCksICRlbnYtPntQQVRIfSB8fCAiIik7CiAgICAg fSBlbHNpZiAoaXNXaW5DYWlybygpKSB7CiAgICAgICAgIG15ICR3aW5DYWlyb0JpbiA9IHNvdXJj ZURpcigpIC4gIi9XZWJLaXRMaWJyYXJpZXMvd2luLyIgLiAoaXNXaW42NCgpID8gImJpbjY0LyIg OiAiYmluMzIvIik7CiAgICAgICAgIG15ICRnc3RyZWFtZXJCaW4gPSBpc1dpbjY0KCkgPyAkRU5W eyJHU1RSRUFNRVJfMV8wX1JPT1RfWDg2XzY0In0gLiAiYmluIiA6ICRFTlZ7IkdTVFJFQU1FUl8x XzBfUk9PVF9YODYifSAuICJiaW4iOwotICAgICAgICAkZW52LT57UEFUSH0gPSBqb2luKCc6Jywg cHJvZHVjdERpcigpLCAkd2luQ2Fpcm9CaW4sICRnc3RyZWFtZXJCaW4sICRlbnYtPntQQVRIfSB8 fCAiIik7CisgICAgICAgIG15ICRiaW5EaXIgPSBpc1dpbjY0KCkgPyAiYmluNjQiIDogImJpbjMy IjsKKyAgICAgICAgbXkgJHByb2R1Y3RCaW5hcnlEaXIgPSBGaWxlOjpTcGVjLT5jYXRkaXIocHJv ZHVjdERpcigpLCAkYmluRGlyKTsKKyAgICAgICAgJGVudi0+e1BBVEh9ID0gam9pbignOicsICRw cm9kdWN0QmluYXJ5RGlyLCAkd2luQ2Fpcm9CaW4sICRnc3RyZWFtZXJCaW4sICRlbnYtPntQQVRI fSB8fCAiIik7CiAgICAgfQogfQogCkBAIC0yNDAxLDcgKzI0MDgsOCBAQCBzdWIgcnVuU2FmYXJp CiAgICAgaWYgKGlzQXBwbGVXaW5XZWJLaXQoKSkgewogICAgICAgICBteSAkcmVzdWx0OwogICAg ICAgICBteSAkcHJvZHVjdERpciA9IHByb2R1Y3REaXIoKTsKLSAgICAgICAgbXkgJHdlYktpdExh dW5jaGVyUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUocHJvZHVjdERpcigpLCAiV2luTGF1bmNo ZXIuZXhlIik7CisgICAgICAgIG15ICRiaW5EaXIgPSBpc1dpbjY0KCkgPyAiYmluNjQiIDogImJp bjMyIjsKKyAgICAgICAgbXkgJHdlYktpdExhdW5jaGVyUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZp bGUocHJvZHVjdERpcigpLCAkYmluRGlyLCAiTWluaUJyb3dzZXIuZXhlIik7CiAgICAgICAgIHJl dHVybiBzeXN0ZW0geyAkd2ViS2l0TGF1bmNoZXJQYXRoIH0gJHdlYktpdExhdW5jaGVyUGF0aCwg QEFSR1Y7CiAgICAgfQogCkBAIC0yNDEyLDYgKzI0MjAsMTIgQEAgc3ViIHJ1bk1pbmlCcm93c2Vy CiB7CiAgICAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkgewogICAgICAgICByZXR1cm4gcnVuTWFj V2ViS2l0QXBwKEZpbGU6OlNwZWMtPmNhdGZpbGUocHJvZHVjdERpcigpLCAiTWluaUJyb3dzZXIu YXBwIiwgIkNvbnRlbnRzIiwgIk1hY09TIiwgIk1pbmlCcm93c2VyIikpOworICAgIH0gZWxzaWYg KGlzQXBwbGVXaW5XZWJLaXQoKSkgeworICAgICAgICBteSAkcmVzdWx0OworICAgICAgICBteSAk cHJvZHVjdERpciA9IHByb2R1Y3REaXIoKTsKKyAgICAgICAgbXkgJGJpbkRpciA9IGlzV2luNjQo KSA/ICJiaW42NCIgOiAiYmluMzIiOworICAgICAgICBteSAkd2ViS2l0TGF1bmNoZXJQYXRoID0g RmlsZTo6U3BlYy0+Y2F0ZmlsZShwcm9kdWN0RGlyKCksICRiaW5EaXIsICJNaW5pQnJvd3Nlci5l eGUiKTsKKyAgICAgICAgcmV0dXJuIHN5c3RlbSB7ICR3ZWJLaXRMYXVuY2hlclBhdGggfSAkd2Vi S2l0TGF1bmNoZXJQYXRoLCBAQVJHVjsKICAgICB9CiAKICAgICByZXR1cm4gMTsK