148723 2015-09-02 14:13:26 -0700 [WK2] Allow tagging tests with metadata which needs to be known at web process creation time 2015-09-03 13:22:21 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue oldest_to_newest 1122906 0 mmaxfield 2015-09-02 14:13:26 -0700 [WK2] Allow tagging tests with metadata which needs to be known at web process creation time 1122907 1 260436 mmaxfield 2015-09-02 14:13:48 -0700 Created attachment 260436 Patch 1122917 2 260441 mmaxfield 2015-09-02 14:33:37 -0700 Created attachment 260441 Patch 1122918 3 commit-queue 2015-09-02 14:36:36 -0700 Attachment 260441 did not pass style-queue: ERROR: Tools/WebKitTestRunner/TestController.cpp:57: Streams are highly discouraged. [readability/streams] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1122919 4 260441 andersca 2015-09-02 14:39:36 -0700 Comment on attachment 260441 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=260441&action=review > Tools/WebKitTestRunner/TestController.cpp:801 > + auto length = WKStringGetLength(path.get()); > + WKChar buffer[length]; This should use a vector instead of a variable-length array. Also, I think you can just use WK_EXPORT size_t WKStringGetMaximumUTF8CStringSize(WKStringRef string); WK_EXPORT size_t WKStringGetUTF8CString(WKStringRef string, char* buffer, size_t bufferSize); and return an std::string here. > Tools/WebKitTestRunner/TestController.cpp:814 > + // Do everything using file IO so we don't mess up caching on HTTP tests. I don't think we need this comment. > Tools/WebKitTestRunner/TestController.cpp:827 > + if (endLocation == std::string::npos) > + return; I think we should LOG_ERROR when we fail to parse this. 1122922 5 260443 mmaxfield 2015-09-02 14:54:40 -0700 Created attachment 260443 Patch 1122923 6 commit-queue 2015-09-02 14:57:38 -0700 Attachment 260443 did not pass style-queue: ERROR: Tools/WebKitTestRunner/TestController.cpp:57: Streams are highly discouraged. [readability/streams] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1122989 7 260443 commit-queue 2015-09-02 18:10:41 -0700 Comment on attachment 260443 Patch Rejecting attachment 260443 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 260443, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: ', 'dcommit', '--rmdir']" exit_code: 139 cwd: /Volumes/Data/EWS/WebKit Committing to http://svn.webkit.org/repository/webkit/trunk ... Authentication realm: <http://svn.webkit.org:80> Mac OS Forge Password for 'commit-queue@webkit.org': Authentication realm: <http://svn.webkit.org:80> Mac OS Forge Username: error: git-svn died of signal 11 Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 139 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource Current branch master is up to date. Full output: http://webkit-queues.webkit.org/results/134766 1123136 8 mmaxfield 2015-09-03 13:21:36 -0700 http://trac.webkit.org/changeset/189283 260436 2015-09-02 14:13:48 -0700 2015-09-02 14:33:34 -0700 Patch bug-148723-20150902141347.patch text/plain 4015 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MTg2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmUwM2M3MDk5MmEwMTliMDRkMzhkNDBjYmMyMDg5Zjc5 Mjc1NzQxMS4uNWJmZmM2YmI2NjgyMmVmYTQxMzNmNDE0MGQyN2UxZTdkYTk5YmFlNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE1LTA5LTAyICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+ CisKKyAgICAgICAgW1dLMl0gQWxsb3cgdGFnZ2luZyB0ZXN0cyB3aXRoIG1ldGFkYXRhIHdoaWNo IG5lZWRzIHRvIGJlIGtub3duIGF0IHdlYiBwcm9jZXNzIGNyZWF0aW9uIHRpbWUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODcyMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5l ci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OnRlc3RQYXRoKToKKyAgICAgICAg KFdUUjo6dXBkYXRlVmlld09wdGlvbnNGcm9tVGVzdEhlYWRlcik6CisgICAgICAgIChXVFI6OlRl c3RDb250cm9sbGVyOjp2aWV3T3B0aW9uc0ZvclRlc3QpOgorCiAyMDE1LTA4LTMxICBGaWxpcCBQ aXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgU2tpcCBzbG93IGxvY2sgdGVzdHMg b24gV2luZG93cy9kZWJ1ZwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0 Q29udHJvbGxlci5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNw cAppbmRleCBhZmJkZjRhMTkwYzRhNDY5ZThiZWYzOGU2YzRlOTViOTY0N2JlYjdlLi5kNTQ1ZWIw NWU2ZDc3MGI0M2ZjMmFmZDk2YzhlZmFhNWRjZmMzNThkIDEwMDY0NAotLS0gYS9Ub29scy9XZWJL aXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL1Rlc3RDb250cm9sbGVyLmNwcApAQCAtNTQsMTIgKzU0LDE0IEBACiAjaW5jbHVkZSA8YWxn b3JpdGhtPgogI2luY2x1ZGUgPGNzdGRpbz4KICNpbmNsdWRlIDxjdHlwZS5oPgorI2luY2x1ZGUg PGZzdHJlYW0+CiAjaW5jbHVkZSA8cnVudGltZS9Jbml0aWFsaXplVGhyZWFkaW5nLmg+CiAjaW5j bHVkZSA8c3RkbGliLmg+CiAjaW5jbHVkZSA8c3RyaW5nPgogI2luY2x1ZGUgPHd0Zi9NYWluVGhy ZWFkLmg+CiAjaW5jbHVkZSA8d3RmL1J1bkxvb3AuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3Ry aW5nLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKICNpZiBQTEFURk9STShD T0NPQSkKICNpbmNsdWRlIDxXZWJLaXQvV0tDb250ZXh0UHJpdmF0ZU1hYy5oPgpAQCAtNzkwLDYg Kzc5Miw1MyBAQCBzdGF0aWMgYm9vbCBzaG91bGRVc2VGaXhlZExheW91dChjb25zdCBUZXN0SW52 b2NhdGlvbiYgdGVzdCkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKK3N0YXRpYyBTdHJpbmcgdGVz dFBhdGgoY29uc3QgV0tVUkxSZWYgdXJsKQoreworICAgIGF1dG8gc2NoZW1lID0gYWRvcHRXSyhX S1VSTENvcHlTY2hlbWUodXJsKSk7CisgICAgaWYgKFdLU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJp bmdJZ25vcmluZ0Nhc2Uoc2NoZW1lLmdldCgpLCAiZmlsZSIpKSB7CisgICAgICAgIGF1dG8gcGF0 aCA9IGFkb3B0V0soV0tVUkxDb3B5UGF0aCh1cmwpKTsKKyAgICAgICAgYXV0byBsZW5ndGggPSBX S1N0cmluZ0dldExlbmd0aChwYXRoLmdldCgpKTsKKyAgICAgICAgV0tDaGFyIGJ1ZmZlcltsZW5n dGhdOworICAgICAgICBXS1N0cmluZ0dldENoYXJhY3RlcnMocGF0aC5nZXQoKSwgYnVmZmVyLCBs ZW5ndGgpOworICAgICAgICByZXR1cm4gU3RyaW5nKGJ1ZmZlciwgbGVuZ3RoKTsKKyAgICB9Cisg ICAgcmV0dXJuIFN0cmluZygpOworfQorCitzdGF0aWMgdm9pZCB1cGRhdGVWaWV3T3B0aW9uc0Zy b21UZXN0SGVhZGVyKFZpZXdPcHRpb25zJiB2aWV3T3B0aW9ucywgY29uc3QgVGVzdEludm9jYXRp b24mIHRlc3QpCit7CisgICAgU3RyaW5nIGZpbGVuYW1lID0gdGVzdFBhdGgodGVzdC51cmwoKSk7 CisgICAgaWYgKGZpbGVuYW1lLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8g RG8gZXZlcnl0aGluZyB1c2luZyBmaWxlIElPIHNvIHdlIGRvbid0IG1lc3MgdXAgY2FjaGluZyBv biBIVFRQIHRlc3RzLgorICAgIHN0ZDo6c3RyaW5nIG9wdGlvbnM7CisgICAgc3RkOjppZnN0cmVh bSB0ZXN0RmlsZShmaWxlbmFtZS51dGY4KCkuZGF0YSgpKTsKKyAgICBpZiAoIXRlc3RGaWxlLmdv b2QoKSkKKyAgICAgICAgcmV0dXJuOworICAgIGdldGxpbmUodGVzdEZpbGUsIG9wdGlvbnMpOwor ICAgIHN0ZDo6c3RyaW5nIGJlZ2luU3RyaW5nKCJ3ZWJraXQtdGVzdC1ydW5uZXIgIik7CisgICAg c3RkOjpzdHJpbmcgZW5kU3RyaW5nKCIgZW5kLXdlYmtpdC10ZXN0LXJ1bm5lciIpOworICAgIHNp emVfdCBiZWdpbkxvY2F0aW9uID0gb3B0aW9ucy5maW5kKGJlZ2luU3RyaW5nKTsKKyAgICBzaXpl X3QgZW5kTG9jYXRpb24gPSBvcHRpb25zLmZpbmQoZW5kU3RyaW5nKTsKKyAgICBpZiAoYmVnaW5M b2NhdGlvbiA9PSBzdGQ6OnN0cmluZzo6bnBvcyB8fCBlbmRMb2NhdGlvbiA9PSBzdGQ6OnN0cmlu Zzo6bnBvcyB8fCBiZWdpbkxvY2F0aW9uICsgYmVnaW5TdHJpbmcuc2l6ZSgpID49IGVuZExvY2F0 aW9uKQorICAgICAgICByZXR1cm47CisgICAgc3RkOjpzdHJpbmcgcGFpclN0cmluZyA9IG9wdGlv bnMuc3Vic3RyKGJlZ2luTG9jYXRpb24gKyBiZWdpblN0cmluZy5zaXplKCksIGVuZExvY2F0aW9u IC0gKGJlZ2luTG9jYXRpb24gKyBiZWdpblN0cmluZy5zaXplKCkpKTsKKyAgICBzaXplX3QgcGFp clN0YXJ0ID0gMDsKKyAgICB3aGlsZSAocGFpclN0YXJ0IDwgcGFpclN0cmluZy5zaXplKCkpIHsK KyAgICAgICAgc2l6ZV90IHBhaXJFbmQgPSBwYWlyU3RyaW5nLmZpbmQoIiAiLCBwYWlyU3RhcnQp OworICAgICAgICBpZiAocGFpckVuZCA9PSBzdGQ6OnN0cmluZzo6bnBvcykKKyAgICAgICAgICAg IHBhaXJFbmQgPSBwYWlyU3RyaW5nLnNpemUoKTsKKyAgICAgICAgc2l6ZV90IGVxdWFsc0xvY2F0 aW9uID0gcGFpclN0cmluZy5maW5kKCI9IiwgcGFpclN0YXJ0KTsKKyAgICAgICAgaWYgKGVxdWFs c0xvY2F0aW9uID09IHN0ZDo6c3RyaW5nOjpucG9zKQorICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIGF1dG8ga2V5ID0gcGFpclN0cmluZy5zdWJzdHIocGFpclN0YXJ0LCBlcXVhbHNMb2NhdGlv biAtIHBhaXJTdGFydCk7CisgICAgICAgIGF1dG8gdmFsdWUgPSBwYWlyU3RyaW5nLnN1YnN0cihl cXVhbHNMb2NhdGlvbiArIDEsIHBhaXJFbmQgLSAoZXF1YWxzTG9jYXRpb24gKyAxKSk7CisgICAg ICAgIC8vIE9wdGlvbnMgcHJvY2Vzc2luZyB0byBtb2RpZnkgdmlld09wdGlvbnMgZ29lcyBoZXJl LgorICAgICAgICBwYWlyU3RhcnQgPSBwYWlyRW5kICsgMTsKKyAgICB9Cit9CisKIFZpZXdPcHRp b25zIFRlc3RDb250cm9sbGVyOjp2aWV3T3B0aW9uc0ZvclRlc3QoY29uc3QgVGVzdEludm9jYXRp b24mIHRlc3QpIGNvbnN0CiB7CiAgICAgVmlld09wdGlvbnMgdmlld09wdGlvbnM7CkBAIC03OTgs NiArODQ3LDggQEAgVmlld09wdGlvbnMgVGVzdENvbnRyb2xsZXI6OnZpZXdPcHRpb25zRm9yVGVz dChjb25zdCBUZXN0SW52b2NhdGlvbiYgdGVzdCkgY29uc3QKICAgICB2aWV3T3B0aW9ucy5zaG91 bGRTaG93V2ViVmlldyA9IG1fc2hvdWxkU2hvd1dlYlZpZXc7CiAgICAgdmlld09wdGlvbnMudXNl Rml4ZWRMYXlvdXQgPSBzaG91bGRVc2VGaXhlZExheW91dCh0ZXN0KTsKIAorICAgIHVwZGF0ZVZp ZXdPcHRpb25zRnJvbVRlc3RIZWFkZXIodmlld09wdGlvbnMsIHRlc3QpOworCiAgICAgdXBkYXRl UGxhdGZvcm1TcGVjaWZpY1ZpZXdPcHRpb25zRm9yVGVzdCh2aWV3T3B0aW9ucywgdGVzdCk7CiAK ICAgICByZXR1cm4gdmlld09wdGlvbnM7Cg== 260441 2015-09-02 14:33:37 -0700 2015-09-02 14:54:37 -0700 Patch bug-148723-20150902143337.patch text/plain 4098 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MjY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTUyZTliYzgzZmIyY2NkNDliMDYyMDIwMDlmMGFlZjc5 NmU4NmU2ZS4uZDk0ZjIxOTNkYzZmMTFlNmFjYzZlZTRhZDE0MmYwMzRlYWI4NmY5NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE1LTA5LTAyICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+ CisKKyAgICAgICAgW1dLMl0gQWxsb3cgdGFnZ2luZyB0ZXN0cyB3aXRoIG1ldGFkYXRhIHdoaWNo IG5lZWRzIHRvIGJlIGtub3duIGF0IHdlYiBwcm9jZXNzIGNyZWF0aW9uIHRpbWUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODcyMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5l ci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OnRlc3RQYXRoKToKKyAgICAgICAg KFdUUjo6dXBkYXRlVmlld09wdGlvbnNGcm9tVGVzdEhlYWRlcik6CisgICAgICAgIChXVFI6OlRl c3RDb250cm9sbGVyOjp2aWV3T3B0aW9uc0ZvclRlc3QpOgorCiAyMDE1LTA5LTAyICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9O KHIxODg1NDgpOiBTb21lIHRlc3RzIGNyYXNoIGFmdGVyIHIxODg1NDggYmVjYXVzZSBpbmplY3Rl ZCBidW5kbGUgbWVzc2FnZXMgYXJlIHJlY2VpdmVkIGFmdGVyIHRoZSB0ZXN0IGZpbmlzaGVzCmRp ZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcCBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCmluZGV4IDI1NWNlMGM4MDhi Y2I2NTM3NWYxNGE1Mzk0ZTc4MjIzMWRhMzYwYTcuLjhmNzE0MmRkODhkZjg3NmE3NTQyOWY1OTVh MzgyMzM3NzIxY2YyNzkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENv bnRyb2xsZXIuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIu Y3BwCkBAIC01NCw2ICs1NCw3IEBACiAjaW5jbHVkZSA8YWxnb3JpdGhtPgogI2luY2x1ZGUgPGNz dGRpbz4KICNpbmNsdWRlIDxjdHlwZS5oPgorI2luY2x1ZGUgPGZzdHJlYW0+CiAjaW5jbHVkZSA8 cnVudGltZS9Jbml0aWFsaXplVGhyZWFkaW5nLmg+CiAjaW5jbHVkZSA8c3RkbGliLmg+CiAjaW5j bHVkZSA8c3RyaW5nPgpAQCAtNjEsNiArNjIsNyBAQAogI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+ CiAjaW5jbHVkZSA8d3RmL1RlbXBvcmFyeUNoYW5nZS5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NT dHJpbmcuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogI2lmIFBMQVRGT1JN KENPQ09BKQogI2luY2x1ZGUgPFdlYktpdC9XS0NvbnRleHRQcml2YXRlTWFjLmg+CkBAIC03OTAs NiArNzkyLDU1IEBAIHN0YXRpYyBib29sIHNob3VsZFVzZUZpeGVkTGF5b3V0KGNvbnN0IFRlc3RJ bnZvY2F0aW9uJiB0ZXN0KQogICAgIHJldHVybiBmYWxzZTsKIH0KIAorc3RhdGljIFN0cmluZyB0 ZXN0UGF0aChjb25zdCBXS1VSTFJlZiB1cmwpCit7CisgICAgYXV0byBzY2hlbWUgPSBhZG9wdFdL KFdLVVJMQ29weVNjaGVtZSh1cmwpKTsKKyAgICBpZiAoV0tTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0 cmluZ0lnbm9yaW5nQ2FzZShzY2hlbWUuZ2V0KCksICJmaWxlIikpIHsKKyAgICAgICAgYXV0byBw YXRoID0gYWRvcHRXSyhXS1VSTENvcHlQYXRoKHVybCkpOworICAgICAgICBhdXRvIGxlbmd0aCA9 IFdLU3RyaW5nR2V0TGVuZ3RoKHBhdGguZ2V0KCkpOworICAgICAgICBXS0NoYXIgYnVmZmVyW2xl bmd0aF07CisgICAgICAgIFdLU3RyaW5nR2V0Q2hhcmFjdGVycyhwYXRoLmdldCgpLCBidWZmZXIs IGxlbmd0aCk7CisgICAgICAgIHJldHVybiBTdHJpbmcoYnVmZmVyLCBsZW5ndGgpOworICAgIH0K KyAgICByZXR1cm4gU3RyaW5nKCk7Cit9CisKK3N0YXRpYyB2b2lkIHVwZGF0ZVZpZXdPcHRpb25z RnJvbVRlc3RIZWFkZXIoVmlld09wdGlvbnMmIHZpZXdPcHRpb25zLCBjb25zdCBUZXN0SW52b2Nh dGlvbiYgdGVzdCkKK3sKKyAgICBTdHJpbmcgZmlsZW5hbWUgPSB0ZXN0UGF0aCh0ZXN0LnVybCgp KTsKKyAgICBpZiAoZmlsZW5hbWUuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisKKyAgICAv LyBEbyBldmVyeXRoaW5nIHVzaW5nIGZpbGUgSU8gc28gd2UgZG9uJ3QgbWVzcyB1cCBjYWNoaW5n IG9uIEhUVFAgdGVzdHMuCisgICAgc3RkOjpzdHJpbmcgb3B0aW9uczsKKyAgICBzdGQ6Omlmc3Ry ZWFtIHRlc3RGaWxlKGZpbGVuYW1lLnV0ZjgoKS5kYXRhKCkpOworICAgIGlmICghdGVzdEZpbGUu Z29vZCgpKQorICAgICAgICByZXR1cm47CisgICAgZ2V0bGluZSh0ZXN0RmlsZSwgb3B0aW9ucyk7 CisgICAgc3RkOjpzdHJpbmcgYmVnaW5TdHJpbmcoIndlYmtpdC10ZXN0LXJ1bm5lciBbICIpOwor ICAgIHN0ZDo6c3RyaW5nIGVuZFN0cmluZygiIF0iKTsKKyAgICBzaXplX3QgYmVnaW5Mb2NhdGlv biA9IG9wdGlvbnMuZmluZChiZWdpblN0cmluZyk7CisgICAgaWYgKGJlZ2luTG9jYXRpb24gPT0g c3RkOjpzdHJpbmc6Om5wb3MpCisgICAgICAgIHJldHVybjsKKyAgICBzaXplX3QgZW5kTG9jYXRp b24gPSBvcHRpb25zLmZpbmQoZW5kU3RyaW5nLCBiZWdpbkxvY2F0aW9uKTsKKyAgICBpZiAoZW5k TG9jYXRpb24gPT0gc3RkOjpzdHJpbmc6Om5wb3MpCisgICAgICAgIHJldHVybjsKKyAgICBzdGQ6 OnN0cmluZyBwYWlyU3RyaW5nID0gb3B0aW9ucy5zdWJzdHIoYmVnaW5Mb2NhdGlvbiArIGJlZ2lu U3RyaW5nLnNpemUoKSwgZW5kTG9jYXRpb24gLSAoYmVnaW5Mb2NhdGlvbiArIGJlZ2luU3RyaW5n LnNpemUoKSkpOworICAgIHNpemVfdCBwYWlyU3RhcnQgPSAwOworICAgIHdoaWxlIChwYWlyU3Rh cnQgPCBwYWlyU3RyaW5nLnNpemUoKSkgeworICAgICAgICBzaXplX3QgcGFpckVuZCA9IHBhaXJT dHJpbmcuZmluZCgiICIsIHBhaXJTdGFydCk7CisgICAgICAgIGlmIChwYWlyRW5kID09IHN0ZDo6 c3RyaW5nOjpucG9zKQorICAgICAgICAgICAgcGFpckVuZCA9IHBhaXJTdHJpbmcuc2l6ZSgpOwor ICAgICAgICBzaXplX3QgZXF1YWxzTG9jYXRpb24gPSBwYWlyU3RyaW5nLmZpbmQoIj0iLCBwYWly U3RhcnQpOworICAgICAgICBpZiAoZXF1YWxzTG9jYXRpb24gPT0gc3RkOjpzdHJpbmc6Om5wb3Mp CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgYXV0byBrZXkgPSBwYWlyU3RyaW5nLnN1YnN0 cihwYWlyU3RhcnQsIGVxdWFsc0xvY2F0aW9uIC0gcGFpclN0YXJ0KTsKKyAgICAgICAgYXV0byB2 YWx1ZSA9IHBhaXJTdHJpbmcuc3Vic3RyKGVxdWFsc0xvY2F0aW9uICsgMSwgcGFpckVuZCAtIChl cXVhbHNMb2NhdGlvbiArIDEpKTsKKyAgICAgICAgLy8gT3B0aW9ucyBwcm9jZXNzaW5nIHRvIG1v ZGlmeSB2aWV3T3B0aW9ucyBnb2VzIGhlcmUuCisgICAgICAgIHBhaXJTdGFydCA9IHBhaXJFbmQg KyAxOworICAgIH0KK30KKwogVmlld09wdGlvbnMgVGVzdENvbnRyb2xsZXI6OnZpZXdPcHRpb25z Rm9yVGVzdChjb25zdCBUZXN0SW52b2NhdGlvbiYgdGVzdCkgY29uc3QKIHsKICAgICBWaWV3T3B0 aW9ucyB2aWV3T3B0aW9uczsKQEAgLTc5OCw2ICs4NDksOCBAQCBWaWV3T3B0aW9ucyBUZXN0Q29u dHJvbGxlcjo6dmlld09wdGlvbnNGb3JUZXN0KGNvbnN0IFRlc3RJbnZvY2F0aW9uJiB0ZXN0KSBj b25zdAogICAgIHZpZXdPcHRpb25zLnNob3VsZFNob3dXZWJWaWV3ID0gbV9zaG91bGRTaG93V2Vi VmlldzsKICAgICB2aWV3T3B0aW9ucy51c2VGaXhlZExheW91dCA9IHNob3VsZFVzZUZpeGVkTGF5 b3V0KHRlc3QpOwogCisgICAgdXBkYXRlVmlld09wdGlvbnNGcm9tVGVzdEhlYWRlcih2aWV3T3B0 aW9ucywgdGVzdCk7CisKICAgICB1cGRhdGVQbGF0Zm9ybVNwZWNpZmljVmlld09wdGlvbnNGb3JU ZXN0KHZpZXdPcHRpb25zLCB0ZXN0KTsKIAogICAgIHJldHVybiB2aWV3T3B0aW9uczsK 260443 2015-09-02 14:54:40 -0700 2015-09-02 18:10:41 -0700 Patch bug-148723-20150902145439.patch text/plain 4286 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MjY2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTUyZTliYzgzZmIyY2NkNDliMDYyMDIwMDlmMGFlZjc5 NmU4NmU2ZS4uZDk0ZjIxOTNkYzZmMTFlNmFjYzZlZTRhZDE0MmYwMzRlYWI4NmY5NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE1LTA5LTAyICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+ CisKKyAgICAgICAgW1dLMl0gQWxsb3cgdGFnZ2luZyB0ZXN0cyB3aXRoIG1ldGFkYXRhIHdoaWNo IG5lZWRzIHRvIGJlIGtub3duIGF0IHdlYiBwcm9jZXNzIGNyZWF0aW9uIHRpbWUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODcyMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5l ci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OnRlc3RQYXRoKToKKyAgICAgICAg KFdUUjo6dXBkYXRlVmlld09wdGlvbnNGcm9tVGVzdEhlYWRlcik6CisgICAgICAgIChXVFI6OlRl c3RDb250cm9sbGVyOjp2aWV3T3B0aW9uc0ZvclRlc3QpOgorCiAyMDE1LTA5LTAyICBDYXJsb3Mg R2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9O KHIxODg1NDgpOiBTb21lIHRlc3RzIGNyYXNoIGFmdGVyIHIxODg1NDggYmVjYXVzZSBpbmplY3Rl ZCBidW5kbGUgbWVzc2FnZXMgYXJlIHJlY2VpdmVkIGFmdGVyIHRoZSB0ZXN0IGZpbmlzaGVzCmRp ZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcCBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCmluZGV4IDI1NWNlMGM4MDhi Y2I2NTM3NWYxNGE1Mzk0ZTc4MjIzMWRhMzYwYTcuLjFkM2NkNTc4OTA4YmJiOTRjOWFiMzhlNGNk MTM2NGE5MWU2NGYwMjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENv bnRyb2xsZXIuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIu Y3BwCkBAIC01NCw2ICs1NCw3IEBACiAjaW5jbHVkZSA8YWxnb3JpdGhtPgogI2luY2x1ZGUgPGNz dGRpbz4KICNpbmNsdWRlIDxjdHlwZS5oPgorI2luY2x1ZGUgPGZzdHJlYW0+CiAjaW5jbHVkZSA8 cnVudGltZS9Jbml0aWFsaXplVGhyZWFkaW5nLmg+CiAjaW5jbHVkZSA8c3RkbGliLmg+CiAjaW5j bHVkZSA8c3RyaW5nPgpAQCAtNjEsNiArNjIsNyBAQAogI2luY2x1ZGUgPHd0Zi9SdW5Mb29wLmg+ CiAjaW5jbHVkZSA8d3RmL1RlbXBvcmFyeUNoYW5nZS5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NT dHJpbmcuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogI2lmIFBMQVRGT1JN KENPQ09BKQogI2luY2x1ZGUgPFdlYktpdC9XS0NvbnRleHRQcml2YXRlTWFjLmg+CkBAIC03OTAs NiArNzkyLDU3IEBAIHN0YXRpYyBib29sIHNob3VsZFVzZUZpeGVkTGF5b3V0KGNvbnN0IFRlc3RJ bnZvY2F0aW9uJiB0ZXN0KQogICAgIHJldHVybiBmYWxzZTsKIH0KIAorc3RhdGljIHN0ZDo6c3Ry aW5nIHRlc3RQYXRoKGNvbnN0IFdLVVJMUmVmIHVybCkKK3sKKyAgICBhdXRvIHNjaGVtZSA9IGFk b3B0V0soV0tVUkxDb3B5U2NoZW1lKHVybCkpOworICAgIGlmIChXS1N0cmluZ0lzRXF1YWxUb1VU RjhDU3RyaW5nSWdub3JpbmdDYXNlKHNjaGVtZS5nZXQoKSwgImZpbGUiKSkgeworICAgICAgICBh dXRvIHBhdGggPSBhZG9wdFdLKFdLVVJMQ29weVBhdGgodXJsKSk7CisgICAgICAgIGF1dG8gYnVm ZmVyID0gc3RkOjp2ZWN0b3I8Y2hhcj4oV0tTdHJpbmdHZXRNYXhpbXVtVVRGOENTdHJpbmdTaXpl KHBhdGguZ2V0KCkpKTsKKyAgICAgICAgYXV0byBsZW5ndGggPSBXS1N0cmluZ0dldFVURjhDU3Ry aW5nKHBhdGguZ2V0KCksIGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5zaXplKCkpOworICAgICAgICBy ZXR1cm4gc3RkOjpzdHJpbmcoYnVmZmVyLmRhdGEoKSwgbGVuZ3RoKTsKKyAgICB9CisgICAgcmV0 dXJuIHN0ZDo6c3RyaW5nKCk7Cit9CisKK3N0YXRpYyB2b2lkIHVwZGF0ZVZpZXdPcHRpb25zRnJv bVRlc3RIZWFkZXIoVmlld09wdGlvbnMmIHZpZXdPcHRpb25zLCBjb25zdCBUZXN0SW52b2NhdGlv biYgdGVzdCkKK3sKKyAgICBzdGQ6OnN0cmluZyBmaWxlbmFtZSA9IHRlc3RQYXRoKHRlc3QudXJs KCkpOworICAgIGlmIChmaWxlbmFtZS5lbXB0eSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBz dGQ6OnN0cmluZyBvcHRpb25zOworICAgIHN0ZDo6aWZzdHJlYW0gdGVzdEZpbGUoZmlsZW5hbWUu ZGF0YSgpKTsKKyAgICBpZiAoIXRlc3RGaWxlLmdvb2QoKSkKKyAgICAgICAgcmV0dXJuOworICAg IGdldGxpbmUodGVzdEZpbGUsIG9wdGlvbnMpOworICAgIHN0ZDo6c3RyaW5nIGJlZ2luU3RyaW5n KCJ3ZWJraXQtdGVzdC1ydW5uZXIgWyAiKTsKKyAgICBzdGQ6OnN0cmluZyBlbmRTdHJpbmcoIiBd Iik7CisgICAgc2l6ZV90IGJlZ2luTG9jYXRpb24gPSBvcHRpb25zLmZpbmQoYmVnaW5TdHJpbmcp OworICAgIGlmIChiZWdpbkxvY2F0aW9uID09IHN0ZDo6c3RyaW5nOjpucG9zKQorICAgICAgICBy ZXR1cm47CisgICAgc2l6ZV90IGVuZExvY2F0aW9uID0gb3B0aW9ucy5maW5kKGVuZFN0cmluZywg YmVnaW5Mb2NhdGlvbik7CisgICAgaWYgKGVuZExvY2F0aW9uID09IHN0ZDo6c3RyaW5nOjpucG9z KSB7CisgICAgICAgIExPR19FUlJPUigiQ291bGQgbm90IGZpbmQgZW5kIG9mIHRlc3QgaGVhZGVy IGluICVzIiwgZmlsZW5hbWUuY19zdHIoKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAg c3RkOjpzdHJpbmcgcGFpclN0cmluZyA9IG9wdGlvbnMuc3Vic3RyKGJlZ2luTG9jYXRpb24gKyBi ZWdpblN0cmluZy5zaXplKCksIGVuZExvY2F0aW9uIC0gKGJlZ2luTG9jYXRpb24gKyBiZWdpblN0 cmluZy5zaXplKCkpKTsKKyAgICBzaXplX3QgcGFpclN0YXJ0ID0gMDsKKyAgICB3aGlsZSAocGFp clN0YXJ0IDwgcGFpclN0cmluZy5zaXplKCkpIHsKKyAgICAgICAgc2l6ZV90IHBhaXJFbmQgPSBw YWlyU3RyaW5nLmZpbmQoIiAiLCBwYWlyU3RhcnQpOworICAgICAgICBpZiAocGFpckVuZCA9PSBz dGQ6OnN0cmluZzo6bnBvcykKKyAgICAgICAgICAgIHBhaXJFbmQgPSBwYWlyU3RyaW5nLnNpemUo KTsKKyAgICAgICAgc2l6ZV90IGVxdWFsc0xvY2F0aW9uID0gcGFpclN0cmluZy5maW5kKCI9Iiwg cGFpclN0YXJ0KTsKKyAgICAgICAgaWYgKGVxdWFsc0xvY2F0aW9uID09IHN0ZDo6c3RyaW5nOjpu cG9zKSB7CisgICAgICAgICAgICBMT0dfRVJST1IoIk1hbGZvcm1lZCBvcHRpb24gaW4gdGVzdCBo ZWFkZXIgKGNvdWxkIG5vdCBmaW5kICc9JyBjaGFyYWN0ZXIpIGluICVzIiwgZmlsZW5hbWUuY19z dHIoKSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICBhdXRvIGtleSA9 IHBhaXJTdHJpbmcuc3Vic3RyKHBhaXJTdGFydCwgZXF1YWxzTG9jYXRpb24gLSBwYWlyU3RhcnQp OworICAgICAgICBhdXRvIHZhbHVlID0gcGFpclN0cmluZy5zdWJzdHIoZXF1YWxzTG9jYXRpb24g KyAxLCBwYWlyRW5kIC0gKGVxdWFsc0xvY2F0aW9uICsgMSkpOworICAgICAgICAvLyBPcHRpb25z IHByb2Nlc3NpbmcgdG8gbW9kaWZ5IHZpZXdPcHRpb25zIGdvZXMgaGVyZS4KKyAgICAgICAgcGFp clN0YXJ0ID0gcGFpckVuZCArIDE7CisgICAgfQorfQorCiBWaWV3T3B0aW9ucyBUZXN0Q29udHJv bGxlcjo6dmlld09wdGlvbnNGb3JUZXN0KGNvbnN0IFRlc3RJbnZvY2F0aW9uJiB0ZXN0KSBjb25z dAogewogICAgIFZpZXdPcHRpb25zIHZpZXdPcHRpb25zOwpAQCAtNzk4LDYgKzg1MSw4IEBAIFZp ZXdPcHRpb25zIFRlc3RDb250cm9sbGVyOjp2aWV3T3B0aW9uc0ZvclRlc3QoY29uc3QgVGVzdElu dm9jYXRpb24mIHRlc3QpIGNvbnN0CiAgICAgdmlld09wdGlvbnMuc2hvdWxkU2hvd1dlYlZpZXcg PSBtX3Nob3VsZFNob3dXZWJWaWV3OwogICAgIHZpZXdPcHRpb25zLnVzZUZpeGVkTGF5b3V0ID0g c2hvdWxkVXNlRml4ZWRMYXlvdXQodGVzdCk7CiAKKyAgICB1cGRhdGVWaWV3T3B0aW9uc0Zyb21U ZXN0SGVhZGVyKHZpZXdPcHRpb25zLCB0ZXN0KTsKKwogICAgIHVwZGF0ZVBsYXRmb3JtU3BlY2lm aWNWaWV3T3B0aW9uc0ZvclRlc3Qodmlld09wdGlvbnMsIHRlc3QpOwogCiAgICAgcmV0dXJuIHZp ZXdPcHRpb25zOwo=