123206 2013-10-23 07:15:50 -0700 Build scripts should add |Win32 for Windows 32-bit builds 2013-10-23 13:53:51 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P3 Minor --- 0 alex.christensen webkit-unassigned bfulgham buildbot commit-queue dbates eflews.bot gtk-ews gyuyoung.kim philn rniwa xan.lopez oldest_to_newest 942670 0 alex.christensen 2013-10-23 07:15:50 -0700 I thought we did not need to be this explicit, but after opening a solution, building it with the x64 configuration, then running build-webkit or build-jsc, it defaults to the 64-bit build. The script should add |Win32 or |x64, depending on the desired configuration. 942676 1 214958 alex.christensen 2013-10-23 07:27:50 -0700 Created attachment 214958 Patch 942677 2 214958 buildbot 2013-10-23 07:29:08 -0700 Comment on attachment 214958 Patch Attachment 214958 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/9658010 942678 3 214958 eflews.bot 2013-10-23 07:31:37 -0700 Comment on attachment 214958 Patch Attachment 214958 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/9848012 942689 4 214958 buildbot 2013-10-23 08:08:56 -0700 Comment on attachment 214958 Patch Attachment 214958 did not pass mac-ews (mac): Output: http://webkit-queues.appspot.com/results/9858010 942690 5 214958 eflews.bot 2013-10-23 08:10:06 -0700 Comment on attachment 214958 Patch Attachment 214958 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/9958002 942701 6 214958 gtk-ews 2013-10-23 08:51:32 -0700 Comment on attachment 214958 Patch Attachment 214958 did not pass gtk-ews (gtk): Output: http://webkit-queues.appspot.com/results/4548155 942777 7 214980 alex.christensen 2013-10-23 12:18:39 -0700 Created attachment 214980 Patch 942795 8 214980 bfulgham 2013-10-23 13:02:26 -0700 Comment on attachment 214980 Patch r=me 942796 9 214980 bfulgham 2013-10-23 13:05:16 -0700 Comment on attachment 214980 Patch Whoops! This doesn't work. It's putting the "|Win32" into the path. 942802 10 214986 alex.christensen 2013-10-23 13:17:11 -0700 Created attachment 214986 Patch 942806 11 214986 bfulgham 2013-10-23 13:29:21 -0700 Comment on attachment 214986 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=214986&action=review r=me > Tools/Scripts/old-run-webkit-tests:436 > + $dumpToolName .= "_debug" if configuration() eq "Debug_All"; I think this is now called "DebugSuffix" in the Visual Studio project, but I'm not sure if other targets use "Debug_All" to define their builds. We might want to change this to "DebugSuffix" if it's only used on Windows. 942825 12 214986 commit-queue 2013-10-23 13:53:48 -0700 Comment on attachment 214986 Patch Clearing flags on attachment: 214986 Committed r157882: <http://trac.webkit.org/changeset/157882> 942826 13 commit-queue 2013-10-23 13:53:51 -0700 All reviewed patches have been landed. Closing bug. 214958 2013-10-23 07:27:50 -0700 2013-10-23 12:18:36 -0700 Patch bug-123206-20131023082750.patch text/plain 2453 alex.christensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1Nzg1NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDEzLTEwLTIzICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgRXhwbGljaXRseSBidWlsZCBXaW4zMiBvciB4NjQgY29uZmln dXJhdGlvbiBvbiBXaW5kb3dzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTIzMjA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVD b25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGlvKToKKyAgICAgICAgKGRldGVybWluZVBhc3NlZENv bmZpZ3VyYXRpb24pOgorICAgICAgICBBZGQgfFdpbjMyIHRvIHRoZSBlbmQgb2YgMzItYml0IFZp c3VhbCBTdHVkaW8gYnVpbGQgY29uZmlndXJhdGlvbnMuCisKIDIwMTMtMTAtMjIgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgRGFzaGJvYXJkIHJlcGFp bnRzIGNvbnN0YW50bHkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDE1NzgyMCkKKysr IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtNDYwLDcgKzQ2 MCw3IEBAIHN1YiBkZXRlcm1pbmVDb25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGkKICAgICByZXR1 cm4gaWYgZGVmaW5lZCAkY29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbzsKICAgICBkZXRlcm1p bmVDb25maWd1cmF0aW9uKCk7CiAgICAgIyBGSVhNRTogV2Ugc2hvdWxkIGRldGVjdCB3aGVuIERl YnVnX0FsbCBvciBQcm9kdWN0aW9uIGhhcyBiZWVuIGNob3Nlbi4KLSAgICAkY29uZmlndXJhdGlv bkZvclZpc3VhbFN0dWRpbyA9ICRjb25maWd1cmF0aW9uIC4gKGlzV2luNjQoKSA/ICJ8eDY0IiA6 ICIiKTsKKyAgICAkY29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbyA9ICRjb25maWd1cmF0aW9u IC4gKGlzV2luNjQoKSA/ICJ8eDY0IiA6ICJ8V2luMzIiKTsKIH0KIAogc3ViIHVzZXNQZXJDb25m aWd1cmF0aW9uQnVpbGREaXJlY3RvcnkKQEAgLTYyMCwyMSArNjIwLDIxIEBAIHN1YiBkZXRlcm1p bmVQYXNzZWRDb25maWd1cmF0aW9uCiAgICAgICAgICAgICBzcGxpY2UoQEFSR1YsICRpLCAxKTsK ICAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uID0gIkRlYnVnIjsKICAgICAgICAgICAg ICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfV2luQ2Fpcm8iIGlmIChpc1dpbkNhaXJvKCkgJiYg aXNDeWd3aW4oKSk7Ci0gICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAuPSAifHg2NCIg aWYgaXNXaW42NCgpOworICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gLj0gKGlzV2lu NjQoKSA/ICJ8eDY0IiA6ICJ8V2luMzIiKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg fQogICAgICAgICBpZiAoJG9wdCA9fiAvXi0tcmVsZWFzZSQvaSkgewogICAgICAgICAgICAgc3Bs aWNlKEBBUkdWLCAkaSwgMSk7CiAgICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9ICJS ZWxlYXNlIjsKICAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJfV2luQ2Fpcm8i IGlmIChpc1dpbkNhaXJvKCkgJiYgaXNDeWd3aW4oKSk7Ci0gICAgICAgICAgICAkcGFzc2VkQ29u ZmlndXJhdGlvbiAuPSAifHg2NCIgaWYgaXNXaW42NCgpOworICAgICAgICAgICAgJHBhc3NlZENv bmZpZ3VyYXRpb24gLj0gKGlzV2luNjQoKSA/ICJ8eDY0IiA6ICJ8V2luMzIiKTsKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBpZiAoJG9wdCA9fiAvXi0tcHJvZmlsKGV8 aW5nKSQvaSkgewogICAgICAgICAgICAgc3BsaWNlKEBBUkdWLCAkaSwgMSk7CiAgICAgICAgICAg ICAkcGFzc2VkQ29uZmlndXJhdGlvbiA9ICJQcm9maWxpbmciOwogICAgICAgICAgICAgJHBhc3Nl ZENvbmZpZ3VyYXRpb24gLj0gIl9XaW5DYWlybyIgaWYgKGlzV2luQ2Fpcm8oKSAmJiBpc0N5Z3dp bigpKTsKLSAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJ8eDY0IiBpZiBpc1dp bjY0KCk7CisgICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAuPSAoaXNXaW42NCgpID8g Inx4NjQiIDogInxXaW4zMiIpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAg fQo= 214980 2013-10-23 12:18:39 -0700 2013-10-23 13:17:07 -0700 Patch bug-123206-20131023131839.patch text/plain 2470 alex.christensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1Nzg1NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDEzLTEwLTIzICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgRXhwbGljaXRseSBidWlsZCBXaW4zMiBvciB4NjQgY29uZmln dXJhdGlvbiBvbiBXaW5kb3dzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTIzMjA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVD b25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGlvKToKKyAgICAgICAgKGRldGVybWluZVBhc3NlZENv bmZpZ3VyYXRpb24pOgorICAgICAgICBBZGQgfFdpbjMyIHRvIHRoZSBlbmQgb2YgMzItYml0IFZp c3VhbCBTdHVkaW8gYnVpbGQgY29uZmlndXJhdGlvbnMuCisKIDIwMTMtMTAtMjIgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgRGFzaGJvYXJkIHJlcGFp bnRzIGNvbnN0YW50bHkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDE1NzgyMCkKKysr IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtNDYwLDcgKzQ2 MCw3IEBAIHN1YiBkZXRlcm1pbmVDb25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGkKICAgICByZXR1 cm4gaWYgZGVmaW5lZCAkY29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbzsKICAgICBkZXRlcm1p bmVDb25maWd1cmF0aW9uKCk7CiAgICAgIyBGSVhNRTogV2Ugc2hvdWxkIGRldGVjdCB3aGVuIERl YnVnX0FsbCBvciBQcm9kdWN0aW9uIGhhcyBiZWVuIGNob3Nlbi4KLSAgICAkY29uZmlndXJhdGlv bkZvclZpc3VhbFN0dWRpbyA9ICRjb25maWd1cmF0aW9uIC4gKGlzV2luNjQoKSA/ICJ8eDY0IiA6 ICIiKTsKKyAgICAkY29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbyA9ICRjb25maWd1cmF0aW9u IC4gKGlzV2luNjQoKSA/ICJ8eDY0IiA6ICJ8V2luMzIiKTsKIH0KIAogc3ViIHVzZXNQZXJDb25m aWd1cmF0aW9uQnVpbGREaXJlY3RvcnkKQEAgLTYyMSw2ICs2MjEsNyBAQCBzdWIgZGV0ZXJtaW5l UGFzc2VkQ29uZmlndXJhdGlvbgogICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSAi RGVidWciOwogICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gLj0gIl9XaW5DYWlybyIg aWYgKGlzV2luQ2Fpcm8oKSAmJiBpc0N5Z3dpbigpKTsKICAgICAgICAgICAgICRwYXNzZWRDb25m aWd1cmF0aW9uIC49ICJ8eDY0IiBpZiBpc1dpbjY0KCk7CisgICAgICAgICAgICAkcGFzc2VkQ29u ZmlndXJhdGlvbiAuPSAifFdpbjMyIiBpZiBpc1dpbmRvd3MoKSAmJiAhaXNXaW42NCgpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlmICgkb3B0ID1+IC9eLS1yZWxl YXNlJC9pKSB7CkBAIC02MjgsNiArNjI5LDcgQEAgc3ViIGRldGVybWluZVBhc3NlZENvbmZpZ3Vy YXRpb24KICAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uID0gIlJlbGVhc2UiOwogICAg ICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gLj0gIl9XaW5DYWlybyIgaWYgKGlzV2luQ2Fp cm8oKSAmJiBpc0N5Z3dpbigpKTsKICAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49 ICJ8eDY0IiBpZiBpc1dpbjY0KCk7CisgICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAu PSAifFdpbjMyIiBpZiBpc1dpbmRvd3MoKSAmJiAhaXNXaW42NCgpOwogICAgICAgICAgICAgcmV0 dXJuOwogICAgICAgICB9CiAgICAgICAgIGlmICgkb3B0ID1+IC9eLS1wcm9maWwoZXxpbmcpJC9p KSB7CkBAIC02MzUsNiArNjM3LDcgQEAgc3ViIGRldGVybWluZVBhc3NlZENvbmZpZ3VyYXRpb24K ICAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uID0gIlByb2ZpbGluZyI7CiAgICAgICAg ICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAuPSAiX1dpbkNhaXJvIiBpZiAoaXNXaW5DYWlybygp ICYmIGlzQ3lnd2luKCkpOwogICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gLj0gInx4 NjQiIGlmIGlzV2luNjQoKTsKKyAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJ8 V2luMzIiIGlmIGlzV2luZG93cygpICYmICFpc1dpbjY0KCk7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KICAgICB9Cg== 214986 2013-10-23 13:17:11 -0700 2013-10-23 13:53:48 -0700 Patch bug-123206-20131023141710.patch text/plain 8017 alex.christensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1Nzg3OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDEzLTEwLTIzICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgRXhwbGljaXRseSBidWlsZCBXaW4zMiBvciB4NjQgY29uZmln dXJhdGlvbiBvbiBXaW5kb3dzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTIzMjA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChqc2NQYXRoKToK KyAgICAgICAgKGRldGVybWluZUNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8pOgorICAgICAg ICAoZGV0ZXJtaW5lUGFzc2VkQ29uZmlndXJhdGlvbik6CisgICAgICAgIEFkZCB8V2luMzIgdG8g dGhlIGVuZCBvZiAzMi1iaXQgVmlzdWFsIFN0dWRpbyBidWlsZCBjb25maWd1cmF0aW9ucy4KKyAg ICAgICAgKHNhZmFyaVBhdGgpOgorICAgICAgICAqIFNjcmlwdHMvYnVpbGQtd2Via2l0OgorICAg ICAgICAqIFNjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHM6CisgICAgICAgICogU2NyaXB0cy9y dW4tYXBpLXRlc3RzOgorICAgICAgICAodGVzdFRvb2xQYXRoKToKKyAgICAgICAgKiBTY3JpcHRz L3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0czoKKyAgICAgICAgKHRlc3RhcGlQYXRoKToKKyAgICAg ICAgKiBTY3JpcHRzL3J1bi1yZWdleHAtdGVzdHM6CisgICAgICAgICh0ZXN0YXBpUGF0aCk6Cisg ICAgICAgICogU2NyaXB0cy9zdW5zcGlkZXItY29tcGFyZS1yZXN1bHRzOgorICAgICAgICAocGF0 aFRvQnVpbHRKU0MpOgorICAgICAgICBVc2UgY29uZmlndXJhdGlvbiBpbnN0ZWFkIG9mIGNvbmZp Z3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8sIHdoaWNoIGFyZSBub3cgYWx3YXlzIGRpZmZlcmVudC4K KwogMjAxMy0xMC0yMyAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAg UmUtaW5zdGF0ZSBQcm9wb3NlZERhdGFiYXNlcyBuZWVkZWQgYnkgZGV0YWlsc0Zvck5hbWVBbmRP cmlnaW4oKS4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0CShyZXZpc2lvbiAxNTc4MjApCisrKyBUb29scy9T Y3JpcHRzL2J1aWxkLXdlYmtpdAkod29ya2luZyBjb3B5KQpAQCAtMjgxLDcgKzI4MSw3IEBAIGZv ciBteSAkZGlyIChAcHJvamVjdHMpIHsKICAgICAgICAgaWYgKCRwcm9qZWN0IGVxICJXZWJLaXQi KSB7CiAgICAgICAgICAgICBteSAkd2Via2l0U29sdXRpb25QYXRoID0gIldlYktpdC52Y3hwcm9q L1dlYktpdC5zbG4iOwogICAgICAgICAgICAgJHJlc3VsdCA9IGJ1aWxkVmlzdWFsU3R1ZGlvUHJv amVjdCgkd2Via2l0U29sdXRpb25QYXRoLCAkY2xlYW4pOwotICAgICAgICAgICAgbXkgJHZzQ29u ZmlndXJhdGlvbiA9IGNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKTsKKyAgICAgICAgICAg IG15ICR2c0NvbmZpZ3VyYXRpb24gPSBjb25maWd1cmF0aW9uKCk7CiAgICAgICAgICAgICBpZiAo dXNpbmdWaXN1YWxTdHVkaW9FeHByZXNzKCkpIHsKICAgICAgICAgICAgICAgICAjIFZpc3VhbCBT dHVkaW8gRXhwcmVzcyBpcyBzbyBsYW1lIGl0IGNhbid0IHN0ZG91dCBidWlsZCBmYWlsdXJlcy4K ICAgICAgICAgICAgICAgICAjIFNvIHdlIGZpbmQgaXRzIGxvZ3MgYW5kIGR1bXAgdGhlbSB0byB0 aGUgY29uc29sZSBvdXJzZWx2ZXMuCkluZGV4OiBUb29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0 LXRlc3RzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHMJ KHJldmlzaW9uIDE1NzgyMCkKKysrIFRvb2xzL1NjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHMJ KHdvcmtpbmcgY29weSkKQEAgLTQzMywxNiArNDMzLDE2IEBAIGlmICghZGVmaW5lZCgkcm9vdCkg JiYgISRub0J1aWxkRHVtcFRvb2wKIG15ICRkdW1wVG9vbE5hbWUgPSAkdXNlV2ViS2l0VGVzdFJ1 bm5lciA/ICJXZWJLaXRUZXN0UnVubmVyIiA6ICJEdW1wUmVuZGVyVHJlZSI7CiAKIGlmIChpc0Fw cGxlV2luV2ViS2l0KCkpIHsKLSAgICAkZHVtcFRvb2xOYW1lIC49ICJfZGVidWciIGlmIGNvbmZp Z3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKSBlcSAiRGVidWdfQWxsIjsKLSAgICAkZHVtcFRvb2xO YW1lIC49ICJfZGVidWciIGlmIGNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKSBlcSAiRGVi dWdfQ2Fpcm9fQ0ZMaXRlIjsKKyAgICAkZHVtcFRvb2xOYW1lIC49ICJfZGVidWciIGlmIGNvbmZp Z3VyYXRpb24oKSBlcSAiRGVidWdfQWxsIjsKKyAgICAkZHVtcFRvb2xOYW1lIC49ICJfZGVidWci IGlmIGNvbmZpZ3VyYXRpb24oKSBlcSAiRGVidWdfQ2Fpcm8iOwogICAgICRkdW1wVG9vbE5hbWUg Lj0gJENvbmZpZ3tfZXhlfTsKIH0KIG15ICRkdW1wVG9vbCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUo JHByb2R1Y3REaXIsICRkdW1wVG9vbE5hbWUpOwogZGllICJjYW4ndCBmaW5kIGV4ZWN1dGFibGUg JGR1bXBUb29sTmFtZSAobG9va2VkIGluICRwcm9kdWN0RGlyKVxuIiB1bmxlc3MgLXggJGR1bXBU b29sOwogCiBteSAkaW1hZ2VEaWZmVG9vbCA9ICIkcHJvZHVjdERpci9JbWFnZURpZmYiOwotJGlt YWdlRGlmZlRvb2wgLj0gIl9kZWJ1ZyIgaWYgaXNDeWd3aW4oKSAmJiBjb25maWd1cmF0aW9uRm9y VmlzdWFsU3R1ZGlvKCkgZXEgIkRlYnVnX0FsbCI7Ci0kaW1hZ2VEaWZmVG9vbCAuPSAiX2RlYnVn IiBpZiBpc0N5Z3dpbigpICYmIGNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKSBlcSAiRGVi dWdfQ2Fpcm9fQ0ZMaXRlIjsKKyRpbWFnZURpZmZUb29sIC49ICJfZGVidWciIGlmIGlzQ3lnd2lu KCkgJiYgY29uZmlndXJhdGlvbigpIGVxICJEZWJ1Z19BbGwiOworJGltYWdlRGlmZlRvb2wgLj0g Il9kZWJ1ZyIgaWYgaXNDeWd3aW4oKSAmJiBjb25maWd1cmF0aW9uKCkgZXEgIkRlYnVnX0NhaXJv IjsKIGRpZSAiY2FuJ3QgZmluZCBleGVjdXRhYmxlICRpbWFnZURpZmZUb29sIChsb29rZWQgaW4g JHByb2R1Y3REaXIpXG4iIGlmICRwaXhlbFRlc3RzICYmICEteCAkaW1hZ2VEaWZmVG9vbDsKIAog Y2hlY2tGcmFtZXdvcmtzKCkgdW5sZXNzIGlzQ3lnd2luKCk7CkluZGV4OiBUb29scy9TY3JpcHRz L3J1bi1hcGktdGVzdHMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9ydW4tYXBpLXRlc3Rz CShyZXZpc2lvbiAxNTc4MjApCisrKyBUb29scy9TY3JpcHRzL3J1bi1hcGktdGVzdHMJKHdvcmtp bmcgY29weSkKQEAgLTMzMCw3ICszMzAsNyBAQCBzdWIgdGVzdFRvb2xQYXRoKCkKICAgICByZXR1 cm4gJHBhdGggdW5sZXNzIGlzQXBwbGVXaW5XZWJLaXQoKTsKIAogICAgIG15ICRzdWZmaXg7Ci0g ICAgaWYgKGNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKSBlcSAiRGVidWdfQWxsIikgewor ICAgIGlmIChjb25maWd1cmF0aW9uKCkgZXEgIkRlYnVnX0FsbCIpIHsKICAgICAgICAgJHN1ZmZp eCA9ICJfZGVidWciOwogICAgIH0gZWxzZSB7CiAgICAgICAgICRzdWZmaXggPSAiIjsKSW5kZXg6 IFRvb2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvcnVuLWphdmFzY3JpcHRjb3JlLXRlc3RzCShyZXZpc2lvbiAxNTc4MjApCisr KyBUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cwkod29ya2luZyBjb3B5KQpA QCAtMTQ1LDcgKzE0NSw3IEBAIHN1YiB0ZXN0YXBpUGF0aCgkKQogewogICAgIG15ICgkcHJvZHVj dERpcikgPSBAXzsKICAgICBteSAkanNjTmFtZSA9ICJ0ZXN0YXBpIjsKLSAgICAkanNjTmFtZSAu PSAiX2RlYnVnIiBpZiBjb25maWd1cmF0aW9uRm9yVmlzdWFsU3R1ZGlvKCkgZXEgIkRlYnVnX0Fs bCI7CisgICAgJGpzY05hbWUgLj0gIl9kZWJ1ZyIgaWYgY29uZmlndXJhdGlvbigpIGVxICJEZWJ1 Z19BbGwiOwogICAgIHJldHVybiAiJHByb2R1Y3REaXIvJGpzY05hbWUiOwogfQogCkluZGV4OiBU b29scy9TY3JpcHRzL3J1bi1yZWdleHAtdGVzdHMKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy9ydW4tcmVnZXhwLXRlc3RzCShyZXZpc2lvbiAxNTc4MjApCisrKyBUb29scy9TY3JpcHRzL3J1 bi1yZWdleHAtdGVzdHMJKHdvcmtpbmcgY29weSkKQEAgLTEwMCw3ICsxMDAsNyBAQCBzdWIgdGVz dGFwaVBhdGgoJCkKIHsKICAgICBteSAoJHByb2R1Y3REaXIpID0gQF87CiAgICAgbXkgJGpzY05h bWUgPSAidGVzdGFwaSI7Ci0gICAgJGpzY05hbWUgLj0gIl9kZWJ1ZyIgaWYgY29uZmlndXJhdGlv bkZvclZpc3VhbFN0dWRpbygpIGVxICJEZWJ1Z19BbGwiOworICAgICRqc2NOYW1lIC49ICJfZGVi dWciIGlmIGNvbmZpZ3VyYXRpb24oKSBlcSAiRGVidWdfQWxsIjsKICAgICByZXR1cm4gIiRwcm9k dWN0RGlyLyRqc2NOYW1lIjsKIH0KIApJbmRleDogVG9vbHMvU2NyaXB0cy9zdW5zcGlkZXItY29t cGFyZS1yZXN1bHRzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvc3Vuc3BpZGVyLWNvbXBh cmUtcmVzdWx0cwkocmV2aXNpb24gMTU3ODIwKQorKysgVG9vbHMvU2NyaXB0cy9zdW5zcGlkZXIt Y29tcGFyZS1yZXN1bHRzCSh3b3JraW5nIGNvcHkpCkBAIC05MSw3ICs5MSw3IEBAIHN1YiBwYXRo VG9CdWlsdEpTQygkKQogewogICAgIG15ICgkcHJvZHVjdERpcikgPSBAXzsKICAgICBteSAkanNj TmFtZSA9ICJqc2MiOwotICAgICRqc2NOYW1lIC49ICJfZGVidWciIGlmIGNvbmZpZ3VyYXRpb25G b3JWaXN1YWxTdHVkaW8oKSBlcSAiRGVidWdfQWxsIjsKKyAgICAkanNjTmFtZSAuPSAiX2RlYnVn IiBpZiBjb25maWd1cmF0aW9uKCkgZXEgIkRlYnVnX0FsbCI7CiAgICAgcmV0dXJuICIkcHJvZHVj dERpci8kanNjTmFtZSI7CiB9CiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0JKHJldmlzaW9uIDE1Nzgy MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQkod29ya2luZyBjb3B5KQpAQCAtMzYx LDcgKzM2MSw3IEBAIHN1YiBqc2NQYXRoKCQpCiB7CiAgICAgbXkgKCRwcm9kdWN0RGlyKSA9IEBf OwogICAgIG15ICRqc2NOYW1lID0gImpzYyI7Ci0gICAgJGpzY05hbWUgLj0gIl9kZWJ1ZyIgIGlm IGNvbmZpZ3VyYXRpb25Gb3JWaXN1YWxTdHVkaW8oKSBlcSAiRGVidWdfQWxsIjsKKyAgICAkanNj TmFtZSAuPSAiX2RlYnVnIiAgaWYgY29uZmlndXJhdGlvbigpIGVxICJEZWJ1Z19BbGwiOwogICAg ICRqc2NOYW1lIC49ICIuZXhlIiBpZiAoaXNXaW5kb3dzKCkgfHwgaXNDeWd3aW4oKSk7CiAgICAg cmV0dXJuICIkcHJvZHVjdERpci8kanNjTmFtZSIgaWYgLWUgIiRwcm9kdWN0RGlyLyRqc2NOYW1l IjsKICAgICByZXR1cm4gIiRwcm9kdWN0RGlyL0phdmFTY3JpcHRDb3JlLmZyYW1ld29yay9SZXNv dXJjZXMvJGpzY05hbWUiOwpAQCAtNDYwLDcgKzQ2MCw3IEBAIHN1YiBkZXRlcm1pbmVDb25maWd1 cmF0aW9uRm9yVmlzdWFsU3R1ZGkKICAgICByZXR1cm4gaWYgZGVmaW5lZCAkY29uZmlndXJhdGlv bkZvclZpc3VhbFN0dWRpbzsKICAgICBkZXRlcm1pbmVDb25maWd1cmF0aW9uKCk7CiAgICAgIyBG SVhNRTogV2Ugc2hvdWxkIGRldGVjdCB3aGVuIERlYnVnX0FsbCBvciBQcm9kdWN0aW9uIGhhcyBi ZWVuIGNob3Nlbi4KLSAgICAkY29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbyA9ICRjb25maWd1 cmF0aW9uIC4gKGlzV2luNjQoKSA/ICJ8eDY0IiA6ICIiKTsKKyAgICAkY29uZmlndXJhdGlvbkZv clZpc3VhbFN0dWRpbyA9ICRjb25maWd1cmF0aW9uIC4gKGlzV2luNjQoKSA/ICJ8eDY0IiA6ICJ8 V2luMzIiKTsKIH0KIAogc3ViIHVzZXNQZXJDb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkKQEAg LTYyMSw2ICs2MjEsNyBAQCBzdWIgZGV0ZXJtaW5lUGFzc2VkQ29uZmlndXJhdGlvbgogICAgICAg ICAgICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gPSAiRGVidWciOwogICAgICAgICAgICAgJHBhc3Nl ZENvbmZpZ3VyYXRpb24gLj0gIl9XaW5DYWlybyIgaWYgKGlzV2luQ2Fpcm8oKSAmJiBpc0N5Z3dp bigpKTsKICAgICAgICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJ8eDY0IiBpZiBpc1dp bjY0KCk7CisgICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAuPSAifFdpbjMyIiBpZiBp c1dpbmRvd3MoKSAmJiAhaXNXaW42NCgpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CiAgICAgICAgIGlmICgkb3B0ID1+IC9eLS1yZWxlYXNlJC9pKSB7CkBAIC02MjgsNiArNjI5LDcg QEAgc3ViIGRldGVybWluZVBhc3NlZENvbmZpZ3VyYXRpb24KICAgICAgICAgICAgICRwYXNzZWRD b25maWd1cmF0aW9uID0gIlJlbGVhc2UiOwogICAgICAgICAgICAgJHBhc3NlZENvbmZpZ3VyYXRp b24gLj0gIl9XaW5DYWlybyIgaWYgKGlzV2luQ2Fpcm8oKSAmJiBpc0N5Z3dpbigpKTsKICAgICAg ICAgICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJ8eDY0IiBpZiBpc1dpbjY0KCk7CisgICAg ICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAuPSAifFdpbjMyIiBpZiBpc1dpbmRvd3MoKSAm JiAhaXNXaW42NCgpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgICAgIGlm ICgkb3B0ID1+IC9eLS1wcm9maWwoZXxpbmcpJC9pKSB7CkBAIC02MzUsNiArNjM3LDcgQEAgc3Vi IGRldGVybWluZVBhc3NlZENvbmZpZ3VyYXRpb24KICAgICAgICAgICAgICRwYXNzZWRDb25maWd1 cmF0aW9uID0gIlByb2ZpbGluZyI7CiAgICAgICAgICAgICAkcGFzc2VkQ29uZmlndXJhdGlvbiAu PSAiX1dpbkNhaXJvIiBpZiAoaXNXaW5DYWlybygpICYmIGlzQ3lnd2luKCkpOwogICAgICAgICAg ICAgJHBhc3NlZENvbmZpZ3VyYXRpb24gLj0gInx4NjQiIGlmIGlzV2luNjQoKTsKKyAgICAgICAg ICAgICRwYXNzZWRDb25maWd1cmF0aW9uIC49ICJ8V2luMzIiIGlmIGlzV2luZG93cygpICYmICFp c1dpbjY0KCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9CkBAIC03Njks NyArNzcyLDcgQEAgc3ViIHNhZmFyaVBhdGgKICAgICAgICAgICAgIG15ICRwYXRoID0gIiRjb25m aWd1cmF0aW9uUHJvZHVjdERpci9TYWZhcmkuZXhlIjsKICAgICAgICAgICAgIG15ICRkZWJ1Z1Bh dGggPSAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyL1NhZmFyaV9kZWJ1Zy5leGUiOwogCi0gICAg ICAgICAgICBpZiAoY29uZmlndXJhdGlvbkZvclZpc3VhbFN0dWRpbygpIGVxICJEZWJ1Z19BbGwi ICYmIC14ICRkZWJ1Z1BhdGgpIHsKKyAgICAgICAgICAgIGlmIChjb25maWd1cmF0aW9uKCkgZXEg IkRlYnVnX0FsbCIgJiYgLXggJGRlYnVnUGF0aCkgewogICAgICAgICAgICAgICAgICRzYWZhcmlC dW5kbGUgPSAkZGVidWdQYXRoOwogICAgICAgICAgICAgfSBlbHNpZiAoLXggJHBhdGgpIHsKICAg ICAgICAgICAgICAgICAkc2FmYXJpQnVuZGxlID0gJHBhdGg7Cg==