64492 2011-07-13 16:36:39 -0700 NRWT doesn't store the svn revision in full_results.json on chromium-win 2011-07-14 15:07:18 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 64491 1 webkit.review.bot eric abarth dpranke ojan tony oldest_to_newest 436761 0 webkit.review.bot 2011-07-13 16:36:39 -0700 NRWT doesn't store the svn revision in full_results.json on chromium-win Requested by abarth on #webkit. 436763 1 eric 2011-07-13 16:41:18 -0700 I suspect that the output of "svn info" is different on windows. If someone could post the output of svn info from their windows box (run inside a webkit checkout), that would be most helpful! 436764 2 eric 2011-07-13 16:41:51 -0700 I think ChromiumWin uses win32 instead of CYGWIN, right? That may be the difference. We may not be prepared for whatever svn info looks like with windows svn. 436765 3 ojan 2011-07-13 16:42:24 -0700 Hmmm...we're able to get the revision number for incremental_results.json...wonder what we do differently there. 436766 4 tony 2011-07-13 16:43:50 -0700 D:\src\WebKit-svn>svn --version svn, version 1.6.6 (r40053) compiled Oct 19 2009, 09:36:48 Copyright (C) 2000-2009 CollabNet. Subversion is open source software, see http://subversion.tigris.org/ This product includes software developed by CollabNet (http://www.Collab.Net/). The following repository access (RA) modules are available: * ra_neon : Module for accessing a repository via WebDAV protocol using Neon. - handles 'http' scheme - handles 'https' scheme * ra_svn : Module for accessing a repository using the svn network protocol. - with Cyrus SASL authentication - handles 'svn' scheme * ra_local : Module for accessing a repository on local disk. - handles 'file' scheme * ra_serf : Module for accessing a repository via WebDAV protocol using serf. - handles 'http' scheme - handles 'https' scheme D:\src\WebKit-svn>svn info Path: . URL: http://svn.webkit.org/repository/webkit/trunk Repository Root: http://svn.webkit.org/repository/webkit Repository UUID: 268f45cc-cd09-0410-ab3c-d52691b4dbfc Revision: 82480 Node Kind: directory Schedule: normal Last Changed Author: mihaip@chromium.org Last Changed Rev: 82480 Last Changed Date: 2011-03-30 11:50:19 -0700 (Wed, 30 Mar 2011) 436903 5 eric 2011-07-13 20:02:23 -0700 Hmm... scm.default_scm().head_svn_revision() works fine on the (former) Windows EWS image on ec2. 436904 6 eric 2011-07-13 20:09:02 -0700 To be clear, I believe this is the code which is failing on the cr-win bot: http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py#L211 436917 7 eric 2011-07-13 21:13:48 -0700 Added some logging in http://trac.webkit.org/changeset/90977. 437242 8 100839 eric 2011-07-14 12:12:23 -0700 Created attachment 100839 Patch 437253 9 100839 ojan 2011-07-14 12:26:27 -0700 Comment on attachment 100839 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=100839&action=review > Tools/Scripts/webkitpy/layout_tests/port/base.py:607 > + # Config webkit_base_dir() knows where the webkit root is, no other This is a bit confusing. I'd s/Config webkit_base_dir()/self._config.webkit_base_dir()/ just to be more clear. 437256 10 eric 2011-07-14 12:32:10 -0700 Committed r91023: <http://trac.webkit.org/changeset/91023> 437300 11 eric 2011-07-14 13:50:41 -0700 This appears to have caused 15 python tests to fail on the bots. 437324 12 100861 eric 2011-07-14 14:19:51 -0700 Created attachment 100861 Patch 437326 13 eric 2011-07-14 14:20:09 -0700 I thought webkit-patch knew how to re-open bugs these days? Maybe that patch never landed. 437329 14 eric 2011-07-14 14:21:35 -0700 Committed r91028: <http://trac.webkit.org/changeset/91028> 437350 15 100861 dbates 2011-07-14 15:07:18 -0700 Comment on attachment 100861 Patch Clearing review and commit-queue flags since this patch was already landed. 100839 2011-07-14 12:12:23 -0700 2011-07-14 14:19:46 -0700 Patch bug-64492-20110714121222.patch text/plain 3556 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTA5NzkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5OWFlNzc3OGMwYzM3YzNiOTY3NDFhNjgxYmNmYTg5N2Mz MjU3ZDViLi5kZDJhM2FiYzU3Y2M1OGZlYWEwOTQxNDdhNjUzZDI0MmM2OGJiNGM3IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDctMTQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IE5SV1QgZG9lc24ndCBzdG9yZSB0aGUgc3ZuIHJldmlzaW9uIGluIGZ1bGxfcmVzdWx0cy5qc29u IG9uIGNocm9taXVtLXdpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjQ0OTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGlzIHNob3VsZCBmaXggdGhlIGJ1Zy4gIFVuZm9ydHVuYXRlbHkgdGhpcyBjb2Rl IGlzIGN1cnJlbnRseQorICAgICAgICBpbXBvc3NpYmxlIHRvIHRlc3Qgc2luY2UgaXQncyBpbXBv c3NpYmxlIHRvIG1vY2sgZGV0ZWN0X3NjbV9zeXN0ZW0gYXQgdGhlCisgICAgICAgIG1vbWVudC4g IEkgc3RhcnRlZCByZS13cml0aW5nIHNjbS5kZXRlY3Rpb24ucHkgdG8gYmUgbW9ja2FibGUsIGJ1 dCBkZWNpZGVkIHRoYXQKKyAgICAgICAgd2FzIGJlc3QgbGVmdCBmb3IgYW5vdGhlciBkYXkuCisK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5h Z2VyLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFz ZS5weToKKwogMjAxMS0wNy0xMyAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgTW92ZSB3ZWJraXRweSBvZmYgb2YgbG9vc2UgbW9ja3MKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5 CmluZGV4IDUwOGYwNGI4MjUyYzdmNGM5MGQ0M2EyMWE1MWFiMzE0NzJiMDgxMzQuLjFlNjhjN2Y4 ZjE0ZGQ5M2Q3M2RiYmU5NzVhODQyMjBjMTQxYzVkYmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQpA QCAtMjA5LDcgKzIwOSw3IEBAIGRlZiBzdW1tYXJpemVfcmVzdWx0cyhwb3J0X29iaiwgZXhwZWN0 YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgcmV0cnlfc3VtbWFyeSwgdGVzCiAgICAgcmVzdWx0c1sn aGFzX3dkaWZmJ10gPSBwb3J0X29iai53ZGlmZl9hdmFpbGFibGUoKQogICAgIHJlc3VsdHNbJ2hh c19wcmV0dHlfcGF0Y2gnXSA9IHBvcnRfb2JqLnByZXR0eV9wYXRjaF9hdmFpbGFibGUoKQogICAg IHRyeToKLSAgICAgICAgcmVzdWx0c1sncmV2aXNpb24nXSA9IHNjbS5kZWZhdWx0X3NjbSgpLmhl YWRfc3ZuX3JldmlzaW9uKCkKKyAgICAgICAgcmVzdWx0c1sncmV2aXNpb24nXSA9IHBvcnRfb2Jq ZWN0LndlYmtpdF9zY20oKS5oZWFkX3N2bl9yZXZpc2lvbigpCiAgICAgZXhjZXB0IEV4Y2VwdGlv biwgZToKICAgICAgICAgX2xvZy53YXJuKCJGYWlsZWQgdG8gZGV0ZXJtaW5lIHN2biByZXZpc2lv biBmb3IgY2hlY2tvdXQgKGN3ZDogJXMpLCBsZWF2aW5nICdyZXZpc2lvbicga2V5IGJsYW5rIGlu IGZ1bGxfcmVzdWx0cy5qc29uLlxuJXMiICUgKHBvcnRfb2JqLl9maWxlc3lzdGVtLmdldGN3ZCgp LCBlKSkKICAgICAgICAgIyBIYW5kbGUgY2FzZXMgd2hlcmUgd2UncmUgcnVubmluZyBvdXRzaWRl IG9mIHZlcnNpb24gY29udHJvbC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvYmFzZS5weQppbmRleCBlMDNkNDMzNDJkZDA0NmMwNzMwODI4ZGQ4NDQxMmY3 MmZlZjM4Yjk5Li43MjhkZDk2NDc3NjYxNDI3YzYwNTkwZDNmZGY1NjgxOWQ0OWI5NWM2IDEwMDc1 NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CkBA IC0zNyw4ICszNywxMCBAQCBpbXBvcnQgZGlmZmxpYgogaW1wb3J0IGVycm5vCiBpbXBvcnQgb3MK IAorZnJvbSB3ZWJraXRweS5jb21tb24ubWVtb2l6ZWQgaW1wb3J0IG1lbW9pemVkCiBmcm9tIHdl YmtpdHB5LmNvbW1vbi5uZXQudGVzdG91dHB1dHNldCBpbXBvcnQgQWdncmVnYXRlVGVzdE91dHB1 dFNldAogCisKICMgSGFuZGxlIFB5dGhvbiA8IDIuNiB3aGVyZSBtdWx0aXByb2Nlc3NpbmcgaXNu J3QgYXZhaWxhYmxlLgogdHJ5OgogICAgIGltcG9ydCBtdWx0aXByb2Nlc3NpbmcKQEAgLTYwLDYg KzYyLDcgQEAgZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMuc2VydmVycyBpbXBvcnQgd2Vic29j a2V0X3NlcnZlcgogCiBfbG9nID0gbG9ndXRpbHMuZ2V0X2xvZ2dlcihfX2ZpbGVfXykKIAorCiBj bGFzcyBEdW1teU9wdGlvbnMob2JqZWN0KToKICAgICAiIiJGYWtlIGltcGxlbWVudGF0aW9uIG9m IG9wdHBhcnNlLlZhbHVlcy4gQ2xvbmVkIGZyb20gd2Via2l0cHkudG9vbC5tb2NrdG9vbC5Nb2Nr T3B0aW9ucy4iIiIKIApAQCAtNTk4LDYgKzYwMSwxNCBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAg ICAgICAgIFdlYktpdCBzb3VyY2UgdHJlZSBhbmQgdGhlIGxpc3Qgb2YgcGF0aCBjb21wb25lbnRz IGluIHwqY29tcHN8LiIiIgogICAgICAgICByZXR1cm4gc2VsZi5fY29uZmlnLnBhdGhfZnJvbV93 ZWJraXRfYmFzZSgqY29tcHMpCiAKKyAgICBAbWVtb2l6ZWQKKyAgICBkZWYgd2Via2l0X3NjbShz ZWxmKToKKyAgICAgICAgIyBPbiB0aGUgY2hyb21pdW0gYm90cywgdGhlIGN3ZCBpcyB0aGUgcm9v dCBvZiB0aGUgY2hyb21pdW0gY2hlY2tvdXQuCisgICAgICAgICMgQ29uZmlnIHdlYmtpdF9iYXNl X2RpcigpIGtub3dzIHdoZXJlIHRoZSB3ZWJraXQgcm9vdCBpcywgbm8gb3RoZXIKKyAgICAgICAg IyBvYmplY3QgaW4gTlJXVCBzZWVtcyB0byBrZWVwIGFuIFNDTSBhcm91bmQuICAoVW5saWtlIHdl YmtpdC1wYXRjaCB3aGVyZSBpdCdzIG9uIHRoZSBUb29sL0hvc3Qgb2JqZWN0LikKKyAgICAgICAg IyBGSVhNRTogV2Ugc2hvdWxkIGJlIGFibGUgdG8gZ2V0IHRoZSBTQ00gZnJvbSBzb21ld2hlcmUg ZWxzZS4KKyAgICAgICAgcmV0dXJuIHNjbS5kZXRlY3Rfc2NtX3N5c3RlbShzZWxmLl9jb25maWcu d2Via2l0X2Jhc2VfZGlyKCkpCisKICAgICBkZWYgcGF0aF90b190ZXN0X2V4cGVjdGF0aW9uc19m aWxlKHNlbGYpOgogICAgICAgICAiIiJVcGRhdGUgdGhlIHRlc3QgZXhwZWN0YXRpb25zIHRvIHRo ZSBwYXNzZWQtaW4gc3RyaW5nLgogCg== 100861 2011-07-14 14:19:51 -0700 2011-07-14 15:07:18 -0700 Patch bug-64492-20110714141950.patch text/plain 8896 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTEwMjUKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxYWYzZmY2ZTczZGZkYTQ5NTNmYmVhYzcxZjlhYzM1MWY0 ZTc2NTQ1Li45MDIyZWQzOThjNGQ4OTA4ZjZjOTIxNWU5OTk4MmIxNDI0NTM1MTMyIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0zLDYgKzMsMjQg QEAKICAgICAgICAgTlJXVCBkb2Vzbid0IHN0b3JlIHRoZSBzdm4gcmV2aXNpb24gaW4gZnVsbF9y ZXN1bHRzLmpzb24gb24gY2hyb21pdW0td2luCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02NDQ5MgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEZpeCB0aGUgdW5pdCB0ZXN0cy4gIFVuZm9ydHVuYXRlbHkgc2Nt IGRvZXMgbm90IHVzZSBhIGZpbGVzeXN0ZW0KKyAgICAgICAgb2JqZWN0IHNvIHdlIGNhbid0IGNv bnRyb2wgdGhlIHJlc3VsdCBvZiBkZXRlY3Rfc2NtX3N5c3RlbS4KKyAgICAgICAgV2hlbiBkZXRl Y3Rfc2NtX3N5c3RlbSB3b3VsZCBmYWlsLCB3ZSB3b3VsZCBsb2csIHdoaWNoIHdvdWxkCisgICAg ICAgIGNhdXNlIGFsbCBwYXNzaW5nX3J1biBpbnRlZ3JhdGlvbiB0ZXN0cyB0byBmYWlsLgorCisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2Vy LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5w eToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHk6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0 c19pbnRlZ3JhdGlvbnRlc3QucHk6CisKKzIwMTEtMDctMTQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3 ZWJraXQub3JnPgorCisgICAgICAgIE5SV1QgZG9lc24ndCBzdG9yZSB0aGUgc3ZuIHJldmlzaW9u IGluIGZ1bGxfcmVzdWx0cy5qc29uIG9uIGNocm9taXVtLXdpbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQ0OTIKKwogICAgICAgICBSZXZpZXdlZCBi eSBPamFuIFZhZmFpLgogCiAgICAgICAgIFRoaXMgc2hvdWxkIGZpeCB0aGUgYnVnLiAgVW5mb3J0 dW5hdGVseSB0aGlzIGNvZGUgaXMgY3VycmVudGx5CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vc2NtLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vY2hlY2tvdXQvc2NtL3NjbS5weQppbmRleCA3YWEwYWMwMDM2YTIyNWQ3ZWYz ZjhjNGZjMDU5MzY0MmM2OGVhNzcxLi4wMDFiN2U0MWNjMzM2YTFkOWNjOTk0MDgzYTAzZjVmOWJh Mzc0NzY0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291 dC9zY20vc2NtLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0 L3NjbS9zY20ucHkKQEAgLTkzLDggKzkzLDcgQEAgY2xhc3MgU0NNOgogICAgICAgICBpZiBzZWxm LndvcmtpbmdfZGlyZWN0b3J5X2lzX2NsZWFuKCk6CiAgICAgICAgICAgICByZXR1cm4KICAgICAg ICAgaWYgbm90IGZvcmNlX2NsZWFuOgotICAgICAgICAgICAgIyBGSVhNRTogU2hvdWxkbid0IHRo aXMgdXNlIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3Q/ICAoR2l0IGRlZmluaXRlbHkgd291bGQgd2Fu dCB0aGF0LCB1bmNsZWFyIGlmIFNWTiB3b3VsZC4pCi0gICAgICAgICAgICBwcmludCBzZWxmLnJ1 bihzZWxmLnN0YXR1c19jb21tYW5kKCksIGVycm9yX2hhbmRsZXI9RXhlY3V0aXZlLmlnbm9yZV9l cnJvcikKKyAgICAgICAgICAgIHByaW50IHNlbGYucnVuKHNlbGYuc3RhdHVzX2NvbW1hbmQoKSwg ZXJyb3JfaGFuZGxlcj1FeGVjdXRpdmUuaWdub3JlX2Vycm9yLCBjd2Q9c2VsZi5jaGVja291dF9y b290KQogICAgICAgICAgICAgcmFpc2UgU2NyaXB0RXJyb3IobWVzc2FnZT0iV29ya2luZyBkaXJl Y3RvcnkgaGFzIG1vZGlmaWNhdGlvbnMsIHBhc3MgLS1mb3JjZS1jbGVhbiBvciAtLW5vLWNsZWFu IHRvIGNvbnRpbnVlLiIpCiAgICAgICAgIGxvZygiQ2xlYW5pbmcgd29ya2luZyBkaXJlY3Rvcnki KQogICAgICAgICBzZWxmLmNsZWFuX3dvcmtpbmdfZGlyZWN0b3J5KCkKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2Vy LnB5CmluZGV4IDFlNjhjN2Y4ZjE0ZGQ5M2Q3M2RiYmU5NzVhODQyMjBjMTQxYzVkYmIuLmExMmUz MWI1YjY3ODhjNzY1ZWFmZjNlYzg3YzYxZTRlZThiMDU5NGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5w eQpAQCAtMjA5LDkgKzIwOSwxNCBAQCBkZWYgc3VtbWFyaXplX3Jlc3VsdHMocG9ydF9vYmosIGV4 cGVjdGF0aW9ucywgcmVzdWx0X3N1bW1hcnksIHJldHJ5X3N1bW1hcnksIHRlcwogICAgIHJlc3Vs dHNbJ2hhc193ZGlmZiddID0gcG9ydF9vYmoud2RpZmZfYXZhaWxhYmxlKCkKICAgICByZXN1bHRz WydoYXNfcHJldHR5X3BhdGNoJ10gPSBwb3J0X29iai5wcmV0dHlfcGF0Y2hfYXZhaWxhYmxlKCkK ICAgICB0cnk6Ci0gICAgICAgIHJlc3VsdHNbJ3JldmlzaW9uJ10gPSBwb3J0X29iamVjdC53ZWJr aXRfc2NtKCkuaGVhZF9zdm5fcmV2aXNpb24oKQorICAgICAgICByZXN1bHRzWydyZXZpc2lvbidd ID0gcG9ydF9vYmoud2Via2l0X3NjbSgpLmhlYWRfc3ZuX3JldmlzaW9uKCkKICAgICBleGNlcHQg RXhjZXB0aW9uLCBlOgotICAgICAgICBfbG9nLndhcm4oIkZhaWxlZCB0byBkZXRlcm1pbmUgc3Zu IHJldmlzaW9uIGZvciBjaGVja291dCAoY3dkOiAlcyksIGxlYXZpbmcgJ3JldmlzaW9uJyBrZXkg YmxhbmsgaW4gZnVsbF9yZXN1bHRzLmpzb24uXG4lcyIgJSAocG9ydF9vYmouX2ZpbGVzeXN0ZW0u Z2V0Y3dkKCksIGUpKQorICAgICAgICAjIEZJWE1FOiBXZSB3b3VsZCBsaWtlIHRvIHdhcm4gaGVy ZSwgYnV0IHRoYXQgd291bGQgY2F1c2UgYWxsIHBhc3NpbmdfcnVuIGludGVncmF0aW9uIHRlc3Rz CisgICAgICAgICMgdG8gZmFpbCwgc2luY2UgdGhleSBhc3NlcnQgdGhhdCB3ZSBoYXZlIG5vIGxv Z2dpbmcgb3V0cHV0LgorICAgICAgICAjIFRoZSByZXZpc2lvbiBsb29rdXAgYWx3YXlzIGZhaWxz IHdoZW4gcnVubmluZyB0aGUgdGVzdHMgc2luY2UgaXQgdHJpZXMgdG8gcmVhZCBmcm9tCisgICAg ICAgICMgIi9tb2NrIiB1c2luZyB0aGUgcmVhbCBmaWxlIHN5c3RlbSAoc2luY2UgdGhlcmUgaXMg bm8gd2F5IHRvIG1vY2sgb3V0IGRldGVjdF9zY21fc3lzdGVtIGF0IGN1cnJlbnQpLgorICAgICAg ICAjIE9uY2Ugd2UgZml4IGRldGVjdF9zY21fc3lzdGVtIHRvIHVzZSB0aGUgbW9jayBmaWxlIHN5 c3RlbSB3ZSBjYW4gYWRkIHRoaXMgbG9nIGJhY2suCisgICAgICAgICNfbG9nLndhcm4oIkZhaWxl ZCB0byBkZXRlcm1pbmUgc3ZuIHJldmlzaW9uIGZvciBjaGVja291dCAoY3dkOiAlcywgd2Via2l0 X2Jhc2U6ICVzKSwgbGVhdmluZyAncmV2aXNpb24nIGtleSBibGFuayBpbiBmdWxsX3Jlc3VsdHMu anNvbi5cbiVzIiAlIChwb3J0X29iai5fZmlsZXN5c3RlbS5nZXRjd2QoKSwgcG9ydF9vYmoucGF0 aF9mcm9tX3dlYmtpdF9iYXNlKCksIGUpKQogICAgICAgICAjIEhhbmRsZSBjYXNlcyB3aGVyZSB3 ZSdyZSBydW5uaW5nIG91dHNpZGUgb2YgdmVyc2lvbiBjb250cm9sLgogICAgICAgICByZXN1bHRz WydyZXZpc2lvbiddID0gIiIKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IDRmOTBiODIyYWMwN2YzNWNhZjM1NDNlNzhlMTBmMjg1 YmJiZThmNjguLjQzNzc3ZTkyNDdiODQ4MWQ4NTU5OWIxNDA2OGNjZDk0NjRiNjVmNWMgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAg LTM3LDYgKzM3LDcgQEAgaW1wb3J0IGRpZmZsaWIKIGltcG9ydCBlcnJubwogaW1wb3J0IG9zCiAK K2Zyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LnNjbSBpbXBvcnQgZGV0ZWN0X3NjbV9zeXN0 ZW0KIGZyb20gd2Via2l0cHkuY29tbW9uLm1lbW9pemVkIGltcG9ydCBtZW1vaXplZAogZnJvbSB3 ZWJraXRweS5jb21tb24ubmV0LnRlc3RvdXRwdXRzZXQgaW1wb3J0IEFnZ3JlZ2F0ZVRlc3RPdXRw dXRTZXQKIApAQCAtNjA3LDcgKzYwOCw3IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICAgICAg IyBzZWxmLl9jb25maWcud2Via2l0X2Jhc2VfZGlyKCkga25vd3Mgd2hlcmUgdGhlIHdlYmtpdCBy b290IGlzLCBubyBvdGhlcgogICAgICAgICAjIG9iamVjdCBpbiBOUldUIHNlZW1zIHRvIGtlZXAg YW4gU0NNIGFyb3VuZC4gIChVbmxpa2Ugd2Via2l0LXBhdGNoIHdoZXJlIGl0J3Mgb24gdGhlIFRv b2wvSG9zdCBvYmplY3QuKQogICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgYmUgYWJsZSB0byBn ZXQgdGhlIFNDTSBmcm9tIHNvbWV3aGVyZSBlbHNlLgotICAgICAgICByZXR1cm4gc2NtLmRldGVj dF9zY21fc3lzdGVtKHNlbGYuX2NvbmZpZy53ZWJraXRfYmFzZV9kaXIoKSkKKyAgICAgICAgcmV0 dXJuIGRldGVjdF9zY21fc3lzdGVtKHNlbGYuX2NvbmZpZy53ZWJraXRfYmFzZV9kaXIoKSkKIAog ICAgIGRlZiBwYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoc2VsZik6CiAgICAgICAgICIi IlVwZGF0ZSB0aGUgdGVzdCBleHBlY3RhdGlvbnMgdG8gdGhlIHBhc3NlZC1pbiBzdHJpbmcuCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3Qu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkKaW5k ZXggNGIwYzJiZWNmN2ZkODY1YzEyNTNjZGRjNzMwYmM0MjdjZGRmNjk3Mi4uMzJjYmM5YWZmYzNi NWU0ZjQ1OWYxZGRlNTgyNjIxYzUyYTUzZjJhYSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5weQpAQCAtMjQxLDcgKzI0MSw3IEBAIFdPTlRG SVggU0tJUCA6IGZhaWx1cmVzL2V4cGVjdGVkL2V4Y2VwdGlvbi5odG1sID0gQ1JBU0gKICAgICAj IEFkZCBpbiBhIGZpbGUgc2hvdWxkIGJlIGlnbm9yZWQgYnkgdGVzdF9maWxlcy5maW5kKCkuCiAg ICAgZmlsZXNbTEFZT1VUX1RFU1RfRElSICsgJ3VzZXJzY3JpcHRzL3Jlc291cmNlcy9pZnJhbWUu aHRtbCddID0gJ2lmcmFtZScKIAotICAgIGZzID0gZmlsZXN5c3RlbV9tb2NrLk1vY2tGaWxlU3lz dGVtKGZpbGVzKQorICAgIGZzID0gZmlsZXN5c3RlbV9tb2NrLk1vY2tGaWxlU3lzdGVtKGZpbGVz LCBkaXJzPXNldChbJy9tb2NrJ10pKSAgIyBNYWtlIHN1cmUgYXQgbGVhc3QgdGhlIGNoZWNrb3V0 X3Jvb3QgZXhpc3RzIGFzIGEgZGlyZWN0b3J5LgogICAgIGZzLl90ZXN0cyA9IHRlc3RfbGlzdAog ICAgIHJldHVybiBmcwogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0 LnB5CmluZGV4IDE0N2Q1ZGRmZDliYzMwM2ZjYzRmZjJhOGRhOGNiNmE1NzZmZDM0ZjIuLmJlMjY3 NWZkNDY2NDVkYTY3NGYzZmY1MDlkZjhjNWE2ODkyNTc2OGEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250 ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CkBAIC02Nyw4ICs2Nyw3IEBAIGZyb20gd2Via2l0 cHkudGVzdC5za2lwIGltcG9ydCBza2lwX2lmCiBmcm9tIHdlYmtpdHB5LnRoaXJkcGFydHkubW9j ayBpbXBvcnQgTW9jawogCiAKLWRlZiBwYXJzZV9hcmdzKGV4dHJhX2FyZ3M9Tm9uZSwgcmVjb3Jk X3Jlc3VsdHM9RmFsc2UsIHRlc3RzX2luY2x1ZGVkPUZhbHNlLAotICAgICAgICAgICAgICAgbmV3 X3Jlc3VsdHM9RmFsc2UsIHByaW50X25vdGhpbmc9VHJ1ZSk6CitkZWYgcGFyc2VfYXJncyhleHRy YV9hcmdzPU5vbmUsIHJlY29yZF9yZXN1bHRzPUZhbHNlLCB0ZXN0c19pbmNsdWRlZD1GYWxzZSwg bmV3X3Jlc3VsdHM9RmFsc2UsIHByaW50X25vdGhpbmc9VHJ1ZSk6CiAgICAgZXh0cmFfYXJncyA9 IGV4dHJhX2FyZ3Mgb3IgW10KICAgICBpZiBwcmludF9ub3RoaW5nOgogICAgICAgICBhcmdzID0g WyctLXByaW50JywgJ25vdGhpbmcnXQpAQCAtOTMsMTcgKzkyLDEzIEBAIGRlZiBwYXJzZV9hcmdz KGV4dHJhX2FyZ3M9Tm9uZSwgcmVjb3JkX3Jlc3VsdHM9RmFsc2UsIHRlc3RzX2luY2x1ZGVkPUZh bHNlLAogICAgIHJldHVybiBydW5fd2Via2l0X3Rlc3RzLnBhcnNlX2FyZ3MoYXJncykKIAogCi1k ZWYgcGFzc2luZ19ydW4oZXh0cmFfYXJncz1Ob25lLCBwb3J0X29iaj1Ob25lLCByZWNvcmRfcmVz dWx0cz1GYWxzZSwKLSAgICAgICAgICAgICAgICB0ZXN0c19pbmNsdWRlZD1GYWxzZSwgZmlsZXN5 c3RlbT1Ob25lKToKLSAgICBvcHRpb25zLCBwYXJzZWRfYXJncyA9IHBhcnNlX2FyZ3MoZXh0cmFf YXJncywgcmVjb3JkX3Jlc3VsdHMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHRlc3RzX2luY2x1ZGVkKQorZGVmIHBhc3NpbmdfcnVuKGV4dHJhX2FyZ3M9Tm9uZSwgcG9y dF9vYmo9Tm9uZSwgcmVjb3JkX3Jlc3VsdHM9RmFsc2UsIHRlc3RzX2luY2x1ZGVkPUZhbHNlLCBm aWxlc3lzdGVtPU5vbmUpOgorICAgIG9wdGlvbnMsIHBhcnNlZF9hcmdzID0gcGFyc2VfYXJncyhl eHRyYV9hcmdzLCByZWNvcmRfcmVzdWx0cywgdGVzdHNfaW5jbHVkZWQpCiAgICAgaWYgbm90IHBv cnRfb2JqOgotICAgICAgICBwb3J0X29iaiA9IHBvcnQuZ2V0KHBvcnRfbmFtZT1vcHRpb25zLnBs YXRmb3JtLCBvcHRpb25zPW9wdGlvbnMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgdXNl cj1tb2NrdG9vbC5Nb2NrVXNlcigpLCBmaWxlc3lzdGVtPWZpbGVzeXN0ZW0pCisgICAgICAgIHBv cnRfb2JqID0gcG9ydC5nZXQocG9ydF9uYW1lPW9wdGlvbnMucGxhdGZvcm0sIG9wdGlvbnM9b3B0 aW9ucywgdXNlcj1tb2NrdG9vbC5Nb2NrVXNlcigpLCBmaWxlc3lzdGVtPWZpbGVzeXN0ZW0pCiAg ICAgYnVpbGRib3Rfb3V0cHV0ID0gYXJyYXlfc3RyZWFtLkFycmF5U3RyZWFtKCkKICAgICByZWd1 bGFyX291dHB1dCA9IGFycmF5X3N0cmVhbS5BcnJheVN0cmVhbSgpCi0gICAgcmVzID0gcnVuX3dl YmtpdF90ZXN0cy5ydW4ocG9ydF9vYmosIG9wdGlvbnMsIHBhcnNlZF9hcmdzLCBidWlsZGJvdF9v dXRwdXQ9YnVpbGRib3Rfb3V0cHV0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJl Z3VsYXJfb3V0cHV0PXJlZ3VsYXJfb3V0cHV0KQorICAgIHJlcyA9IHJ1bl93ZWJraXRfdGVzdHMu cnVuKHBvcnRfb2JqLCBvcHRpb25zLCBwYXJzZWRfYXJncywgYnVpbGRib3Rfb3V0cHV0PWJ1aWxk Ym90X291dHB1dCwgcmVndWxhcl9vdXRwdXQ9cmVndWxhcl9vdXRwdXQpCiAgICAgcmV0dXJuIHJl cyA9PSAwIGFuZCByZWd1bGFyX291dHB1dC5lbXB0eSgpIGFuZCBidWlsZGJvdF9vdXRwdXQuZW1w dHkoKQogCiAKQEAgLTExNCwxMSArMTA5LDkgQEAgZGVmIGxvZ2dpbmdfcnVuKGV4dHJhX2FyZ3M9 Tm9uZSwgcG9ydF9vYmo9Tm9uZSwgcmVjb3JkX3Jlc3VsdHM9RmFsc2UsIHRlc3RzX2luY2wKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJpbnRfbm90aGluZz1GYWxzZSwg bmV3X3Jlc3VsdHM9bmV3X3Jlc3VsdHMpCiAgICAgdXNlciA9IG1vY2t0b29sLk1vY2tVc2VyKCkK ICAgICBpZiBub3QgcG9ydF9vYmo6Ci0gICAgICAgIHBvcnRfb2JqID0gcG9ydC5nZXQocG9ydF9u YW1lPW9wdGlvbnMucGxhdGZvcm0sIG9wdGlvbnM9b3B0aW9ucywKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1c2VyPXVzZXIsIGZpbGVzeXN0ZW09ZmlsZXN5c3RlbSkKKyAgICAgICAgcG9y dF9vYmogPSBwb3J0LmdldChwb3J0X25hbWU9b3B0aW9ucy5wbGF0Zm9ybSwgb3B0aW9ucz1vcHRp b25zLCB1c2VyPXVzZXIsIGZpbGVzeXN0ZW09ZmlsZXN5c3RlbSkKIAotICAgIHJlcywgYnVpbGRi b3Rfb3V0cHV0LCByZWd1bGFyX291dHB1dCA9IHJ1bl9hbmRfY2FwdHVyZShwb3J0X29iaiwgb3B0 aW9ucywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcGFyc2VkX2FyZ3MpCisgICAgcmVzLCBidWlsZGJvdF9vdXRwdXQsIHJlZ3VsYXJf b3V0cHV0ID0gcnVuX2FuZF9jYXB0dXJlKHBvcnRfb2JqLCBvcHRpb25zLCBwYXJzZWRfYXJncykK ICAgICByZXR1cm4gKHJlcywgYnVpbGRib3Rfb3V0cHV0LCByZWd1bGFyX291dHB1dCwgdXNlcikK IAogCg==