149944 2015-10-08 21:15:17 -0700 Extend run-benchmark script to support human-readable results conversion. 2015-10-09 02:02:26 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149949 1 dewei_zhu webkit-unassigned commit-queue dewei_zhu glenn ossy rniwa oldest_to_newest 1131817 0 dewei_zhu 2015-10-08 21:15:17 -0700 Extend run-benchmark script to support human-readable results conversion. 1131818 1 262740 dewei_zhu 2015-10-08 21:19:52 -0700 Created attachment 262740 Patch 1131821 2 262740 rniwa 2015-10-08 21:25:36 -0700 Comment on attachment 262740 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=262740&action=review > Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py:98 > + return ('{mean:.3f}{unit} stdev={delta:.1%}').format( > + mean=mean, delta=sample_stdev / mean, unit=unit) This should fit in one line. > Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py:27 > + parser.add_argument('--raw', action='store_true') I don't think this is a descriptive name. I'd call this --no-adjust-unit or --no-scale-unit and store the value in scaleUnit which defaults to True. > Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py:29 > + mutual_group.add_argument('--format-result', dest='format_result', help='Specify file you want to format') --format-results sound as if we wouldn't format results if we don't set this option. --read-results-json? --results-json? 1131826 3 262744 dewei_zhu 2015-10-08 21:55:14 -0700 Created attachment 262744 Patch 1131841 4 262744 commit-queue 2015-10-08 22:53:45 -0700 Comment on attachment 262744 Patch Clearing flags on attachment: 262744 Committed r190779: <http://trac.webkit.org/changeset/190779> 1131842 5 commit-queue 2015-10-08 22:53:48 -0700 All reviewed patches have been landed. Closing bug. 1131865 6 ossy 2015-10-09 02:02:26 -0700 (In reply to comment #4) > Comment on attachment 262744 [details] > Patch > > Clearing flags on attachment: 262744 > > Committed r190779: <http://trac.webkit.org/changeset/190779> It broke 6 webkitpy tests, see bug149949 for details. 262740 2015-10-08 21:19:52 -0700 2015-10-08 21:55:10 -0700 Patch bug-149944-20151008211920.patch text/plain 8914 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTkwNzc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmYxMzBkNDkyM2M0NmU1MmFlNGEzODkwOGU1M2JjZTlj ZTM3OGU1NS4uMDBhMmM2YTNkNjFhYTlhMmY5OThmOWZhNWE2MjJjODlhNzQwZWM2NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDE1LTEwLTA4ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIEV4dGVuZCBydW4tYmVuY2htYXJrIHNjcmlwdCB0byBzdXBwb3J0IGh1bWFuLXJlYWRhYmxl IHJlc3VsdHMgY29udmVyc2lvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE0OTk0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCAnLS1mb3JtYXQtcmVzdWx0JyBhbmQgJy0tcmF3JyBvcHRpb25zLgor ICAgICAgICAnLS1mb3JtYXQtcmVzdWx0JyBvcHRpb24gY29udmVydHMgcmVzdWx0IGZpbGUgdG8g aHVtYW4gcmVhZGFibGUgZm9ybWF0LgorICAgICAgICAnLS1yYXcnIG9wdGlvbiBza2lwcyBzY2ll bnRpZmljIG5vdGF0aW9uIGNvbnZlcnRpb24uCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3Jlc3VsdHMucHk6CisgICAgICAgIChCZW5jaG1h cmtSZXN1bHRzLmZvcm1hdCk6CisgICAgICAgIChCZW5jaG1hcmtSZXN1bHRzLl9mb3JtYXRfdGVz dHMpOgorICAgICAgICAoQmVuY2htYXJrUmVzdWx0cy5fZm9ybWF0X3ZhbHVlcyk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19ydW5uZXIucHk6 CisgICAgICAgIChCZW5jaG1hcmtSdW5uZXIuX19pbml0X18pOgorICAgICAgICAoQmVuY2htYXJr UnVubmVyLl9ydW5fYmVuY2htYXJrKToKKyAgICAgICAgKEJlbmNobWFya1J1bm5lci5fZHVtcCk6 CisgICAgICAgIChCZW5jaG1hcmtSdW5uZXIuc2hvd19yZXN1bHRzKToKKyAgICAgICAgKEJlbmNo bWFya1J1bm5lci5fc2hvd19yZXN1bHRzKTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2JlbmNobWFya19ydW5uZXIvcnVuX2JlbmNobWFyay5weToKKyAgICAgICAgKHBhcnNl X2FyZ3MpOgorICAgICAgICAoc3RhcnQpOgorCiAyMDE1LTEwLTA4ICBEYW5pZWwgQmF0ZXMgIDxk YWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBUZWFjaCBidWlsZC13ZWJraXQgdG8gaW5zdGFs bCBMTFZNIGJpbmFyaWVzIGZvciBpT1Mgd2hlbiBidWlsZGluZyBmb3IgZGV2aWNlIHdpdGggdGhl IHB1YmxpYyBpT1MgU0RLCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNo bWFya19ydW5uZXIvYmVuY2htYXJrX3Jlc3VsdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3Jlc3VsdHMucHkKaW5kZXggOWYzNTAzNDNhZjM1 MDkzN2M5MWNkYTU5OGFiZTE3NmI5MmM1ZGRlMS4uMjQ0YjZlMDdiZGJmOTFiOTJlZDEyMDU2ZDEz ZGY4ZTE2NDIxMzhlNyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1h cmtfcnVubmVyL2JlbmNobWFya19yZXN1bHRzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcmVzdWx0cy5weQpAQCAtNDgsMTEgKzQ4LDEx IEBAIGNsYXNzIEJlbmNobWFya1Jlc3VsdHMob2JqZWN0KToKICAgICAgICAgc2VsZi5fbGludF9y ZXN1bHRzKHJlc3VsdHMpCiAgICAgICAgIHNlbGYuX3Jlc3VsdHMgPSBzZWxmLl9hZ2dyZWdhdGVf cmVzdWx0cyhyZXN1bHRzKQogCi0gICAgZGVmIGZvcm1hdChzZWxmKToKLSAgICAgICAgcmV0dXJu IHNlbGYuX2Zvcm1hdF90ZXN0cyhzZWxmLl9yZXN1bHRzKQorICAgIGRlZiBmb3JtYXQoc2VsZiwg cmF3KToKKyAgICAgICAgcmV0dXJuIHNlbGYuX2Zvcm1hdF90ZXN0cyhzZWxmLl9yZXN1bHRzLCBy YXcpCiAKICAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgX2Zvcm1hdF90ZXN0cyhzZWxmLCB0ZXN0 cywgaW5kZW50PScnKToKKyAgICBkZWYgX2Zvcm1hdF90ZXN0cyhjbHMsIHRlc3RzLCByYXcsIGlu ZGVudD0nJyk6CiAgICAgICAgIG91dHB1dCA9ICcnCiAgICAgICAgIGNvbmZpZ19uYW1lID0gJ2N1 cnJlbnQnCiAgICAgICAgIGZvciB0ZXN0X25hbWUgaW4gc29ydGVkKHRlc3RzLmtleXMoKSk6CkBA IC03MSwxMyArNzEsMTMgQEAgY2xhc3MgQmVuY2htYXJrUmVzdWx0cyhvYmplY3QpOgogICAgICAg ICAgICAgICAgICAgICBvdXRwdXQgKz0gJzonICsgbWV0cmljX25hbWUgKyAnOicKICAgICAgICAg ICAgICAgICAgICAgaWYgYWdncmVnYXRvcl9uYW1lOgogICAgICAgICAgICAgICAgICAgICAgICAg b3V0cHV0ICs9IGFnZ3JlZ2F0b3JfbmFtZSArICc6JwotICAgICAgICAgICAgICAgICAgICBvdXRw dXQgKz0gJyAnICsgc2VsZi5fZm9ybWF0X3ZhbHVlcyhtZXRyaWNfbmFtZSwgbWV0cmljW2FnZ3Jl Z2F0b3JfbmFtZV1bY29uZmlnX25hbWVdKSArICdcbicKKyAgICAgICAgICAgICAgICAgICAgb3V0 cHV0ICs9ICcgJyArIGNscy5fZm9ybWF0X3ZhbHVlcyhtZXRyaWNfbmFtZSwgbWV0cmljW2FnZ3Jl Z2F0b3JfbmFtZV1bY29uZmlnX25hbWVdLCByYXcpICsgJ1xuJwogICAgICAgICAgICAgaWYgJ3Rl c3RzJyBpbiB0ZXN0OgotICAgICAgICAgICAgICAgIG91dHB1dCArPSBzZWxmLl9mb3JtYXRfdGVz dHModGVzdFsndGVzdHMnXSwgaW5kZW50PShpbmRlbnQgKyAnICcgKiBsZW4odGVzdF9uYW1lKSkp CisgICAgICAgICAgICAgICAgb3V0cHV0ICs9IGNscy5fZm9ybWF0X3Rlc3RzKHRlc3RbJ3Rlc3Rz J10sIHJhdywgaW5kZW50PShpbmRlbnQgKyAnICcgKiBsZW4odGVzdF9uYW1lKSkpCiAgICAgICAg IHJldHVybiBvdXRwdXQKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBfZm9ybWF0X3ZhbHVl cyhjbHMsIG1ldHJpY19uYW1lLCB2YWx1ZXMpOgorICAgIGRlZiBfZm9ybWF0X3ZhbHVlcyhjbHMs IG1ldHJpY19uYW1lLCB2YWx1ZXMsIHJhdyk6CiAgICAgICAgIHZhbHVlcyA9IG1hcChmbG9hdCwg dmFsdWVzKQogICAgICAgICB0b3RhbCA9IHN1bSh2YWx1ZXMpCiAgICAgICAgIG1lYW4gPSB0b3Rh bCAvIGxlbih2YWx1ZXMpCkBAIC05Myw2ICs5MywxMCBAQCBjbGFzcyBCZW5jaG1hcmtSZXN1bHRz KG9iamVjdCk6CiAKICAgICAgICAgdW5pdCA9IGNscy5fdW5pdF9mcm9tX21ldHJpYyhtZXRyaWNf bmFtZSkKIAorICAgICAgICBpZiByYXc6CisgICAgICAgICAgICByZXR1cm4gKCd7bWVhbjouM2Z9 e3VuaXR9IHN0ZGV2PXtkZWx0YTouMSV9JykuZm9ybWF0KAorICAgICAgICAgICAgICAgIG1lYW49 bWVhbiwgZGVsdGE9c2FtcGxlX3N0ZGV2IC8gbWVhbiwgdW5pdD11bml0KQorCiAgICAgICAgIGlm IHVuaXQgPT0gJ21zJzoKICAgICAgICAgICAgIHVuaXQgPSAncycKICAgICAgICAgICAgIG1lYW4g PSBmbG9hdChtZWFuKSAvIDEwMDAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv YmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19ydW5uZXIucHkKaW5kZXggMjZmODgzZDY5 ZmI4OTFjYmUzZGMwNTEzM2RhMDMzZjYxMGY2ZTA4My4uNWU2NWY3ZWExNjYxMDgxZjAxNDM0OTEy YWYzYmFkMDlkOTk5Mzg5NiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5j aG1hcmtfcnVubmVyL2JlbmNobWFya19ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19ydW5uZXIucHkKQEAgLTI0LDcgKzI0LDcg QEAgX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCiBjbGFzcyBCZW5jaG1hcmtS dW5uZXIob2JqZWN0KToKIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGFuX2ZpbGUsIGxvY2Fs X2NvcHksIGNvdW50X292ZXJyaWRlLCBidWlsZF9kaXIsIG91dHB1dF9maWxlLCBwbGF0Zm9ybSwg YnJvd3NlciwgZGV2aWNlX2lkPU5vbmUpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGFuX2Zp bGUsIGxvY2FsX2NvcHksIGNvdW50X292ZXJyaWRlLCBidWlsZF9kaXIsIG91dHB1dF9maWxlLCBw bGF0Zm9ybSwgYnJvd3NlciwgcmF3PUZhbHNlLCBkZXZpY2VfaWQ9Tm9uZSk6CiAgICAgICAgIHRy eToKICAgICAgICAgICAgIHBsYW5fZmlsZSA9IHNlbGYuX2ZpbmRfcGxhbl9maWxlKHBsYW5fZmls ZSkKICAgICAgICAgICAgIHdpdGggb3BlbihwbGFuX2ZpbGUsICdyJykgYXMgZnA6CkBAIC0zOSw2 ICszOSw3IEBAIGNsYXNzIEJlbmNobWFya1J1bm5lcihvYmplY3QpOgogICAgICAgICAgICAgICAg IHNlbGYuX2h0dHBfc2VydmVyX2RyaXZlci5zZXRfZGV2aWNlX2lkKGRldmljZV9pZCkKICAgICAg ICAgICAgICAgICBzZWxmLl9idWlsZF9kaXIgPSBvcy5wYXRoLmFic3BhdGgoYnVpbGRfZGlyKSBp ZiBidWlsZF9kaXIgZWxzZSBOb25lCiAgICAgICAgICAgICAgICAgc2VsZi5fb3V0cHV0X2ZpbGUg PSBvdXRwdXRfZmlsZQorICAgICAgICAgICAgICAgIHNlbGYuX3JhdyA9IHJhdwogICAgICAgICAg ICAgICAgIHNlbGYuX2RldmljZV9pZCA9IGRldmljZV9pZAogICAgICAgICBleGNlcHQgSU9FcnJv ciBhcyBlcnJvcjoKICAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0NhbiBub3Qgb3BlbiBwbGFuIGZp bGU6IHtwbGFuX2ZpbGV9IC0gRXJyb3Ige2Vycm9yfScuZm9ybWF0KHBsYW5fZmlsZT1wbGFuX2Zp bGUsIGVycm9yPWVycm9yKSkKQEAgLTgwLDcgKzgxLDcgQEAgY2xhc3MgQmVuY2htYXJrUnVubmVy KG9iamVjdCk6CiAgICAgICAgICAgICBfbG9nLmluZm8oJ0VuZCBvZiB7Y3VycmVudF9pdGVyYXRp b259IGl0ZXJhdGlvbiBvZiBjdXJyZW50IGJlbmNobWFyaycuZm9ybWF0KGN1cnJlbnRfaXRlcmF0 aW9uPWl0ZXJhdGlvbikpCiAgICAgICAgIHJlc3VsdHMgPSBzZWxmLl93cmFwKHJlc3VsdHMpCiAg ICAgICAgIHNlbGYuX2R1bXAocmVzdWx0cywgc2VsZi5fb3V0cHV0X2ZpbGUgaWYgc2VsZi5fb3V0 cHV0X2ZpbGUgZWxzZSBzZWxmLl9wbGFuWydvdXRwdXRfZmlsZSddKQotICAgICAgICBzZWxmLl9z aG93X3Jlc3VsdHMocmVzdWx0cykKKyAgICAgICAgc2VsZi5zaG93X3Jlc3VsdHMocmVzdWx0cywg c2VsZi5fcmF3KQogCiAgICAgZGVmIGV4ZWN1dGUoc2VsZik6CiAgICAgICAgIHdpdGggQmVuY2ht YXJrQnVpbGRlcihzZWxmLl9wbGFuX25hbWUsIHNlbGYuX3BsYW4pIGFzIHdlYl9yb290OgpAQCAt OTQsNyArOTUsNyBAQCBjbGFzcyBCZW5jaG1hcmtSdW5uZXIob2JqZWN0KToKICAgICAgICAgICAg ICAgICBqc29uLmR1bXAocmVzdWx0cywgZnApCiAgICAgICAgIGV4Y2VwdCBJT0Vycm9yIGFzIGVy cm9yOgogICAgICAgICAgICAgX2xvZy5lcnJvcignQ2Fubm90IG9wZW4gb3V0cHV0IGZpbGU6IHtv dXRwdXRfZmlsZX0gLSBFcnJvcjoge2Vycm9yfScuZm9ybWF0KG91dHB1dF9maWxlPW91dHB1dF9m aWxlLCBlcnJvcj1lcnJvcikpCi0gICAgICAgICAgICBfbG9nLmVycm9yKCdSZXN1bHRzIGFyZTpc biB7cmVzdWx0fScuZm9ybWF0KGpzb24uZHVtcHMocmVzdWx0cykpKQorICAgICAgICAgICAgX2xv Zy5lcnJvcignUmVzdWx0cyBhcmU6XG4ge3Jlc3VsdH0nLmZvcm1hdChyZXN1bHQ9anNvbi5kdW1w cyhyZXN1bHRzKSkpCiAKICAgICBAY2xhc3NtZXRob2QKICAgICBkZWYgX3dyYXAoY2xzLCBkaWN0 cyk6CkBAIC0xMjksNiArMTMwLDYgQEAgY2xhc3MgQmVuY2htYXJrUnVubmVyKG9iamVjdCk6CiAg ICAgICAgIHJldHVybiBhICsgYgogCiAgICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIF9zaG93X3Jl c3VsdHMoY2xzLCByZXN1bHRzKToKKyAgICBkZWYgc2hvd19yZXN1bHRzKGNscywgcmVzdWx0cywg cmF3PUZhbHNlKToKICAgICAgICAgcmVzdWx0cyA9IEJlbmNobWFya1Jlc3VsdHMocmVzdWx0cykK LSAgICAgICAgcHJpbnQgcmVzdWx0cy5mb3JtYXQoKQorICAgICAgICBwcmludCByZXN1bHRzLmZv cm1hdChyYXcpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19y dW5uZXIvcnVuX2JlbmNobWFyay5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJr X3J1bm5lci9ydW5fYmVuY2htYXJrLnB5CmluZGV4IDBkNWRhNWJlZWFkODcxYjdkM2RiMWEyZjQ3 NWMzODMyNzBkMGQ4ZjUuLmUwMTczNTEwZWU4OWFjZDQxMTEwYmQ3MGY1N2NkY2ZjMDU4OWVhNWMg MTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9ydW5f YmVuY2htYXJrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5l ci9ydW5fYmVuY2htYXJrLnB5CkBAIC0xLDYgKzEsNyBAQAogIyEvdXNyL2Jpbi9lbnYgcHl0aG9u CiAKIGltcG9ydCBhcmdwYXJzZQoraW1wb3J0IGpzb24KIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQg cGxhdGZvcm0KIGltcG9ydCBvcwpAQCAtMTYsMTQgKzE3LDE3IEBAIGRlZiBwYXJzZV9hcmdzKCk6 CiAgICAgcGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIoZGVzY3JpcHRpb249J0F1dG9t YXRlIHRoZSBicm93c2VyIGJhc2VkIHBlcmZvcm1hbmNlIGJlbmNobWFya3MnKQogICAgIHBhcnNl ci5hZGRfYXJndW1lbnQoJy0tb3V0cHV0LWZpbGUnLCBkZXN0PSdvdXRwdXQnLCBkZWZhdWx0PU5v bmUpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1idWlsZC1kaXJlY3RvcnknLCBkZXN0PSdi dWlsZERpcicsIGhlbHA9J1BhdGggdG8gdGhlIGJyb3dzZXIgZXhlY3V0YWJsZS4gZS5nLiBXZWJL aXRCdWlsZC9SZWxlYXNlLycpCi0gICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1wbGFuJywgZGVz dD0ncGxhbicsIHJlcXVpcmVkPVRydWUsIGhlbHA9J0JlbmNobWFyayBwbGFuIHRvIHJ1bi4gZS5n LiBzcGVlZG9tZXRlciwgamV0c3RyZWFtJykKLSAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLXBs YXRmb3JtJywgZGVzdD0ncGxhdGZvcm0nLCByZXF1aXJlZD1UcnVlLCBjaG9pY2VzPUJyb3dzZXJE cml2ZXJGYWN0b3J5LmF2YWlsYWJsZV9wbGF0Zm9ybXMoKSkKKyAgICBwYXJzZXIuYWRkX2FyZ3Vt ZW50KCctLXBsYXRmb3JtJywgZGVzdD0ncGxhdGZvcm0nLCBkZWZhdWx0PSdvc3gnLCBjaG9pY2Vz PUJyb3dzZXJEcml2ZXJGYWN0b3J5LmF2YWlsYWJsZV9wbGF0Zm9ybXMoKSkKICAgICAjIEZJWE1F OiBTaG91bGQgd2UgYWRkIGNocm9tZSBhcyBhbiBvcHRpb24/IFdlbGwsIGNocm9tZSB1c2VzIHdl YmtpdCBpbiBpT1MuCi0gICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1icm93c2VyJywgZGVzdD0n YnJvd3NlcicsIHJlcXVpcmVkPVRydWUsIGNob2ljZXM9QnJvd3NlckRyaXZlckZhY3RvcnkuYXZh aWxhYmxlX2Jyb3dzZXJzKCkpCisgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1icm93c2VyJywg ZGVzdD0nYnJvd3NlcicsIGRlZmF1bHQ9J3NhZmFyaScsIGNob2ljZXM9QnJvd3NlckRyaXZlckZh Y3RvcnkuYXZhaWxhYmxlX2Jyb3dzZXJzKCkpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1k ZWJ1ZycsIGFjdGlvbj0nc3RvcmVfdHJ1ZScpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1s b2NhbC1jb3B5JywgZGVzdD0nbG9jYWxDb3B5JywgaGVscD0nUGF0aCB0byBhIGxvY2FsIGNvcHkg b2YgdGhlIGJlbmNobWFyay4gZS5nLiBQZXJmb3JtYW5jZVRlc3RzL1N1blNwaWRlci8nKQogICAg IHBhcnNlci5hZGRfYXJndW1lbnQoJy0tY291bnQnLCBkZXN0PSdjb3VudE92ZXJyaWRlJywgdHlw ZT1pbnQsIGhlbHA9J051bWJlciBvZiB0aW1lcyB0byBydW4gdGhlIGJlbmNobWFyay4gZS5nLiA1 JykKICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLWRldmljZS1pZCcsIGRlc3Q9J2RldmljZV9p ZCcsIGRlZmF1bHQ9Tm9uZSkKKyAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLXJhdycsIGFjdGlv bj0nc3RvcmVfdHJ1ZScpCisgICAgbXV0dWFsX2dyb3VwID0gcGFyc2VyLmFkZF9tdXR1YWxseV9l eGNsdXNpdmVfZ3JvdXAocmVxdWlyZWQ9VHJ1ZSkKKyAgICBtdXR1YWxfZ3JvdXAuYWRkX2FyZ3Vt ZW50KCctLWZvcm1hdC1yZXN1bHQnLCBkZXN0PSdmb3JtYXRfcmVzdWx0JywgaGVscD0nU3BlY2lm eSBmaWxlIHlvdSB3YW50IHRvIGZvcm1hdCcpCisgICAgbXV0dWFsX2dyb3VwLmFkZF9hcmd1bWVu dCgnLS1wbGFuJywgZGVzdD0ncGxhbicsIGhlbHA9J0JlbmNobWFyayBwbGFuIHRvIHJ1bi4gZS5n LiBzcGVlZG9tZXRlciwgamV0c3RyZWFtJykKIAogICAgIGFyZ3MgPSBwYXJzZXIucGFyc2VfYXJn cygpCiAKQEAgLTM4LDcgKzQyLDEwIEBAIGRlZiBwYXJzZV9hcmdzKCk6CiAKIAogZGVmIHN0YXJ0 KGFyZ3MpOgotICAgIHJ1bm5lciA9IEJlbmNobWFya1J1bm5lcihhcmdzLnBsYW4sIGFyZ3MubG9j YWxDb3B5LCBhcmdzLmNvdW50T3ZlcnJpZGUsIGFyZ3MuYnVpbGREaXIsIGFyZ3Mub3V0cHV0LCBh cmdzLnBsYXRmb3JtLCBhcmdzLmJyb3dzZXIsIGFyZ3MuZGV2aWNlX2lkKQorICAgIGlmIGFyZ3Mu Zm9ybWF0X3Jlc3VsdDoKKyAgICAgICAgQmVuY2htYXJrUnVubmVyLnNob3dfcmVzdWx0cyhqc29u LmxvYWQob3BlbihhcmdzLmZvcm1hdF9yZXN1bHQsICdyJykpLCBhcmdzLnJhdykKKyAgICAgICAg cmV0dXJuCisgICAgcnVubmVyID0gQmVuY2htYXJrUnVubmVyKGFyZ3MucGxhbiwgYXJncy5sb2Nh bENvcHksIGFyZ3MuY291bnRPdmVycmlkZSwgYXJncy5idWlsZERpciwgYXJncy5vdXRwdXQsIGFy Z3MucGxhdGZvcm0sIGFyZ3MuYnJvd3NlciwgYXJncy5yYXcsIGFyZ3MuZGV2aWNlX2lkKQogICAg IHJ1bm5lci5leGVjdXRlKCkKIAogCg== 262744 2015-10-08 21:55:14 -0700 2015-10-08 22:53:45 -0700 Patch bug-149944-20151008215441.patch text/plain 9133 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTkwNzc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmYxMzBkNDkyM2M0NmU1MmFlNGEzODkwOGU1M2JjZTlj ZTM3OGU1NS4uYjVmNWQ5NGVlNmQ4ZjM2MjY0ZDE4ZTI3ZjcwODUxZmRiYTk0NjhlZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDE1LTEwLTA4ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIEV4dGVuZCBydW4tYmVuY2htYXJrIHNjcmlwdCB0byBzdXBwb3J0IGh1bWFuLXJlYWRhYmxl IHJlc3VsdHMgY29udmVyc2lvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE0OTk0NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCAnLS1yZWFkLXJlc3VsdHMtanNvbicgYW5kICctLW5vLWFkanVzdC11 bml0JyBvcHRpb25zLgorICAgICAgICAnLS1yZWFkLXJlc3VsdHMtanNvbicgb3B0aW9uIGNvbnZl cnRzIHJlc3VsdCBmaWxlIHRvIGh1bWFuIHJlYWRhYmxlIGZvcm1hdC4KKyAgICAgICAgJy0tbm8t YWRqdXN0LXVuaXQnIG9wdGlvbiBza2lwcyBzY2llbnRpZmljIG5vdGF0aW9uIGNvbnZlcnRpb24u CisgICAgICAgICctLXBsYXRmb3JtJyBkZWZhdWx0cyB0byAnb3N4JyBhbmQgJy0tYnJvd3Nlcicg ZGVmYXVsdHMgdG8gJ3NhZmFyaScuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNo bWFya19ydW5uZXIvYmVuY2htYXJrX3Jlc3VsdHMucHk6CisgICAgICAgIChCZW5jaG1hcmtSZXN1 bHRzLmZvcm1hdCk6CisgICAgICAgIChCZW5jaG1hcmtSZXN1bHRzLl9mb3JtYXRfdGVzdHMpOgor ICAgICAgICAoQmVuY2htYXJrUmVzdWx0cy5fZm9ybWF0X3ZhbHVlcyk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19ydW5uZXIucHk6CisgICAg ICAgIChCZW5jaG1hcmtSdW5uZXIuX19pbml0X18pOgorICAgICAgICAoQmVuY2htYXJrUnVubmVy Ll9ydW5fYmVuY2htYXJrKToKKyAgICAgICAgKEJlbmNobWFya1J1bm5lci5fZHVtcCk6CisgICAg ICAgIChCZW5jaG1hcmtSdW5uZXIuc2hvd19yZXN1bHRzKToKKyAgICAgICAgKEJlbmNobWFya1J1 bm5lci5fc2hvd19yZXN1bHRzKTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2JlbmNobWFya19ydW5uZXIvcnVuX2JlbmNobWFyay5weToKKyAgICAgICAgKHBhcnNlX2FyZ3Mp OgorICAgICAgICAoc3RhcnQpOgorCiAyMDE1LTEwLTA4ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVz QGFwcGxlLmNvbT4KIAogICAgICAgICBUZWFjaCBidWlsZC13ZWJraXQgdG8gaW5zdGFsbCBMTFZN IGJpbmFyaWVzIGZvciBpT1Mgd2hlbiBidWlsZGluZyBmb3IgZGV2aWNlIHdpdGggdGhlIHB1Ymxp YyBpT1MgU0RLCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19y dW5uZXIvYmVuY2htYXJrX3Jlc3VsdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNo bWFya19ydW5uZXIvYmVuY2htYXJrX3Jlc3VsdHMucHkKaW5kZXggOWYzNTAzNDNhZjM1MDkzN2M5 MWNkYTU5OGFiZTE3NmI5MmM1ZGRlMS4uYTg2Njc2NzE0NTA2NzhjOTU1Mzg2ZjcxMjkxOTY5ODZk YTk3OWYxMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVu bmVyL2JlbmNobWFya19yZXN1bHRzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVu Y2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcmVzdWx0cy5weQpAQCAtNDgsMTEgKzQ4LDExIEBAIGNs YXNzIEJlbmNobWFya1Jlc3VsdHMob2JqZWN0KToKICAgICAgICAgc2VsZi5fbGludF9yZXN1bHRz KHJlc3VsdHMpCiAgICAgICAgIHNlbGYuX3Jlc3VsdHMgPSBzZWxmLl9hZ2dyZWdhdGVfcmVzdWx0 cyhyZXN1bHRzKQogCi0gICAgZGVmIGZvcm1hdChzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYu X2Zvcm1hdF90ZXN0cyhzZWxmLl9yZXN1bHRzKQorICAgIGRlZiBmb3JtYXQoc2VsZiwgc2NhbGVf dW5pdCk6CisgICAgICAgIHJldHVybiBzZWxmLl9mb3JtYXRfdGVzdHMoc2VsZi5fcmVzdWx0cywg c2NhbGVfdW5pdCkKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBfZm9ybWF0X3Rlc3RzKHNl bGYsIHRlc3RzLCBpbmRlbnQ9JycpOgorICAgIGRlZiBfZm9ybWF0X3Rlc3RzKGNscywgdGVzdHMs IHNjYWxlX3VuaXQsIGluZGVudD0nJyk6CiAgICAgICAgIG91dHB1dCA9ICcnCiAgICAgICAgIGNv bmZpZ19uYW1lID0gJ2N1cnJlbnQnCiAgICAgICAgIGZvciB0ZXN0X25hbWUgaW4gc29ydGVkKHRl c3RzLmtleXMoKSk6CkBAIC03MSwxMyArNzEsMTMgQEAgY2xhc3MgQmVuY2htYXJrUmVzdWx0cyhv YmplY3QpOgogICAgICAgICAgICAgICAgICAgICBvdXRwdXQgKz0gJzonICsgbWV0cmljX25hbWUg KyAnOicKICAgICAgICAgICAgICAgICAgICAgaWYgYWdncmVnYXRvcl9uYW1lOgogICAgICAgICAg ICAgICAgICAgICAgICAgb3V0cHV0ICs9IGFnZ3JlZ2F0b3JfbmFtZSArICc6JwotICAgICAgICAg ICAgICAgICAgICBvdXRwdXQgKz0gJyAnICsgc2VsZi5fZm9ybWF0X3ZhbHVlcyhtZXRyaWNfbmFt ZSwgbWV0cmljW2FnZ3JlZ2F0b3JfbmFtZV1bY29uZmlnX25hbWVdKSArICdcbicKKyAgICAgICAg ICAgICAgICAgICAgb3V0cHV0ICs9ICcgJyArIGNscy5fZm9ybWF0X3ZhbHVlcyhtZXRyaWNfbmFt ZSwgbWV0cmljW2FnZ3JlZ2F0b3JfbmFtZV1bY29uZmlnX25hbWVdLCBzY2FsZV91bml0KSArICdc bicKICAgICAgICAgICAgIGlmICd0ZXN0cycgaW4gdGVzdDoKLSAgICAgICAgICAgICAgICBvdXRw dXQgKz0gc2VsZi5fZm9ybWF0X3Rlc3RzKHRlc3RbJ3Rlc3RzJ10sIGluZGVudD0oaW5kZW50ICsg JyAnICogbGVuKHRlc3RfbmFtZSkpKQorICAgICAgICAgICAgICAgIG91dHB1dCArPSBjbHMuX2Zv cm1hdF90ZXN0cyh0ZXN0Wyd0ZXN0cyddLCBzY2FsZV91bml0LCBpbmRlbnQ9KGluZGVudCArICcg JyAqIGxlbih0ZXN0X25hbWUpKSkKICAgICAgICAgcmV0dXJuIG91dHB1dAogCiAgICAgQGNsYXNz bWV0aG9kCi0gICAgZGVmIF9mb3JtYXRfdmFsdWVzKGNscywgbWV0cmljX25hbWUsIHZhbHVlcyk6 CisgICAgZGVmIF9mb3JtYXRfdmFsdWVzKGNscywgbWV0cmljX25hbWUsIHZhbHVlcywgc2NhbGVf dW5pdCk6CiAgICAgICAgIHZhbHVlcyA9IG1hcChmbG9hdCwgdmFsdWVzKQogICAgICAgICB0b3Rh bCA9IHN1bSh2YWx1ZXMpCiAgICAgICAgIG1lYW4gPSB0b3RhbCAvIGxlbih2YWx1ZXMpCkBAIC05 Myw2ICs5Myw5IEBAIGNsYXNzIEJlbmNobWFya1Jlc3VsdHMob2JqZWN0KToKIAogICAgICAgICB1 bml0ID0gY2xzLl91bml0X2Zyb21fbWV0cmljKG1ldHJpY19uYW1lKQogCisgICAgICAgIGlmIG5v dCBzY2FsZV91bml0OgorICAgICAgICAgICAgcmV0dXJuICgne21lYW46LjNmfXt1bml0fSBzdGRl dj17ZGVsdGE6LjElfScpLmZvcm1hdChtZWFuPW1lYW4sIGRlbHRhPXNhbXBsZV9zdGRldiAvIG1l YW4sIHVuaXQ9dW5pdCkKKwogICAgICAgICBpZiB1bml0ID09ICdtcyc6CiAgICAgICAgICAgICB1 bml0ID0gJ3MnCiAgICAgICAgICAgICBtZWFuID0gZmxvYXQobWVhbikgLyAxMDAwCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1 bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1h cmtfcnVubmVyLnB5CmluZGV4IDI2Zjg4M2Q2OWZiODkxY2JlM2RjMDUxMzNkYTAzM2Y2MTBmNmUw ODMuLjE1ODM0NTNhMTE1NjE1MGY2Y2ZiZDRiMjNhMTM0MjcwMjY3MmNiNzIgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1hcmtfcnVubmVy LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9iZW5jaG1h cmtfcnVubmVyLnB5CkBAIC0yNCw3ICsyNCw3IEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihf X25hbWVfXykKIAogY2xhc3MgQmVuY2htYXJrUnVubmVyKG9iamVjdCk6CiAKLSAgICBkZWYgX19p bml0X18oc2VsZiwgcGxhbl9maWxlLCBsb2NhbF9jb3B5LCBjb3VudF9vdmVycmlkZSwgYnVpbGRf ZGlyLCBvdXRwdXRfZmlsZSwgcGxhdGZvcm0sIGJyb3dzZXIsIGRldmljZV9pZD1Ob25lKToKKyAg ICBkZWYgX19pbml0X18oc2VsZiwgcGxhbl9maWxlLCBsb2NhbF9jb3B5LCBjb3VudF9vdmVycmlk ZSwgYnVpbGRfZGlyLCBvdXRwdXRfZmlsZSwgcGxhdGZvcm0sIGJyb3dzZXIsIHNjYWxlX3VuaXQ9 VHJ1ZSwgZGV2aWNlX2lkPU5vbmUpOgogICAgICAgICB0cnk6CiAgICAgICAgICAgICBwbGFuX2Zp bGUgPSBzZWxmLl9maW5kX3BsYW5fZmlsZShwbGFuX2ZpbGUpCiAgICAgICAgICAgICB3aXRoIG9w ZW4ocGxhbl9maWxlLCAncicpIGFzIGZwOgpAQCAtMzksNiArMzksNyBAQCBjbGFzcyBCZW5jaG1h cmtSdW5uZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICBzZWxmLl9odHRwX3NlcnZlcl9kcml2 ZXIuc2V0X2RldmljZV9pZChkZXZpY2VfaWQpCiAgICAgICAgICAgICAgICAgc2VsZi5fYnVpbGRf ZGlyID0gb3MucGF0aC5hYnNwYXRoKGJ1aWxkX2RpcikgaWYgYnVpbGRfZGlyIGVsc2UgTm9uZQog ICAgICAgICAgICAgICAgIHNlbGYuX291dHB1dF9maWxlID0gb3V0cHV0X2ZpbGUKKyAgICAgICAg ICAgICAgICBzZWxmLl9zY2FsZV91bml0ID0gc2NhbGVfdW5pdAogICAgICAgICAgICAgICAgIHNl bGYuX2RldmljZV9pZCA9IGRldmljZV9pZAogICAgICAgICBleGNlcHQgSU9FcnJvciBhcyBlcnJv cjoKICAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0NhbiBub3Qgb3BlbiBwbGFuIGZpbGU6IHtwbGFu X2ZpbGV9IC0gRXJyb3Ige2Vycm9yfScuZm9ybWF0KHBsYW5fZmlsZT1wbGFuX2ZpbGUsIGVycm9y PWVycm9yKSkKQEAgLTgwLDcgKzgxLDcgQEAgY2xhc3MgQmVuY2htYXJrUnVubmVyKG9iamVjdCk6 CiAgICAgICAgICAgICBfbG9nLmluZm8oJ0VuZCBvZiB7Y3VycmVudF9pdGVyYXRpb259IGl0ZXJh dGlvbiBvZiBjdXJyZW50IGJlbmNobWFyaycuZm9ybWF0KGN1cnJlbnRfaXRlcmF0aW9uPWl0ZXJh dGlvbikpCiAgICAgICAgIHJlc3VsdHMgPSBzZWxmLl93cmFwKHJlc3VsdHMpCiAgICAgICAgIHNl bGYuX2R1bXAocmVzdWx0cywgc2VsZi5fb3V0cHV0X2ZpbGUgaWYgc2VsZi5fb3V0cHV0X2ZpbGUg ZWxzZSBzZWxmLl9wbGFuWydvdXRwdXRfZmlsZSddKQotICAgICAgICBzZWxmLl9zaG93X3Jlc3Vs dHMocmVzdWx0cykKKyAgICAgICAgc2VsZi5zaG93X3Jlc3VsdHMocmVzdWx0cywgc2VsZi5fc2Nh bGVfdW5pdCkKIAogICAgIGRlZiBleGVjdXRlKHNlbGYpOgogICAgICAgICB3aXRoIEJlbmNobWFy a0J1aWxkZXIoc2VsZi5fcGxhbl9uYW1lLCBzZWxmLl9wbGFuKSBhcyB3ZWJfcm9vdDoKQEAgLTk0 LDcgKzk1LDcgQEAgY2xhc3MgQmVuY2htYXJrUnVubmVyKG9iamVjdCk6CiAgICAgICAgICAgICAg ICAganNvbi5kdW1wKHJlc3VsdHMsIGZwKQogICAgICAgICBleGNlcHQgSU9FcnJvciBhcyBlcnJv cjoKICAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0Nhbm5vdCBvcGVuIG91dHB1dCBmaWxlOiB7b3V0 cHV0X2ZpbGV9IC0gRXJyb3I6IHtlcnJvcn0nLmZvcm1hdChvdXRwdXRfZmlsZT1vdXRwdXRfZmls ZSwgZXJyb3I9ZXJyb3IpKQotICAgICAgICAgICAgX2xvZy5lcnJvcignUmVzdWx0cyBhcmU6XG4g e3Jlc3VsdH0nLmZvcm1hdChqc29uLmR1bXBzKHJlc3VsdHMpKSkKKyAgICAgICAgICAgIF9sb2cu ZXJyb3IoJ1Jlc3VsdHMgYXJlOlxuIHtyZXN1bHR9Jy5mb3JtYXQocmVzdWx0PWpzb24uZHVtcHMo cmVzdWx0cykpKQogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIF93cmFwKGNscywgZGljdHMp OgpAQCAtMTI5LDYgKzEzMCw2IEBAIGNsYXNzIEJlbmNobWFya1J1bm5lcihvYmplY3QpOgogICAg ICAgICByZXR1cm4gYSArIGIKIAogICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBfc2hvd19yZXN1 bHRzKGNscywgcmVzdWx0cyk6CisgICAgZGVmIHNob3dfcmVzdWx0cyhjbHMsIHJlc3VsdHMsIHNj YWxlX3VuaXQ9VHJ1ZSk6CiAgICAgICAgIHJlc3VsdHMgPSBCZW5jaG1hcmtSZXN1bHRzKHJlc3Vs dHMpCi0gICAgICAgIHByaW50IHJlc3VsdHMuZm9ybWF0KCkKKyAgICAgICAgcHJpbnQgcmVzdWx0 cy5mb3JtYXQoc2NhbGVfdW5pdCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv YmVuY2htYXJrX3J1bm5lci9ydW5fYmVuY2htYXJrLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9iZW5jaG1hcmtfcnVubmVyL3J1bl9iZW5jaG1hcmsucHkKaW5kZXggMGQ1ZGE1YmVlYWQ4NzFi N2QzZGIxYTJmNDc1YzM4MzI3MGQwZDhmNS4uNjE0NGI5YWJmNzc3ZTMwYmMzNzQyMTMzNzQ2NWQw MDJmYTRkYWI5NiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtf cnVubmVyL3J1bl9iZW5jaG1hcmsucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5j aG1hcmtfcnVubmVyL3J1bl9iZW5jaG1hcmsucHkKQEAgLTEsNiArMSw3IEBACiAjIS91c3IvYmlu L2VudiBweXRob24KIAogaW1wb3J0IGFyZ3BhcnNlCitpbXBvcnQganNvbgogaW1wb3J0IGxvZ2dp bmcKIGltcG9ydCBwbGF0Zm9ybQogaW1wb3J0IG9zCkBAIC0xNiwxNCArMTcsMTcgQEAgZGVmIHBh cnNlX2FyZ3MoKToKICAgICBwYXJzZXIgPSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNlcihkZXNjcmlw dGlvbj0nQXV0b21hdGUgdGhlIGJyb3dzZXIgYmFzZWQgcGVyZm9ybWFuY2UgYmVuY2htYXJrcycp CiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1vdXRwdXQtZmlsZScsIGRlc3Q9J291dHB1dCcs IGRlZmF1bHQ9Tm9uZSkKICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLWJ1aWxkLWRpcmVjdG9y eScsIGRlc3Q9J2J1aWxkRGlyJywgaGVscD0nUGF0aCB0byB0aGUgYnJvd3NlciBleGVjdXRhYmxl LiBlLmcuIFdlYktpdEJ1aWxkL1JlbGVhc2UvJykKLSAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCct LXBsYW4nLCBkZXN0PSdwbGFuJywgcmVxdWlyZWQ9VHJ1ZSwgaGVscD0nQmVuY2htYXJrIHBsYW4g dG8gcnVuLiBlLmcuIHNwZWVkb21ldGVyLCBqZXRzdHJlYW0nKQotICAgIHBhcnNlci5hZGRfYXJn dW1lbnQoJy0tcGxhdGZvcm0nLCBkZXN0PSdwbGF0Zm9ybScsIHJlcXVpcmVkPVRydWUsIGNob2lj ZXM9QnJvd3NlckRyaXZlckZhY3RvcnkuYXZhaWxhYmxlX3BsYXRmb3JtcygpKQorICAgIHBhcnNl ci5hZGRfYXJndW1lbnQoJy0tcGxhdGZvcm0nLCBkZXN0PSdwbGF0Zm9ybScsIGRlZmF1bHQ9J29z eCcsIGNob2ljZXM9QnJvd3NlckRyaXZlckZhY3RvcnkuYXZhaWxhYmxlX3BsYXRmb3JtcygpKQog ICAgICMgRklYTUU6IFNob3VsZCB3ZSBhZGQgY2hyb21lIGFzIGFuIG9wdGlvbj8gV2VsbCwgY2hy b21lIHVzZXMgd2Via2l0IGluIGlPUy4KLSAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLWJyb3dz ZXInLCBkZXN0PSdicm93c2VyJywgcmVxdWlyZWQ9VHJ1ZSwgY2hvaWNlcz1Ccm93c2VyRHJpdmVy RmFjdG9yeS5hdmFpbGFibGVfYnJvd3NlcnMoKSkKKyAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCct LWJyb3dzZXInLCBkZXN0PSdicm93c2VyJywgZGVmYXVsdD0nc2FmYXJpJywgY2hvaWNlcz1Ccm93 c2VyRHJpdmVyRmFjdG9yeS5hdmFpbGFibGVfYnJvd3NlcnMoKSkKICAgICBwYXJzZXIuYWRkX2Fy Z3VtZW50KCctLWRlYnVnJywgYWN0aW9uPSdzdG9yZV90cnVlJykKICAgICBwYXJzZXIuYWRkX2Fy Z3VtZW50KCctLWxvY2FsLWNvcHknLCBkZXN0PSdsb2NhbENvcHknLCBoZWxwPSdQYXRoIHRvIGEg bG9jYWwgY29weSBvZiB0aGUgYmVuY2htYXJrLiBlLmcuIFBlcmZvcm1hbmNlVGVzdHMvU3VuU3Bp ZGVyLycpCiAgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1jb3VudCcsIGRlc3Q9J2NvdW50T3Zl cnJpZGUnLCB0eXBlPWludCwgaGVscD0nTnVtYmVyIG9mIHRpbWVzIHRvIHJ1biB0aGUgYmVuY2ht YXJrLiBlLmcuIDUnKQogICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy0tZGV2aWNlLWlkJywgZGVz dD0nZGV2aWNlX2lkJywgZGVmYXVsdD1Ob25lKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJy0t bm8tYWRqdXN0LXVuaXQnLCBkZXN0PSdzY2FsZV91bml0JywgYWN0aW9uPSdzdG9yZV9mYWxzZScp CisgICAgbXV0dWFsX2dyb3VwID0gcGFyc2VyLmFkZF9tdXR1YWxseV9leGNsdXNpdmVfZ3JvdXAo cmVxdWlyZWQ9VHJ1ZSkKKyAgICBtdXR1YWxfZ3JvdXAuYWRkX2FyZ3VtZW50KCctLXJlYWQtcmVz dWx0cy1qc29uJywgZGVzdD0nanNvbl9maWxlJywgaGVscD0nU3BlY2lmeSBmaWxlIHlvdSB3YW50 IHRvIGZvcm1hdCcpCisgICAgbXV0dWFsX2dyb3VwLmFkZF9hcmd1bWVudCgnLS1wbGFuJywgZGVz dD0ncGxhbicsIGhlbHA9J0JlbmNobWFyayBwbGFuIHRvIHJ1bi4gZS5nLiBzcGVlZG9tZXRlciwg amV0c3RyZWFtJykKIAogICAgIGFyZ3MgPSBwYXJzZXIucGFyc2VfYXJncygpCiAKQEAgLTM4LDcg KzQyLDEwIEBAIGRlZiBwYXJzZV9hcmdzKCk6CiAKIAogZGVmIHN0YXJ0KGFyZ3MpOgotICAgIHJ1 bm5lciA9IEJlbmNobWFya1J1bm5lcihhcmdzLnBsYW4sIGFyZ3MubG9jYWxDb3B5LCBhcmdzLmNv dW50T3ZlcnJpZGUsIGFyZ3MuYnVpbGREaXIsIGFyZ3Mub3V0cHV0LCBhcmdzLnBsYXRmb3JtLCBh cmdzLmJyb3dzZXIsIGFyZ3MuZGV2aWNlX2lkKQorICAgIGlmIGFyZ3MuanNvbl9maWxlOgorICAg ICAgICBCZW5jaG1hcmtSdW5uZXIuc2hvd19yZXN1bHRzKGpzb24ubG9hZChvcGVuKGFyZ3MuanNv bl9maWxlLCAncicpKSwgYXJncy5zY2FsZV91bml0KQorICAgICAgICByZXR1cm4KKyAgICBydW5u ZXIgPSBCZW5jaG1hcmtSdW5uZXIoYXJncy5wbGFuLCBhcmdzLmxvY2FsQ29weSwgYXJncy5jb3Vu dE92ZXJyaWRlLCBhcmdzLmJ1aWxkRGlyLCBhcmdzLm91dHB1dCwgYXJncy5wbGF0Zm9ybSwgYXJn cy5icm93c2VyLCBhcmdzLnNjYWxlX3VuaXQsIGFyZ3MuZGV2aWNlX2lkKQogICAgIHJ1bm5lci5l eGVjdXRlKCkKIAogCg==