154595 2016-02-23 10:57:47 -0800 [GTK] Run the run-benchmark script on the performance bot. 2017-07-31 14:46:33 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 153993 1 clopez clopez ap bugs-noreply cgarcia commit-queue darin glenn lforschler ossy rniwa oldest_to_newest 1167467 0 clopez 2016-02-23 10:57:47 -0800 After bug 153993 is possible to use the run-benchmark script to execute the benchmarks with the WebKitGTK+ MiniBrowser Now we would to implement a new step for the performance bots to run this tests automatically (running all plans available). The idea is to only enable this for the GTK+ Performance Test bot for the moment. Other ports can follow if they wish. Previous context: https://lists.webkit.org/pipermail/webkit-dev/2016-February/027948.html 1169438 1 272564 clopez 2016-03-01 08:35:17 -0800 Created attachment 272564 Patch 1169439 2 commit-queue 2016-03-01 08:37:07 -0800 Attachment 272564 did not pass style-queue: ERROR: Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:534: [RunBenchmarkTest.assertResults] Undefined variable 'RunBenchmarkTests' [pylint/E0602] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1169441 3 clopez 2016-03-01 08:39:39 -0800 (In reply to comment #2) > Attachment 272564 [details] did not pass style-queue: > > > ERROR: > Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:534: > [RunBenchmarkTest.assertResults] Undefined variable 'RunBenchmarkTests' > [pylint/E0602] [5] > Total errors found: 1 in 6 files > > > If any of these errors are false positives, please file a bug against > check-webkit-style. This is a false positive. The unit tests are executed as follows: ( cd Tools/BuildSlaveSupport/build.webkit.org-config/; ./mastercfg_unittest.py ) 1170205 4 272564 cgarcia 2016-03-03 08:10:36 -0800 Comment on attachment 272564 Patch Looks good, let's try it out! Please, watch the bots after landing this. 1170206 5 ossy 2016-03-03 08:20:17 -0800 (In reply to comment #4) > Comment on attachment 272564 [details] > Patch > > Looks good, let's try it out! Please, watch the bots after landing this. You will need a buildmaster restart to see its effect. 1170210 6 272564 clopez 2016-03-03 08:40:15 -0800 Comment on attachment 272564 Patch Clearing flags on attachment: 272564 Committed r197505: <http://trac.webkit.org/changeset/197505> 1170211 7 clopez 2016-03-03 08:40:22 -0800 All reviewed patches have been landed. Closing bug. 1170266 8 clopez 2016-03-03 10:26:46 -0800 (In reply to comment #5) > (In reply to comment #4) > > Comment on attachment 272564 [details] > > Patch > > > > Looks good, let's try it out! Please, watch the bots after landing this. > > You will need a buildmaster restart to see its effect. yes, it seems. I have sent a mail to lucas asking for a restart. 1170281 9 clopez 2016-03-03 10:45:27 -0800 Lucas just restarted the master moments ago :) I can see now the new step on the GTK+ perf bot. Let's see how it goes 1170356 10 clopez 2016-03-03 15:57:11 -0800 Committed r197525: <http://trac.webkit.org/changeset/197525> 1171230 11 clopez 2016-03-05 11:44:36 -0800 Committed r197615: <http://trac.webkit.org/changeset/197615> 1333549 12 272564 ossy 2017-07-31 14:46:33 -0700 Comment on attachment 272564 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=272564&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:712 > +class RunBenchmarkTests(shell.Test): > + name = "benchmark-test" > + description = ["benchmark tests running"] > + descriptionDone = ["benchmark tests"] > + # Buildbot default timeout without output for a step is 1200. > + # The current maximum timeout for a benchmark plan is also 1200. > + # So raise the buildbot timeout to avoid aborting this whole step when a test timeouts. > + timeout = 1500 > + command = ["python", "./Tools/Scripts/run-benchmark", "--allplans"] Setting timeout here doesn't have any effect, see the buildbot logs: https://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20%28Perf%29/builds/831/steps/benchmark-test/logs/stdio The timeout is still the default 1200 seconds. You need a fix like this: https://trac.webkit.org/changeset/179043/webkit 272564 2016-03-01 08:35:17 -0800 2016-03-03 08:40:15 -0800 Patch bug-154595-20160301173501.patch text/plain 12566 clopez U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3Mzk4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWExZDcyMjY2YjI5ZGNhNjVlM2NjOTg2NzA3ZjA3ZGFi YzYyZThkMC4uZGQ4YTMwOGUyMjZjYzY0ZmRhNWUxZjZhMmJiMmY0ODQwOGU1NjI2ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMx IEBACisyMDE2LTAzLTAxICBDYXJsb3MgQWxiZXJ0byBMb3BleiBQZXJleiAgPGNsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEtdIFJ1biB0aGUgcnVuLWJlbmNobWFyayBzY3JpcHQgb24g dGhlIHBlcmZvcm1hbmNlIGJvdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1NDU5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcv bWFzdGVyLmNmZzogQWRkIG5ldyBSdW5CZW5jaG1hcmtUZXN0cyBzdGVwIG9uIHRoZSBwZXJmIGJv dHMgKG9ubHkgZm9yIHRoZSBHVEsrIHBvcnQgYXQgdGhpcyBtb21lbnQpLgorICAgICAgICAoUnVu QmVuY2htYXJrVGVzdHMpOgorICAgICAgICAoUnVuQmVuY2htYXJrVGVzdHMuc3RhcnQpOgorICAg ICAgICAoUnVuQmVuY2htYXJrVGVzdHMuZ2V0VGV4dCk6CisgICAgICAgIChSdW5CZW5jaG1hcmtU ZXN0cy5nZXRUZXh0Mik6CisgICAgICAgIChCdWlsZEFuZFBlcmZUZXN0RmFjdG9yeS5fX2luaXRf Xyk6CisgICAgICAgIChEb3dubG9hZEFuZFBlcmZUZXN0RmFjdG9yeS5fX2luaXRfXyk6CisgICAg ICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyY2Zn X3VuaXR0ZXN0LnB5OiBBZGQgbmV3IHRlc3QgZm9yIFJ1bkJlbmNobWFya1Rlc3RzIGFuZCB1cGRh dGUgZXhwZWN0ZWQgc3RlcHMgb2YgR1RLKyBwZXJmIGJvdC4KKyAgICAgICAgKFJ1bkJlbmNobWFy a1Rlc3QpOgorICAgICAgICAoUnVuQmVuY2htYXJrVGVzdC5hc3NlcnRSZXN1bHRzKToKKyAgICAg ICAgKFJ1bkJlbmNobWFya1Rlc3QudGVzdF9zdWNjZXNzKToKKyAgICAgICAgKFJ1bkJlbmNobWFy a1Rlc3QudGVzdF90ZXN0c19mYWlsZWQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVu Y2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5OiBMb2cgYm90aCB0aGUgY3VycmVudCBp dGVyYXRpb24gYXMgYWxzbyB0aGUgdG90YWwgaXRlcmF0aW9ucyBmb3IgdGhlIGN1cnJlbnQgYmVu Y2htYXJrL3BsYW4uCisgICAgICAgIChCZW5jaG1hcmtSdW5uZXIuX3J1bl9iZW5jaG1hcmspOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZl ci9ndGtfbWluaWJyb3dzZXJfZHJpdmVyLnB5OiBVc2UgcHl0aG9uIGxvZ2dpbmcgYWxzbyBmb3Ig ZXJyb3JzLgorICAgICAgICAoR1RLTWluaUJyb3dzZXJEcml2ZXIuY2xvc2VfYnJvd3NlcnMpOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9ydW5fYmVuY2htYXJr LnB5OiBJbXBsZW1lbnQgc3VwcG9ydCBmb3IgcnVubmluZyBhbGwgYXZhaWxhYmxlIGJlbmNobWFy ayBwbGFucy4KKyAgICAgICAgKHBhcnNlX2FyZ3MpOgorICAgICAgICAoc3RhcnQpOgorICAgICAg ICAobWFpbik6CisKIDIwMTYtMDItMjkgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K IAogICAgICAgICBIYXZlIHBhcnNlSFRNTEludGVnZXIoKSAvIHBhcnNlSFRNTE5vbk5lZ2F0aXZl SW50ZWdlcigpIHVzZSBXVEY6Ok9wdGlvbmFsCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNsYXZl U3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnIGIvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwppbmRleCBhODQz MTFkMjBjYTRiYWI5YzkxNmQwYzQ5NTIzYjY5NWRjZTBkNTM1Li4yMDhjNjNjZjcxMTdjYmM4OThk MGM4YTQ2MmIyY2NjMzFlMzc1ZWM2IDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCisrKyBiL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcKQEAgLTcwMSw2ICs3 MDEsMzAgQEAgY2xhc3MgUnVuQW5kVXBsb2FkUGVyZlRlc3RzKHNoZWxsLlRlc3QpOgogCiAgICAg ICAgIHJldHVybiBbc2VsZi5uYW1lXQogCitjbGFzcyBSdW5CZW5jaG1hcmtUZXN0cyhzaGVsbC5U ZXN0KToKKyAgICBuYW1lID0gImJlbmNobWFyay10ZXN0IgorICAgIGRlc2NyaXB0aW9uID0gWyJi ZW5jaG1hcmsgdGVzdHMgcnVubmluZyJdCisgICAgZGVzY3JpcHRpb25Eb25lID0gWyJiZW5jaG1h cmsgdGVzdHMiXQorICAgICMgQnVpbGRib3QgZGVmYXVsdCB0aW1lb3V0IHdpdGhvdXQgb3V0cHV0 IGZvciBhIHN0ZXAgaXMgMTIwMC4KKyAgICAjIFRoZSBjdXJyZW50IG1heGltdW0gdGltZW91dCBm b3IgYSBiZW5jaG1hcmsgcGxhbiBpcyBhbHNvIDEyMDAuCisgICAgIyBTbyByYWlzZSB0aGUgYnVp bGRib3QgdGltZW91dCB0byBhdm9pZCBhYm9ydGluZyB0aGlzIHdob2xlIHN0ZXAgd2hlbiBhIHRl c3QgdGltZW91dHMuCisgICAgdGltZW91dCA9IDE1MDAKKyAgICBjb21tYW5kID0gWyJweXRob24i LCAiLi9Ub29scy9TY3JpcHRzL3J1bi1iZW5jaG1hcmsiLCAiLS1hbGxwbGFucyJdCisKKyAgICBk ZWYgc3RhcnQoc2VsZik6CisgICAgICAgIHBsYXRmb3JtID0gc2VsZi5nZXRQcm9wZXJ0eSgicGxh dGZvcm0iKQorICAgICAgICBpZiBwbGF0Zm9ybSA9PSAiZ3RrIjoKKyAgICAgICAgICAgIGNvbW1h bmQgKz0gWyItLXBsYXRmb3JtIiwgImd0ayIsICItLWJyb3dzZXIiLCAibWluaWJyb3dzZXIiXQor ICAgICAgICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kKQorICAgICAgICByZXR1cm4gc2hl bGwuVGVzdC5zdGFydChzZWxmKQorCisgICAgZGVmIGdldFRleHQoc2VsZiwgY21kLCByZXN1bHRz KToKKyAgICAgICAgcmV0dXJuIHNlbGYuZ2V0VGV4dDIoY21kLCByZXN1bHRzKQorCisgICAgZGVm IGdldFRleHQyKHNlbGYsIGNtZCwgcmVzdWx0cyk6CisgICAgICAgIGlmIHJlc3VsdHMgIT0gU1VD Q0VTUzoKKyAgICAgICAgICAgIHJldHVybiBbIiVkIGJlbmNobWFyayB0ZXN0cyBmYWlsZWQiICUg Y21kLnJjXQorICAgICAgICByZXR1cm4gW3NlbGYubmFtZV0KIAogY2xhc3MgQXJjaGl2ZVRlc3RS ZXN1bHRzKHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAgICAgY29tbWFuZCA9IFsicHl0aG9uIiwgIi4v VG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvdGVzdC1yZXN1bHQtYXJjaGl2ZSIsCkBAIC04ODMsNiAr OTA3LDggQEAgY2xhc3MgQnVpbGRBbmRQZXJmVGVzdEZhY3RvcnkoRmFjdG9yeSk6CiAgICAgICAg IEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb24sIGFyY2hpdGVj dHVyZXMsIEZhbHNlLCBhZGRpdGlvbmFsQXJndW1lbnRzLCBTVk5NaXJyb3IsICoqa3dhcmdzKQog ICAgICAgICBzZWxmLmFkZFN0ZXAoQ29tcGlsZVdlYktpdCgpKQogICAgICAgICBzZWxmLmFkZFN0 ZXAoUnVuQW5kVXBsb2FkUGVyZlRlc3RzKCkpCisgICAgICAgIGlmIHBsYXRmb3JtID09ICJndGsi OgorICAgICAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bkJlbmNobWFya1Rlc3RzKCkpCiAKIGNsYXNz IERvd25sb2FkQW5kUGVyZlRlc3RGYWN0b3J5KEZhY3RvcnkpOgogICAgIGRlZiBfX2luaXRfXyhz ZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0dXJlcywgYWRkaXRpb25hbEFy Z3VtZW50cz1Ob25lLCBTVk5NaXJyb3I9Tm9uZSwgKiprd2FyZ3MpOgpAQCAtODkwLDYgKzkxNiw4 IEBAIGNsYXNzIERvd25sb2FkQW5kUGVyZlRlc3RGYWN0b3J5KEZhY3RvcnkpOgogICAgICAgICBz ZWxmLmFkZFN0ZXAoRG93bmxvYWRCdWlsdFByb2R1Y3QoKSkKICAgICAgICAgc2VsZi5hZGRTdGVw KEV4dHJhY3RCdWlsdFByb2R1Y3QoKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bkFuZFVwbG9h ZFBlcmZUZXN0cygpKQorICAgICAgICBpZiBwbGF0Zm9ybSA9PSAiZ3RrIjoKKyAgICAgICAgICAg IHNlbGYuYWRkU3RlcChSdW5CZW5jaG1hcmtUZXN0cygpKQogCiBjbGFzcyBQbGF0Zm9ybVNwZWNp ZmljU2NoZWR1bGVyKEFueUJyYW5jaFNjaGVkdWxlcik6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYs IHBsYXRmb3JtLCBicmFuY2gsICoqa3dhcmdzKToKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3RlcmNmZ191bml0dGVzdC5weSBi L1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3RlcmNm Z191bml0dGVzdC5weQppbmRleCA3YjE4YjNiN2I3YjI5NmY4MDVhYmI0MjgxNjQ4NWEwOTRkYWZl NGJkLi5mMGMzZjJhM2RiNGE0MDc4NGE4NDRmZjA1MDFmNjcxNTUxZDk0ZGQxIDEwMDc1NQotLS0g YS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXJj ZmdfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvbWFzdGVyY2ZnX3VuaXR0ZXN0LnB5CkBAIC00MTQsNyArNDE0LDcgQEAgZXhw ZWN0ZWRfYnVpbGRfc3RlcHMgPSB7CiAgICAgJ0dUSyBMaW51eCA2NC1iaXQgRGVidWcgKEJ1aWxk KScgOiBbJ2NvbmZpZ3VyZSBidWlsZCcsICdzdm4nLCAna2lsbCBvbGQgcHJvY2Vzc2VzJywgJ2Rl bGV0ZSBXZWJLaXRCdWlsZCBkaXJlY3RvcnknLCAnZGVsZXRlIHN0YWxlIGJ1aWxkIGZpbGVzJywg J2poYnVpbGQnLCAnY29tcGlsZS13ZWJraXQnLCAnYXJjaGl2ZS1idWlsdC1wcm9kdWN0JywgJ3Vw bG9hZCcsICd0cmlnZ2VyJ10sCiAgICAgJ0dUSyBMaW51eCA2NC1iaXQgRGVidWcgKFRlc3RzKScg OiBbJ2NvbmZpZ3VyZSBidWlsZCcsICdzdm4nLCAna2lsbCBvbGQgcHJvY2Vzc2VzJywgJ2RlbGV0 ZSBXZWJLaXRCdWlsZCBkaXJlY3RvcnknLCAnZGVsZXRlIHN0YWxlIGJ1aWxkIGZpbGVzJywgJ2po YnVpbGQnLCAnZG93bmxvYWQtYnVpbHQtcHJvZHVjdCcsICdleHRyYWN0LWJ1aWx0LXByb2R1Y3Qn LCAnanNjb3JlLXRlc3QnLCAnbGF5b3V0LXRlc3QnLCAnd2Via2l0cHktdGVzdCcsICd3ZWJraXRw ZXJsLXRlc3QnLCAnYmluZGluZ3MtZ2VuZXJhdGlvbi10ZXN0cycsICdhcmNoaXZlLXRlc3QtcmVz dWx0cycsICd1cGxvYWQnLCAnTWFzdGVyU2hlbGxDb21tYW5kJywgJ0FQSSB0ZXN0cycsICdXZWJL aXQgR09iamVjdCBET00gYmluZGluZ3MgQVBJIGJyZWFrIHRlc3RzJ10sCiAgICAgJ0dUSyBMaW51 eCA2NC1iaXQgUmVsZWFzZSAoQnVpbGQpJyA6IFsnY29uZmlndXJlIGJ1aWxkJywgJ3N2bicsICdr aWxsIG9sZCBwcm9jZXNzZXMnLCAnZGVsZXRlIFdlYktpdEJ1aWxkIGRpcmVjdG9yeScsICdkZWxl dGUgc3RhbGUgYnVpbGQgZmlsZXMnLCAnamhidWlsZCcsICdjb21waWxlLXdlYmtpdCcsICdhcmNo aXZlLWJ1aWx0LXByb2R1Y3QnLCAndXBsb2FkJywgJ3RyaWdnZXInXSwKLSAgICAnR1RLIExpbnV4 IDY0LWJpdCBSZWxlYXNlIChQZXJmKScgOiBbJ2NvbmZpZ3VyZSBidWlsZCcsICdzdm4nLCAna2ls bCBvbGQgcHJvY2Vzc2VzJywgJ2RlbGV0ZSBXZWJLaXRCdWlsZCBkaXJlY3RvcnknLCAnZGVsZXRl IHN0YWxlIGJ1aWxkIGZpbGVzJywgJ2poYnVpbGQnLCAnZG93bmxvYWQtYnVpbHQtcHJvZHVjdCcs ICdleHRyYWN0LWJ1aWx0LXByb2R1Y3QnLCAncGVyZi10ZXN0J10sCisgICAgJ0dUSyBMaW51eCA2 NC1iaXQgUmVsZWFzZSAoUGVyZiknIDogWydjb25maWd1cmUgYnVpbGQnLCAnc3ZuJywgJ2tpbGwg b2xkIHByb2Nlc3NlcycsICdkZWxldGUgV2ViS2l0QnVpbGQgZGlyZWN0b3J5JywgJ2RlbGV0ZSBz dGFsZSBidWlsZCBmaWxlcycsICdqaGJ1aWxkJywgJ2Rvd25sb2FkLWJ1aWx0LXByb2R1Y3QnLCAn ZXh0cmFjdC1idWlsdC1wcm9kdWN0JywgJ3BlcmYtdGVzdCcsICdiZW5jaG1hcmstdGVzdCddLAog ICAgICdHVEsgTGludXggNjQtYml0IFJlbGVhc2UgKFRlc3RzKScgOiBbJ2NvbmZpZ3VyZSBidWls ZCcsICdzdm4nLCAna2lsbCBvbGQgcHJvY2Vzc2VzJywgJ2RlbGV0ZSBXZWJLaXRCdWlsZCBkaXJl Y3RvcnknLCAnZGVsZXRlIHN0YWxlIGJ1aWxkIGZpbGVzJywgJ2poYnVpbGQnLCAnZG93bmxvYWQt YnVpbHQtcHJvZHVjdCcsICdleHRyYWN0LWJ1aWx0LXByb2R1Y3QnLCAnanNjb3JlLXRlc3QnLCAn bGF5b3V0LXRlc3QnLCAnd2Via2l0cHktdGVzdCcsICd3ZWJraXRwZXJsLXRlc3QnLCAnYmluZGlu Z3MtZ2VuZXJhdGlvbi10ZXN0cycsICdhcmNoaXZlLXRlc3QtcmVzdWx0cycsICd1cGxvYWQnLCAn TWFzdGVyU2hlbGxDb21tYW5kJywgJ0FQSSB0ZXN0cycsICdXZWJLaXQgR09iamVjdCBET00gYmlu ZGluZ3MgQVBJIGJyZWFrIHRlc3RzJ10sCiAgICAgJ0dUSyBMaW51eCBBUk0gUmVsZWFzZScgOiBb J2NvbmZpZ3VyZSBidWlsZCcsICdzdm4nLCAna2lsbCBvbGQgcHJvY2Vzc2VzJywgJ2RlbGV0ZSBX ZWJLaXRCdWlsZCBkaXJlY3RvcnknLCAnZGVsZXRlIHN0YWxlIGJ1aWxkIGZpbGVzJywgJ2poYnVp bGQnLCAnY29tcGlsZS13ZWJraXQnLCAnanNjb3JlLXRlc3QnLCAnd2Via2l0cHktdGVzdCcsICd3 ZWJraXRwZXJsLXRlc3QnLCAnYmluZGluZ3MtZ2VuZXJhdGlvbi10ZXN0cycsICdBUEkgdGVzdHMn LCAnV2ViS2l0IEdPYmplY3QgRE9NIGJpbmRpbmdzIEFQSSBicmVhayB0ZXN0cyddLAogCkBAIC01 MjgsNiArNTI4LDIyIEBAIGNsYXNzIFJ1bkFuZFVwbG9hZFBlcmZUZXN0c1Rlc3QodW5pdHRlc3Qu VGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydFJlc3VsdHMoLTEsICJ0aW1lb3V0IikKIAog CitjbGFzcyBSdW5CZW5jaG1hcmtUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKKyAgICBkZWYgYXNz ZXJ0UmVzdWx0cyhzZWxmLCByYywgZXhwZWN0ZWRfdGV4dCk6CisgICAgICAgIGNtZCA9IFN0dWJS ZW1vdGVDb21tYW5kKHJjLCBleHBlY3RlZF90ZXh0KQorICAgICAgICBzdGVwID0gUnVuQmVuY2ht YXJrVGVzdHMoKQorICAgICAgICBzdGVwLmNvbW1hbmRDb21wbGV0ZShjbWQpCisgICAgICAgIGFj dHVhbF9yZXN1bHRzID0gc3RlcC5ldmFsdWF0ZUNvbW1hbmQoY21kKQorICAgICAgICBhY3R1YWxf dGV4dCA9IHN0cihzdGVwLmdldFRleHQyKGNtZCwgYWN0dWFsX3Jlc3VsdHMpWzBdKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGV4cGVjdGVkX3RleHQsIGFjdHVhbF90ZXh0KQorCisgICAgZGVm IHRlc3Rfc3VjY2VzcyhzZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRSZXN1bHRzKDAsICJiZW5j aG1hcmstdGVzdCIpCisKKyAgICBkZWYgdGVzdF90ZXN0c19mYWlsZWQoc2VsZik6CisgICAgICAg IHNlbGYuYXNzZXJ0UmVzdWx0cyg3LCAiNyBiZW5jaG1hcmsgdGVzdHMgZmFpbGVkIikKKworCiAj IEZJWE1FOiBXZSBzaG91bGQgcnVuIHRoaXMgZmlsZSBhcyBwYXJ0IG9mIHRlc3Qtd2Via2l0cHku CiAjIFVuZm9ydHVuYXRlbHkgdGVzdC13ZWJraXRweSBjdXJyZW50bHkgcmVxdWlyZXMgdGhhdCB1 bml0dGVzdHMKICMgYmUgbG9jYXRlZCBpbiBhIGRpcmVjdG9yeSB3aXRoIGEgdmFsaWQgbW9kdWxl IG5hbWUuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5u ZXIvYmVuY2htYXJrX3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJr X3J1bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CmluZGV4IDE1ODM0NTNhMTE1NjE1MGY2Y2ZiZDRi MjNhMTM0MjcwMjY3MmNiNzIuLmQzOTU4MGFkNzY1Nzc4Y2RiNDJhMWEyOWFlYjQwZjU4MjUxYjAx NjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9i ZW5jaG1hcmtfcnVubmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJr X3J1bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5CkBAIC02Miw3ICs2Miw3IEBAIGNsYXNzIEJlbmNo bWFya1J1bm5lcihvYmplY3QpOgogICAgIGRlZiBfcnVuX2JlbmNobWFyayhzZWxmLCBjb3VudCwg d2ViX3Jvb3QpOgogICAgICAgICByZXN1bHRzID0gW10KICAgICAgICAgZm9yIGl0ZXJhdGlvbiBp biB4cmFuZ2UoMSwgY291bnQgKyAxKToKLSAgICAgICAgICAgIF9sb2cuaW5mbygnU3RhcnQgdGhl IGl0ZXJhdGlvbiB7Y3VycmVudF9pdGVyYXRpb259IG9mIGN1cnJlbnQgYmVuY2htYXJrJy5mb3Jt YXQoY3VycmVudF9pdGVyYXRpb249aXRlcmF0aW9uKSkKKyAgICAgICAgICAgIF9sb2cuaW5mbygn U3RhcnQgdGhlIGl0ZXJhdGlvbiB7Y3VycmVudF9pdGVyYXRpb259IG9mIHtpdGVyYXRpb25zfSBm b3IgY3VycmVudCBiZW5jaG1hcmsnLmZvcm1hdChjdXJyZW50X2l0ZXJhdGlvbj1pdGVyYXRpb24s IGl0ZXJhdGlvbnM9Y291bnQpKQogICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIHJl c3VsdCA9IE5vbmUKICAgICAgICAgICAgICAgICBzZWxmLl9odHRwX3NlcnZlcl9kcml2ZXIuc2Vy dmUod2ViX3Jvb3QpCkBAIC03OCw3ICs3OCw3IEBAIGNsYXNzIEJlbmNobWFya1J1bm5lcihvYmpl Y3QpOgogICAgICAgICAgICAgICAgIHNlbGYuX2Jyb3dzZXJfZHJpdmVyLnJlc3RvcmVfZW52KCkK ICAgICAgICAgICAgICAgICBzZWxmLl9icm93c2VyX2RyaXZlci5jbG9zZV9icm93c2VycygpCiAg ICAgICAgICAgICAgICAgc2VsZi5faHR0cF9zZXJ2ZXJfZHJpdmVyLmtpbGxfc2VydmVyKCkKLSAg ICAgICAgICAgIF9sb2cuaW5mbygnRW5kIG9mIHtjdXJyZW50X2l0ZXJhdGlvbn0gaXRlcmF0aW9u IG9mIGN1cnJlbnQgYmVuY2htYXJrJy5mb3JtYXQoY3VycmVudF9pdGVyYXRpb249aXRlcmF0aW9u KSkKKyAgICAgICAgICAgIF9sb2cuaW5mbygnRW5kIHRoZSBpdGVyYXRpb24ge2N1cnJlbnRfaXRl cmF0aW9ufSBvZiB7aXRlcmF0aW9uc30gZm9yIGN1cnJlbnQgYmVuY2htYXJrJy5mb3JtYXQoY3Vy cmVudF9pdGVyYXRpb249aXRlcmF0aW9uLCBpdGVyYXRpb25zPWNvdW50KSkKICAgICAgICAgcmVz dWx0cyA9IHNlbGYuX3dyYXAocmVzdWx0cykKICAgICAgICAgc2VsZi5fZHVtcChyZXN1bHRzLCBz ZWxmLl9vdXRwdXRfZmlsZSBpZiBzZWxmLl9vdXRwdXRfZmlsZSBlbHNlIHNlbGYuX3BsYW5bJ291 dHB1dF9maWxlJ10pCiAgICAgICAgIHNlbGYuc2hvd19yZXN1bHRzKHJlc3VsdHMsIHNlbGYuX3Nj YWxlX3VuaXQpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19y dW5uZXIvYnJvd3Nlcl9kcml2ZXIvZ3RrX21pbmlicm93c2VyX2RyaXZlci5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9ndGtfbWluaWJy b3dzZXJfZHJpdmVyLnB5CmluZGV4IGI4MDhiYTNhYjBhYWZhMmU4NjVjN2M1NzQ5YzJlZjY2MTJh ZTU4NGMuLmI1NjlmYTAyYTFhMWIwZjFhZDAyNzBhNTA5NGJjY2M4NTUwMzMwNmMgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZl ci9ndGtfbWluaWJyb3dzZXJfZHJpdmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv YmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9ndGtfbWluaWJyb3dzZXJfZHJpdmVyLnB5 CkBAIC00OSw0ICs0OSw1IEBAIGNsYXNzIEdUS01pbmlCcm93c2VyRHJpdmVyKEdUS0Jyb3dzZXJE cml2ZXIpOgogICAgIGRlZiBjbG9zZV9icm93c2VycyhzZWxmKToKICAgICAgICAgc3VwZXIoR1RL TWluaUJyb3dzZXJEcml2ZXIsIHNlbGYpLmNsb3NlX2Jyb3dzZXJzKCkKICAgICAgICAgaWYgc2Vs Zi5fbWluaWJyb3dzZXJfcHJvY2VzcyBhbmQgc2VsZi5fbWluaWJyb3dzZXJfcHJvY2Vzcy5yZXR1 cm5jb2RlOgotICAgICAgICAgICAgc3lzLmV4aXQoJ01pbmlCcm93c2VyIGNyYXNoZWQgd2l0aCBl eGl0Y29kZSAlZCcgJSBzZWxmLl9taW5pYnJvd3Nlcl9wcm9jZXNzLnJldHVybmNvZGUpCisgICAg ICAgICAgICBfbG9nLmVycm9yKCdNaW5pQnJvd3NlciBjcmFzaGVkIHdpdGggZXhpdGNvZGUgJWQn ICUgc2VsZi5fbWluaWJyb3dzZXJfcHJvY2Vzcy5yZXR1cm5jb2RlKQorICAgICAgICAgICAgc3lz LmV4aXQoMSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1 bm5lci9ydW5fYmVuY2htYXJrLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtf cnVubmVyL3J1bl9iZW5jaG1hcmsucHkKaW5kZXggNjE0NGI5YWJmNzc3ZTMwYmMzNzQyMTMzNzQ2 NWQwMDJmYTRkYWI5Ni4uNGQ1NjU4MmUwNmI0N2I4MTIzMjNhNTljODU3ZWE5YzdjNWYwZWI1YiAx MDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL3J1bl9i ZW5jaG1hcmsucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVy L3J1bl9iZW5jaG1hcmsucHkKQEAgLTI4LDYgKzI4LDcgQEAgZGVmIHBhcnNlX2FyZ3MoKToKICAg ICBtdXR1YWxfZ3JvdXAgPSBwYXJzZXIuYWRkX211dHVhbGx5X2V4Y2x1c2l2ZV9ncm91cChyZXF1 aXJlZD1UcnVlKQogICAgIG11dHVhbF9ncm91cC5hZGRfYXJndW1lbnQoJy0tcmVhZC1yZXN1bHRz LWpzb24nLCBkZXN0PSdqc29uX2ZpbGUnLCBoZWxwPSdTcGVjaWZ5IGZpbGUgeW91IHdhbnQgdG8g Zm9ybWF0JykKICAgICBtdXR1YWxfZ3JvdXAuYWRkX2FyZ3VtZW50KCctLXBsYW4nLCBkZXN0PSdw bGFuJywgaGVscD0nQmVuY2htYXJrIHBsYW4gdG8gcnVuLiBlLmcuIHNwZWVkb21ldGVyLCBqZXRz dHJlYW0nKQorICAgIG11dHVhbF9ncm91cC5hZGRfYXJndW1lbnQoJy0tYWxscGxhbnMnLCBhY3Rp b249J3N0b3JlX3RydWUnLCBoZWxwPSdSdW4gYWxsIGF2YWlsYWJsZSBiZW5jaG1hcmsgcGxhbnMg c2VxdWVudGlhbGx5JykKIAogICAgIGFyZ3MgPSBwYXJzZXIucGFyc2VfYXJncygpCiAKQEAgLTQ1 LDYgKzQ2LDI2IEBAIGRlZiBzdGFydChhcmdzKToKICAgICBpZiBhcmdzLmpzb25fZmlsZToKICAg ICAgICAgQmVuY2htYXJrUnVubmVyLnNob3dfcmVzdWx0cyhqc29uLmxvYWQob3BlbihhcmdzLmpz b25fZmlsZSwgJ3InKSksIGFyZ3Muc2NhbGVfdW5pdCkKICAgICAgICAgcmV0dXJuCisgICAgaWYg YXJncy5hbGxwbGFuczoKKyAgICAgICAgZmFpbGVkID0gW10KKyAgICAgICAgcGxhbmRpciA9IG9z LnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUoX19maWxlX18pLCAnZGF0YS9wbGFucycpCisgICAg ICAgIHBsYW5saXN0ID0gW29zLnBhdGguc3BsaXRleHQoZilbMF0gZm9yIGYgaW4gb3MubGlzdGRp cihwbGFuZGlyKSBpZiBmLmVuZHN3aXRoKCcucGxhbicpXQorICAgICAgICBpZiBub3QgcGxhbmxp c3Q6CisgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oJ0NhbnQgZmluZCBhbnkgLnBsYW4gZmls ZSBpbiBkaXJlY3RvcnkgJXMnICUgcGxhbmRpcikKKyAgICAgICAgZm9yIHBsYW4gaW4gc29ydGVk KHBsYW5saXN0KToKKyAgICAgICAgICAgIF9sb2cuaW5mbygnU3RhcnRpbmcgYmVuY2htYXJrIHBs YW46ICVzJyAlIHBsYW4pCisgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgcnVubmVy ID0gQmVuY2htYXJrUnVubmVyKHBsYW4sIGFyZ3MubG9jYWxDb3B5LCBhcmdzLmNvdW50T3ZlcnJp ZGUsIGFyZ3MuYnVpbGREaXIsIGFyZ3Mub3V0cHV0LCBhcmdzLnBsYXRmb3JtLCBhcmdzLmJyb3dz ZXIsIGFyZ3Muc2NhbGVfdW5pdCwgYXJncy5kZXZpY2VfaWQpCisgICAgICAgICAgICAgICAgcnVu bmVyLmV4ZWN1dGUoKQorICAgICAgICAgICAgICAgIF9sb2cuaW5mbygnRmluaXNoZWQgYmVuY2ht YXJrIHBsYW46ICVzJyAlIHBsYW4pCisgICAgICAgICAgICBleGNlcHQgS2V5Ym9hcmRJbnRlcnJ1 cHQ6CisgICAgICAgICAgICAgICAgcmFpc2UKKyAgICAgICAgICAgIGV4Y2VwdDoKKyAgICAgICAg ICAgICAgICBmYWlsZWQuYXBwZW5kKHBsYW4pCisgICAgICAgICAgICAgICAgX2xvZy5lcnJvcign RXJyb3IgcnVubmluZyBiZW5jaG1hcmsgcGxhbjogJXMnICUgcGxhbikKKyAgICAgICAgaWYgZmFp bGVkOgorICAgICAgICAgICAgX2xvZy5lcnJvcignVGhlIGZvbGxvd2luZyBiZW5jaG1hcmsgcGxh bnMgaGF2ZSBmYWlsZWQ6ICVzJyAlIGZhaWxlZCkKKyAgICAgICAgcmV0dXJuIGxlbihmYWlsZWQp CiAgICAgcnVubmVyID0gQmVuY2htYXJrUnVubmVyKGFyZ3MucGxhbiwgYXJncy5sb2NhbENvcHks IGFyZ3MuY291bnRPdmVycmlkZSwgYXJncy5idWlsZERpciwgYXJncy5vdXRwdXQsIGFyZ3MucGxh dGZvcm0sIGFyZ3MuYnJvd3NlciwgYXJncy5zY2FsZV91bml0LCBhcmdzLmRldmljZV9pZCkKICAg ICBydW5uZXIuZXhlY3V0ZSgpCiAKQEAgLTU4LDQgKzc5LDQgQEAgZGVmIGZvcm1hdF9sb2dnZXIo bG9nZ2VyKToKIAogCiBkZWYgbWFpbigpOgotICAgIHN0YXJ0KHBhcnNlX2FyZ3MoKSkKKyAgICBy ZXR1cm4gc3RhcnQocGFyc2VfYXJncygpKQo=