53063 2011-01-24 21:55:28 -0800 [NRWT] Remove TestArgs class 2011-02-03 22:26:53 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 53004 51091 53071 1 hayato webkit-unassigned dpranke eric mihaip ojan tony oldest_to_newest 339484 0 hayato 2011-01-24 21:55:28 -0800 It seems we can get rid of TestArgs class in new-run-webkit-tests. TestArgs class is defined in webkitpy/layout_tests/test_types/test_type_base.py. TestArgs has fields of new_baseline, png_path, hash and wdiff, but only a new_baseline (and reset_results, which is wrongly assigned) field is used in actual code. That class is used only in test_type::compare_output() as a parameter, but there TestArgs parameter can be replaced with 'options'. 339488 1 80019 hayato 2011-01-24 21:58:49 -0800 Created attachment 80019 remove-testargs 339510 2 dpranke 2011-01-24 23:22:49 -0800 Yup, looks good to me (but I'm not a reviewer). 339511 3 dpranke 2011-01-24 23:23:20 -0800 adding more people who are reviewers ... 339522 4 80019 ojan 2011-01-25 00:09:29 -0800 Comment on attachment 80019 remove-testargs I fully support deleting code. 339529 5 hayato 2011-01-25 00:23:05 -0800 This patch (A) depends on other patch (B), https://bugs.webkit.org/show_bug.cgi?id=53004, which is under the review. There is no strong relation between (A) and (B), but we should wait for patch (B) to apply this patch (A). I'll set review flag and update this bugzilla entry once patch (B) is landed. 345352 6 81188 hayato 2011-02-03 22:09:38 -0800 Created attachment 81188 remove-testargs--review-ready 345353 7 hayato 2011-02-03 22:10:26 -0800 The patch is now ready to be reviewed. 345358 8 81188 eric 2011-02-03 22:20:54 -0800 Comment on attachment 81188 remove-testargs--review-ready OK. 345361 9 hayato 2011-02-03 22:26:53 -0800 Committed r77606: <http://trac.webkit.org/changeset/77606> 80019 2011-01-24 21:58:49 -0800 2011-02-03 22:09:33 -0800 remove-testargs bug-53063-20110125145846.patch text/plain 13651 hayato ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3OTIz MmUzNTI5YWI1NWI5OWI2M2RjNTFjNThlM2EyMDc0ZmJlYzEwLi4zNzdjNmJkYWE3ZWUyZTQ2YTdk MGYzNmY4YThkYTQ4ZmUzYjliYjFiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjEgQEAKIAogICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBbTlJXVF0gUmVtb3ZlIFRlc3RBcmdzIGNsYXNzLCB3 aGljaCBpcyB3cm9uZ2x5IHVzZWQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTUzMDYzCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9kdW1wX3JlbmRlcl90cmVlX3RocmVhZC5weToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5nbGVf dGVzdF9ydW5uZXIucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv dGVzdF90eXBlcy9pbWFnZV9kaWZmLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvdGVzdF90eXBlX2Jhc2UucHk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy90ZXN0X3R5cGVfYmFzZV91bml0dGVz dC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVz L3RleHRfZGlmZi5weToKKworMjAxMS0wMS0yNCAgSGF5YXRvIEl0byAgPGhheWF0b0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKICAgICAgICAg W05SV1RdIEludHJvZHVjZXMgSW5wdXQvT3V0cHV0IGNsYXNzIHVzZWQgYnkgYmFzZS5Ecml2ZXIg aW50byBwb3J0L2Jhc2UucHkgYW5kCiAgICAgICAgIG1vdmUgX3J1bl9zaW5nbGVfdGVzdCgpIGFu ZCBfcHJvY2Vzc19vdXRwdXQoKSBmdW5jdGlvbnMgZnJvbQogICAgICAgICBkdW1wX3JlbmRlcl90 cmVlX3RocmVhZC5weSB0byBhIHNpbmdsZV90ZXN0X3J1bm5lci5weSBhcyBhbiBpbmRpdmlkdWFs IG1vZHVsZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvZHVtcF9yZW5kZXJfdHJlZV90 aHJlYWQucHkKaW5kZXggMzQwYmNlMWFjM2QzMjMxMjhhNmJmYmJlOTVkNzg2MTQzMWRiODRhOC4u MWQxYWI5NzE2OWE3MWM4M2FlNWNjNDU4Y2UzOTVmNTBiN2M2OTczNiAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvZHVtcF9yZW5k ZXJfdHJlZV90aHJlYWQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbGF5b3V0X3BhY2thZ2UvZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQucHkKQEAgLTgyLDcgKzgy LDcgQEAgY2xhc3MgU2luZ2xlVGVzdFRocmVhZCh0aHJlYWRpbmcuVGhyZWFkKToKICAgICAiIiJU aHJlYWQgd3JhcHBlciBmb3IgcnVubmluZyBhIHNpbmdsZSB0ZXN0IGZpbGUuIiIiCiAKICAgICBk ZWYgX19pbml0X18oc2VsZiwgcG9ydCwgb3B0aW9ucywgd29ya2VyX251bWJlciwgd29ya2VyX25h bWUsCi0gICAgICAgICAgICAgICAgIHRlc3RfaW5wdXQsIHRlc3RfdHlwZXMsIHRlc3RfYXJncyk6 CisgICAgICAgICAgICAgICAgIHRlc3RfaW5wdXQsIHRlc3RfdHlwZXMpOgogICAgICAgICAiIiIK ICAgICAgICAgQXJnczoKICAgICAgICAgICBwb3J0OiBvYmplY3QgaW1wbGVtZW50aW5nIHBvcnQt c3BlY2lmaWMgaG9va3MKQEAgLTkyLDcgKzkyLDYgQEAgY2xhc3MgU2luZ2xlVGVzdFRocmVhZCh0 aHJlYWRpbmcuVGhyZWFkKToKICAgICAgICAgICB0ZXN0X2lucHV0OiBPYmplY3QgY29udGFpbmlu ZyB0aGUgdGVzdCBmaWxlbmFtZSBhbmQgdGltZW91dAogICAgICAgICAgIHRlc3RfdHlwZXM6IEEg bGlzdCBvZiBUZXN0VHlwZSBvYmplY3RzIHRvIHJ1biB0aGUgdGVzdCBvdXRwdXQKICAgICAgICAg ICAgICAgYWdhaW5zdC4KLSAgICAgICAgICB0ZXN0X2FyZ3M6IEEgVGVzdEFyZ3VtZW50cyBvYmpl Y3QgdG8gcGFzcyB0byBlYWNoIFRlc3RUeXBlLgogICAgICAgICAiIiIKIAogICAgICAgICB0aHJl YWRpbmcuVGhyZWFkLl9faW5pdF9fKHNlbGYpCkBAIC0xMDAsNyArOTksNiBAQCBjbGFzcyBTaW5n bGVUZXN0VGhyZWFkKHRocmVhZGluZy5UaHJlYWQpOgogICAgICAgICBzZWxmLl9vcHRpb25zID0g b3B0aW9ucwogICAgICAgICBzZWxmLl90ZXN0X2lucHV0ID0gdGVzdF9pbnB1dAogICAgICAgICBz ZWxmLl90ZXN0X3R5cGVzID0gdGVzdF90eXBlcwotICAgICAgICBzZWxmLl90ZXN0X2FyZ3MgPSB0 ZXN0X2FyZ3MKICAgICAgICAgc2VsZi5fZHJpdmVyID0gTm9uZQogICAgICAgICBzZWxmLl93b3Jr ZXJfbnVtYmVyID0gd29ya2VyX251bWJlcgogICAgICAgICBzZWxmLl9uYW1lID0gd29ya2VyX25h bWUKQEAgLTExNSw3ICsxMTMsNyBAQCBjbGFzcyBTaW5nbGVUZXN0VGhyZWFkKHRocmVhZGluZy5U aHJlYWQpOgogICAgICAgICBzZWxmLl9kcml2ZXIuc3RhcnQoKQogICAgICAgICBzZWxmLl90ZXN0 X3Jlc3VsdCA9IHNpbmdsZV90ZXN0X3J1bm5lci5ydW5fc2luZ2xlX3Rlc3QoCiAgICAgICAgICAg ICBzZWxmLl9wb3J0LCBzZWxmLl9vcHRpb25zLCBzZWxmLl90ZXN0X2lucHV0LCBzZWxmLl9kcml2 ZXIsCi0gICAgICAgICAgICBzZWxmLl9uYW1lLCBzZWxmLl90ZXN0X3R5cGVzLCBzZWxmLl90ZXN0 X2FyZ3MpCisgICAgICAgICAgICBzZWxmLl9uYW1lLCBzZWxmLl90ZXN0X3R5cGUpCiAgICAgICAg IHNlbGYuX2RyaXZlci5zdG9wKCkKIAogICAgIGRlZiBnZXRfdGVzdF9yZXN1bHQoc2VsZik6CkBA IC0xOTQsNyArMTkyLDYgQEAgY2xhc3MgVGVzdFNoZWxsVGhyZWFkKFdhdGNoYWJsZVRocmVhZCk6 CiAgICAgICAgIGZvciBjbHMgaW4gc2VsZi5fZ2V0X3Rlc3RfdHlwZV9jbGFzc2VzKCk6CiAgICAg ICAgICAgICBzZWxmLl90ZXN0X3R5cGVzLmFwcGVuZChjbHMoc2VsZi5fcG9ydCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9vcHRpb25zLnJlc3VsdHNfZGly ZWN0b3J5KSkKLSAgICAgICAgc2VsZi5fdGVzdF9hcmdzID0gc2VsZi5fZ2V0X3Rlc3RfYXJncyh3 b3JrZXJfbnVtYmVyKQogCiAgICAgICAgICMgQ3VycmVudCBncm91cCBvZiB0ZXN0cyB3ZSdyZSBy dW5uaW5nLgogICAgICAgICBzZWxmLl9jdXJyZW50X2dyb3VwID0gTm9uZQpAQCAtMjAzLDE0ICsy MDAsNiBAQCBjbGFzcyBUZXN0U2hlbGxUaHJlYWQoV2F0Y2hhYmxlVGhyZWFkKToKICAgICAgICAg IyBUaW1lIGF0IHdoaWNoIHdlIHN0YXJ0ZWQgcnVubmluZyB0ZXN0cyBmcm9tIHNlbGYuX2N1cnJl bnRfZ3JvdXAuCiAgICAgICAgIHNlbGYuX2N1cnJlbnRfZ3JvdXBfc3RhcnRfdGltZSA9IE5vbmUK IAotICAgIGRlZiBfZ2V0X3Rlc3RfYXJncyhzZWxmLCB3b3JrZXJfbnVtYmVyKToKLSAgICAgICAg IiIiUmV0dXJucyB0aGUgdHVwbGUgb2YgYXJndW1lbnRzIGZvciB0ZXN0cyBhbmQgZm9yIER1bXBS ZW5kZXJUcmVlLiIiIgotICAgICAgICB0ZXN0X2FyZ3MgPSB0ZXN0X3R5cGVfYmFzZS5UZXN0QXJn dW1lbnRzKCkKLSAgICAgICAgdGVzdF9hcmdzLm5ld19iYXNlbGluZSA9IHNlbGYuX29wdGlvbnMu bmV3X2Jhc2VsaW5lCi0gICAgICAgIHRlc3RfYXJncy5yZXNldF9yZXN1bHRzID0gc2VsZi5fb3B0 aW9ucy5yZXNldF9yZXN1bHRzCi0KLSAgICAgICAgcmV0dXJuIHRlc3RfYXJncwotCiAgICAgZGVm IF9nZXRfdGVzdF90eXBlX2NsYXNzZXMoc2VsZik6CiAgICAgICAgIGNsYXNzZXMgPSBbdGV4dF9k aWZmLlRlc3RUZXh0RGlmZl0KICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5waXhlbF90ZXN0czoK QEAgLTM4OSw4ICszNzgsNyBAQCBjbGFzcyBUZXN0U2hlbGxUaHJlYWQoV2F0Y2hhYmxlVGhyZWFk KToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl93b3JrZXJfbnVtYmVy LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX25hbWUsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdGVzdF9pbnB1dCwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzZWxmLl90ZXN0X3R5cGVzLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNlbGYuX3Rlc3RfYXJncykKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBzZWxmLl90ZXN0X3R5cGVzKQogCiAgICAgICAgIHdvcmtlci5zdGFydCgpCiAKQEAg LTQzNSw3ICs0MjMsNyBAQCBjbGFzcyBUZXN0U2hlbGxUaHJlYWQoV2F0Y2hhYmxlVGhyZWFkKToK ICAgICAgICAgc2VsZi5fbmV4dF90aW1lb3V0ID0gdGltZS50aW1lKCkgKyB0aHJlYWRfdGltZW91 dAogICAgICAgICB0ZXN0X3Jlc3VsdCA9IHNpbmdsZV90ZXN0X3J1bm5lci5ydW5fc2luZ2xlX3Rl c3QoCiAgICAgICAgICAgICBzZWxmLl9wb3J0LCBzZWxmLl9vcHRpb25zLCB0ZXN0X2lucHV0LCBz ZWxmLl9kcml2ZXIsIHNlbGYuX25hbWUsCi0gICAgICAgICAgICBzZWxmLl90ZXN0X3R5cGVzLCBz ZWxmLl90ZXN0X2FyZ3MpCisgICAgICAgICAgICBzZWxmLl90ZXN0X3R5cGVzKQogICAgICAgICBz ZWxmLl90ZXN0X3Jlc3VsdHMuYXBwZW5kKHRlc3RfcmVzdWx0KQogICAgICAgICByZXR1cm4gdGVz dF9yZXN1bHQKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbGF5b3V0X3BhY2thZ2Uvc2luZ2xlX3Rlc3RfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uvc2luZ2xlX3Rlc3RfcnVubmVyLnB5 CmluZGV4IDE3YjI2YzA4ZmE1YjFkYWNkNTk1MzgxNzQ3YmNjODZjOGU0Y2M0ZDIuLmRhY2Y2NjYw MTBiOWE5ZmM0YTIzN2UxNTIwMWFmNDM0MDE2MDZjMjkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3NpbmdsZV90ZXN0X3J1bm5l ci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFj a2FnZS9zaW5nbGVfdGVzdF9ydW5uZXIucHkKQEAgLTQxLDkgKzQxLDkgQEAgZnJvbSB0ZXN0X3Jl c3VsdHMgaW1wb3J0IFRlc3RSZXN1bHQKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVf XykKIAogCi1kZWYgcnVuX3NpbmdsZV90ZXN0KHBvcnQsIG9wdGlvbnMsIHRlc3RfaW5wdXQsIGRy aXZlciwgd29ya2VyX25hbWUsIHRlc3RfdHlwZXMsIHRlc3RfYXJncyk6CitkZWYgcnVuX3Npbmds ZV90ZXN0KHBvcnQsIG9wdGlvbnMsIHRlc3RfaW5wdXQsIGRyaXZlciwgd29ya2VyX25hbWUsIHRl c3RfdHlwZXMpOgogICAgICMgRklYTUU6IFB1bGwgdGhpcyBpbnRvIFRlc3RTaGVsbFRocmVhZC5f cnVuKCkuCi0gICAgcnVubmVyID0gU2luZ2xlVGVzdFJ1bm5lcihvcHRpb25zLCBwb3J0LCBkcml2 ZXIsIHRlc3RfaW5wdXQsIHdvcmtlcl9uYW1lLCB0ZXN0X3R5cGVzLCB0ZXN0X2FyZ3MpCisgICAg cnVubmVyID0gU2luZ2xlVGVzdFJ1bm5lcihvcHRpb25zLCBwb3J0LCBkcml2ZXIsIHRlc3RfaW5w dXQsIHdvcmtlcl9uYW1lLCB0ZXN0X3R5cGVzKQogICAgIHJldHVybiBydW5uZXIucnVuKCkKIAog CkBAIC01Nyw3ICs1Nyw3IEBAIGNsYXNzIEV4cGVjdGVkRHJpdmVyT3V0cHV0OgogCiBjbGFzcyBT aW5nbGVUZXN0UnVubmVyOgogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIG9wdGlvbnMsIHBvcnQs IGRyaXZlciwgdGVzdF9pbnB1dCwgd29ya2VyX25hbWUsIHRlc3RfdHlwZXMsIHRlc3RfYXJncyk6 CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIG9wdGlvbnMsIHBvcnQsIGRyaXZlciwgdGVzdF9pbnB1 dCwgd29ya2VyX25hbWUsIHRlc3RfdHlwZXMpOgogICAgICAgICBzZWxmLl9vcHRpb25zID0gb3B0 aW9ucwogICAgICAgICBzZWxmLl9wb3J0ID0gcG9ydAogICAgICAgICBzZWxmLl9kcml2ZXIgPSBk cml2ZXIKQEAgLTY1LDcgKzY1LDYgQEAgY2xhc3MgU2luZ2xlVGVzdFJ1bm5lcjoKICAgICAgICAg c2VsZi5fdGltZW91dCA9IHRlc3RfaW5wdXQudGltZW91dAogICAgICAgICBzZWxmLl93b3JrZXJf bmFtZSA9IHdvcmtlcl9uYW1lCiAgICAgICAgIHNlbGYuX3Rlc3RfdHlwZXMgPSB0ZXN0X3R5cGVz Ci0gICAgICAgIHNlbGYuX3Rlc3RfYXJncyA9IHRlc3RfYXJncwogICAgICAgICBzZWxmLl90ZXN0 bmFtZSA9IHBvcnQucmVsYXRpdmVfdGVzdF9maWxlbmFtZSh0ZXN0X2lucHV0LmZpbGVuYW1lKQog CiAgICAgZGVmIF9leHBlY3RlZF9kcml2ZXJfb3V0cHV0KHNlbGYpOgpAQCAtMTI1LDkgKzEyNCw5 IEBAIGNsYXNzIFNpbmdsZVRlc3RSdW5uZXI6CiAgICAgICAgIHRpbWVfZm9yX2RpZmZzID0ge30K ICAgICAgICAgZm9yIHRlc3RfdHlwZSBpbiBzZWxmLl90ZXN0X3R5cGVzOgogICAgICAgICAgICAg c3RhcnRfZGlmZl90aW1lID0gdGltZS50aW1lKCkKLSAgICAgICAgICAgIG5ld19mYWlsdXJlcyA9 IHRlc3RfdHlwZS5jb21wYXJlX291dHB1dChzZWxmLl9wb3J0LCBzZWxmLl9maWxlbmFtZSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl90 ZXN0X2FyZ3MsIGRyaXZlcl9vdXRwdXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZXhwZWN0ZWRfZHJpdmVyX291dHB1dCkKKyAgICAgICAgICAg IG5ld19mYWlsdXJlcyA9IHRlc3RfdHlwZS5jb21wYXJlX291dHB1dCgKKyAgICAgICAgICAgICAg ICBzZWxmLl9wb3J0LCBzZWxmLl9maWxlbmFtZSwgc2VsZi5fb3B0aW9ucywgZHJpdmVyX291dHB1 dCwKKyAgICAgICAgICAgICAgICBleHBlY3RlZF9kcml2ZXJfb3V0cHV0KQogICAgICAgICAgICAg IyBEb24ndCBhZGQgYW55IG1vcmUgZmFpbHVyZXMgaWYgd2UgYWxyZWFkeSBoYXZlIGEgY3Jhc2gs IHNvIHdlIGRvbid0CiAgICAgICAgICAgICAjIGRvdWJsZS1yZXBvcnQgdGhvc2UgdGVzdHMuIFdl IGRvIGRvdWJsZS1yZXBvcnQgZm9yIHRpbWVvdXRzIHNpbmNlCiAgICAgICAgICAgICAjIHdlIHN0 aWxsIHdhbnQgdG8gc2VlIHRoZSB0ZXh0IGFuZCBpbWFnZSBvdXRwdXQuCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdl X2RpZmYucHkKaW5kZXggMzQ5NGUyMTYwZTExMzljNjRlOWY5ZWQ4N2ZkYWExYWFjNzFjN2NlMC4u MGU2YmMxZmI0ZWIxZjJhZDdmNjE1MDE0NWVkODNlMGZjYWQ5MGUzNSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy9pbWFnZV9kaWZmLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvaW1h Z2VfZGlmZi5weQpAQCAtODUsNyArODUsNyBAQCBjbGFzcyBJbWFnZURpZmYodGVzdF90eXBlX2Jh c2UuVGVzdFR5cGVCYXNlKToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNlbGYuRklMRU5BTUVfU1VGRklYX0NPTVBBUkUpCiAgICAgICAgIHJldHVybiBwb3J0 LmRpZmZfaW1hZ2UoYWN0dWFsX2ltYWdlLCBleHBlY3RlZF9pbWFnZSwgZGlmZl9maWxlbmFtZSkK IAotICAgIGRlZiBjb21wYXJlX291dHB1dChzZWxmLCBwb3J0LCBmaWxlbmFtZSwgdGVzdF9hcmdz LCBhY3R1YWxfZHJpdmVyX291dHB1dCwKKyAgICBkZWYgY29tcGFyZV9vdXRwdXQoc2VsZiwgcG9y dCwgZmlsZW5hbWUsIG9wdGlvbnMsIGFjdHVhbF9kcml2ZXJfb3V0cHV0LAogICAgICAgICAgICAg ICAgICAgICAgICBleHBlY3RlZF9kcml2ZXJfb3V0cHV0KToKICAgICAgICAgIiIiSW1wbGVtZW50 YXRpb24gb2YgQ29tcGFyZU91dHB1dCB0aGF0IGNoZWNrcyB0aGUgb3V0cHV0IGltYWdlIGFuZAog ICAgICAgICBjaGVja3N1bSBhZ2FpbnN0IHRoZSBleHBlY3RlZCBmaWxlcyBmcm9tIHRoZSBMYXlv dXRUZXN0IGRpcmVjdG9yeS4KQEAgLTk3LDEwICs5NywxMCBAQCBjbGFzcyBJbWFnZURpZmYodGVz dF90eXBlX2Jhc2UuVGVzdFR5cGVCYXNlKToKICAgICAgICAgICAgIHJldHVybiBmYWlsdXJlcwog CiAgICAgICAgICMgSWYgd2UncmUgZ2VuZXJhdGluZyBhIG5ldyBiYXNlbGluZSwgd2UgcGFzcy4K LSAgICAgICAgaWYgdGVzdF9hcmdzLm5ld19iYXNlbGluZSBvciB0ZXN0X2FyZ3MucmVzZXRfcmVz dWx0czoKKyAgICAgICAgaWYgb3B0aW9ucy5uZXdfYmFzZWxpbmUgb3Igb3B0aW9ucy5yZXNldF9y ZXN1bHRzOgogICAgICAgICAgICAgc2VsZi5fc2F2ZV9iYXNlbGluZV9maWxlcyhmaWxlbmFtZSwg YWN0dWFsX2RyaXZlcl9vdXRwdXQuaW1hZ2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGFjdHVhbF9kcml2ZXJfb3V0cHV0LmltYWdlX2hhc2gsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHRlc3RfYXJncy5uZXdfYmFzZWxpbmUpCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbnMubmV3X2Jhc2VsaW5lKQogICAg ICAgICAgICAgcmV0dXJuIGZhaWx1cmVzCiAKICAgICAgICAgaWYgbm90IGV4cGVjdGVkX2RyaXZl cl9vdXRwdXQuaW1hZ2U6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy90ZXN0X3R5cGVzL3Rlc3RfdHlwZV9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy90ZXN0X3R5cGVfYmFzZS5weQppbmRleCAzM2Fk YTViM2I5Mjg3YzQ5NDE0ZTU2MmFjMjE5OGFkMGZiYzlhMzYxLi4zMjI0ZmYzY2Q4ZWNmMjIxMzg2 MWRlOGI1MjE1YjljYWIyODg0OTAxIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL3Rlc3RfdHlwZV9iYXNlLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvdGVzdF90eXBlX2Jhc2UucHkK QEAgLTI4LDggKzI4LDYgQEAKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAogIiIiRGVmaW5lcyB0aGUgaW50ZXJm YWNlIFRlc3RUeXBlQmFzZSB3aGljaCBvdGhlciB0ZXN0IHR5cGVzIGluaGVyaXQgZnJvbS4KLQot QWxzbyBkZWZpbmVzIHRoZSBUZXN0QXJndW1lbnRzICJzdHJ1Y3QiIHRvIHBhc3MgdGhlbSBhZGRp dGlvbmFsIGFyZ3VtZW50cy4KICIiIgogCiBpbXBvcnQgY2dpCkBAIC0zOSwyMSArMzcsNiBAQCBp bXBvcnQgbG9nZ2luZwogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKCJ3ZWJraXRweS5sYXlvdXRf dGVzdHMudGVzdF90eXBlcy50ZXN0X3R5cGVfYmFzZSIpCiAKIAotY2xhc3MgVGVzdEFyZ3VtZW50 cyhvYmplY3QpOgotICAgICIiIlN0cnVjdC1saWtlIHdyYXBwZXIgZm9yIGFkZGl0aW9uYWwgYXJn dW1lbnRzIG5lZWRlZCBieQotICAgIHNwZWNpZmljIHRlc3RzLiIiIgotICAgICMgV2hldGhlciB0 byBzYXZlIG5ldyBiYXNlbGluZSByZXN1bHRzLgotICAgIG5ld19iYXNlbGluZSA9IEZhbHNlCi0K LSAgICAjIFBhdGggdG8gdGhlIGFjdHVhbCBQTkcgZmlsZSBnZW5lcmF0ZWQgYnkgcGl4ZWwgdGVz dHMKLSAgICBwbmdfcGF0aCA9IE5vbmUKLQotICAgICMgVmFsdWUgb2YgY2hlY2tzdW0gZ2VuZXJh dGVkIGJ5IHBpeGVsIHRlc3RzLgotICAgIGhhc2ggPSBOb25lCi0KLSAgICAjIFdoZXRoZXIgdG8g dXNlIHdkaWZmIHRvIGdlbmVyYXRlIGJ5LXdvcmQgZGlmZnMuCi0gICAgd2RpZmYgPSBGYWxzZQot CiAjIFB5dGhvbiBidWcgd29ya2Fyb3VuZC4gIFNlZSB0aGUgd2RpZmYgY29kZSBpbiBXcml0ZU91 dHB1dEZpbGVzIGZvciBhbgogIyBleHBsYW5hdGlvbi4KIF93ZGlmZl9hdmFpbGFibGUgPSBUcnVl CkBAIC0xMzksNyArMTIyLDcgQEAgY2xhc3MgVGVzdFR5cGVCYXNlKG9iamVjdCk6CiAgICAgICAg ICAgICBzZWxmLl9wb3J0LnJlbGF0aXZlX3Rlc3RfZmlsZW5hbWUoZmlsZW5hbWUpKQogICAgICAg ICByZXR1cm4gZnMuc3BsaXRleHQob3V0cHV0X2ZpbGVuYW1lKVswXSArIG1vZGlmaWVyCiAKLSAg ICBkZWYgY29tcGFyZV9vdXRwdXQoc2VsZiwgcG9ydCwgZmlsZW5hbWUsIHRlc3RfYXJncywgYWN0 dWFsX2RyaXZlcl9vdXRwdXQsCisgICAgZGVmIGNvbXBhcmVfb3V0cHV0KHNlbGYsIHBvcnQsIGZp bGVuYW1lLCBvcHRpb25zLCBhY3R1YWxfZHJpdmVyX291dHB1dCwKICAgICAgICAgICAgICAgICAg ICAgICAgIGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQpOgogICAgICAgICAiIiJNZXRob2QgdGhhdCBj b21wYXJlcyB0aGUgb3V0cHV0IGZyb20gdGhlIHRlc3Qgd2l0aCB0aGUKICAgICAgICAgZXhwZWN0 ZWQgdmFsdWUuCkBAIC0xNDksOCArMTMyLDcgQEAgY2xhc3MgVGVzdFR5cGVCYXNlKG9iamVjdCk6 CiAgICAgICAgIEFyZ3M6CiAgICAgICAgICAgcG9ydDogb2JqZWN0IGltcGxlbWVudGluZyBwb3J0 LXNwZWNpZmljIGluZm9ybWF0aW9uIGFuZCBtZXRob2RzCiAgICAgICAgICAgZmlsZW5hbWU6IGFi c29sdXRlIGZpbGVuYW1lIHRvIHRlc3QgZmlsZQotICAgICAgICAgIHRlc3RfYXJnczogYSBUZXN0 QXJndW1lbnRzIG9iamVjdCBob2xkaW5nIG9wdGlvbmFsIGFkZGl0aW9uYWwKLSAgICAgICAgICAg ICAgYXJndW1lbnRzCisgICAgICAgICAgb3B0aW9uczogY29tbWFuZCBsaW5lIGFyZ3VtZW50IG9i amVjdCBmcm9tIG9wdHBhcnNlCiAgICAgICAgICAgYWN0dWFsX2RyaXZlcl9vdXRwdXQ6IGEgRHJp dmVyT3V0cHV0IG9iamVjdCB3aGljaCByZXByZXNlbnRzIGFjdHVhbCB0ZXN0CiAgICAgICAgICAg ICAgIG91dHB1dAogICAgICAgICAgIGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQ6IGEgRXhwZWN0ZWRE cml2ZXJPdXRwdXQgb2JqZWN0IHdoaWNoIHJlcHJlc2VudHMgYQpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy90ZXN0X3R5cGVfYmFzZV91 bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlw ZXMvdGVzdF90eXBlX2Jhc2VfdW5pdHRlc3QucHkKaW5kZXggNWRiZmNiNjhjMDY4YWUzYzZhY2Mw NDI0OTAwZjFiNGY2MmM5MmNmMy4uN2FmNGQ5YzczYzE5NzFhOWU5MjdkYWE1MDVjOTNlYThmMWEx ZjhmNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVz dF90eXBlcy90ZXN0X3R5cGVfYmFzZV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL3Rlc3RfdHlwZV9iYXNlX3VuaXR0ZXN0LnB5 CkBAIC00MCw3ICs0MCw3IEBAIGNsYXNzIFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg ICB0ZXN0X3R5cGUgPSB0ZXN0X3R5cGVfYmFzZS5UZXN0VHlwZUJhc2UoTm9uZSwgTm9uZSkKICAg ICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoTm90SW1wbGVtZW50ZWRFcnJvciwgdGVzdF90eXBlLmNv bXBhcmVfb3V0cHV0LAogICAgICAgICAgICAgICAgICAgICAgICAgICBOb25lLCAiZm9vLnR4dCIs ICcnLAotICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0X3R5cGVfYmFzZS5UZXN0QXJndW1l bnRzKCksICdEZWJ1ZycpCisgICAgICAgICAgICAgICAgICAgICAgICAgIHt9LCAnRGVidWcnKQog CiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL3RleHRfZGlmZi5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvdGV4dF9kaWZmLnB5CmluZGV4 IDcyOTc2NjY1MDg2NTYzNTFkNDVlZGI2MWNlODZhZGM2NDdlNGNmODcuLjNiZWQ3NWNkY2IwMDI3 MjBlYmUyNmU0NjU0MjJhN2UxYzg1YzY5NmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvdGV4dF9kaWZmLnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvdGV4dF9kaWZmLnB5CkBAIC01 MywyMCArNTMsMjAgQEAgY2xhc3MgVGVzdFRleHREaWZmKHRlc3RfdHlwZV9iYXNlLlRlc3RUeXBl QmFzZSk6CiAgICAgICAgICMgdGhlIG5vcm1hbGl6ZWQgdGV4dCBleHBlY3RhdGlvbiBmaWxlcy4K ICAgICAgICAgcmV0dXJuIG91dHB1dC5yZXBsYWNlKCJcclxyXG4iLCAiXHJcbiIpLnJlcGxhY2Uo IlxyXG4iLCAiXG4iKQogCi0gICAgZGVmIGNvbXBhcmVfb3V0cHV0KHNlbGYsIHBvcnQsIGZpbGVu YW1lLCB0ZXN0X2FyZ3MsIGFjdHVhbF9kcml2ZXJfb3V0cHV0LAorICAgIGRlZiBjb21wYXJlX291 dHB1dChzZWxmLCBwb3J0LCBmaWxlbmFtZSwgb3B0aW9ucywgYWN0dWFsX2RyaXZlcl9vdXRwdXQs CiAgICAgICAgICAgICAgICAgICAgICAgICBleHBlY3RlZF9kcml2ZXJfb3V0cHV0KToKICAgICAg ICAgIiIiSW1wbGVtZW50YXRpb24gb2YgQ29tcGFyZU91dHB1dCB0aGF0IGNoZWNrcyB0aGUgb3V0 cHV0IHRleHQgYWdhaW5zdAogICAgICAgICB0aGUgZXhwZWN0ZWQgdGV4dCBmcm9tIHRoZSBMYXlv dXRUZXN0IGRpcmVjdG9yeS4iIiIKICAgICAgICAgZmFpbHVyZXMgPSBbXQogCiAgICAgICAgICMg SWYgd2UncmUgZ2VuZXJhdGluZyBhIG5ldyBiYXNlbGluZSwgd2UgcGFzcy4KLSAgICAgICAgaWYg dGVzdF9hcmdzLm5ld19iYXNlbGluZSBvciB0ZXN0X2FyZ3MucmVzZXRfcmVzdWx0czoKKyAgICAg ICAgaWYgb3B0aW9ucy5uZXdfYmFzZWxpbmUgb3Igb3B0aW9ucy5yZXNldF9yZXN1bHRzOgogICAg ICAgICAgICAgIyBBbHRob3VnaCBhbGwgdGVzdF9zaGVsbC9EdW1wUmVuZGVyVHJlZSBvdXRwdXQg c2hvdWxkIGJlIHV0Zi04LAogICAgICAgICAgICAgIyB3ZSBkbyBub3QgZXZlciBkZWNvZGUgaXQg aW5zaWRlIHJ1bi13ZWJraXQtdGVzdHMuICBGb3Igc29tZSB0ZXN0cwogICAgICAgICAgICAgIyBE dW1wUmVuZGVyVHJlZSBtYXkgbm90IG91dHB1dCB1dGYtOCB0ZXh0IChlLmcuIHdlYmFyY2hpdmVz KS4KICAgICAgICAgICAgIHNlbGYuX3NhdmVfYmFzZWxpbmVfZGF0YShmaWxlbmFtZSwgYWN0dWFs X2RyaXZlcl9vdXRwdXQudGV4dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiLnR4dCIsIGVuY29kaW5nPU5vbmUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZ2VuZXJhdGVfbmV3X2Jhc2VsaW5lPXRlc3RfYXJncy5uZXdfYmFzZWxpbmUpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2VuZXJhdGVfbmV3X2Jhc2VsaW5lPW9w dGlvbnMubmV3X2Jhc2VsaW5lKQogICAgICAgICAgICAgcmV0dXJuIGZhaWx1cmVzCiAKICAgICAg ICAgIyBOb3JtYWxpemUgdGV4dCB0byBkaWZmCg== 81188 2011-02-03 22:09:38 -0800 2011-02-03 22:20:54 -0800 remove-testargs--review-ready bug-53063-20110204150936.patch text/plain 13563 hayato ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhNmQ4 ZDU2NzdkNGEwYzEyMTZkNWY1YWU0ZTZmNjk5NDEyZDY3MzFlLi40NzhhYjY1OWQ4ZjkwYTExNjJh MDU2NDEwOTA5NDU5YmE5ZjhjYjhjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTEtMDItMDMgIEhheWF0byBJdG8g IDxoYXlhdG9AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtOUldUXSBSZW1vdmUgVGVzdEFyZ3MgY2xhc3MsIHdoaWNoIGlzIHdy b25nbHkgdXNlZC4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTMwNjMKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xh eW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5OgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3NpbmdsZV90ZXN0X3J1bm5l ci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVz L2ltYWdlX2RpZmYucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv dGVzdF90eXBlcy90ZXN0X3R5cGVfYmFzZS5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL3Rlc3RfdHlwZV9iYXNlX3VuaXR0ZXN0LnB5OgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvdGV4dF9kaWZm LnB5OgorCisyMDExLTAyLTAzICBIYXlhdG8gSXRvICA8aGF5YXRvQGNocm9taXVtLm9yZz4KKwog ICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgogCiAgICAgICAgIFtOUldUXSBJbnRyb2R1 Y2VzIElucHV0L091dHB1dCBjbGFzcyB1c2VkIGJ5IGJhc2UuRHJpdmVyIGludG8gcG9ydC9iYXNl LnB5IGFuZApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bGF5b3V0X3BhY2thZ2UvZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9kdW1wX3JlbmRlcl90cmVlX3Ro cmVhZC5weQppbmRleCAzNDBiY2UxYWMzZDMyMzEyOGE2YmZiYmU5NWQ3ODYxNDMxZGI4NGE4Li4x ZDFhYjk3MTY5YTcxYzgzYWU1Y2M0NThjZTM5NWY1MGI3YzY5NzM2IDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9kdW1wX3JlbmRl cl90cmVlX3RocmVhZC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9sYXlvdXRfcGFja2FnZS9kdW1wX3JlbmRlcl90cmVlX3RocmVhZC5weQpAQCAtODIsNyArODIs NyBAQCBjbGFzcyBTaW5nbGVUZXN0VGhyZWFkKHRocmVhZGluZy5UaHJlYWQpOgogICAgICIiIlRo cmVhZCB3cmFwcGVyIGZvciBydW5uaW5nIGEgc2luZ2xlIHRlc3QgZmlsZS4iIiIKIAogICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBwb3J0LCBvcHRpb25zLCB3b3JrZXJfbnVtYmVyLCB3b3JrZXJfbmFt ZSwKLSAgICAgICAgICAgICAgICAgdGVzdF9pbnB1dCwgdGVzdF90eXBlcywgdGVzdF9hcmdzKToK KyAgICAgICAgICAgICAgICAgdGVzdF9pbnB1dCwgdGVzdF90eXBlcyk6CiAgICAgICAgICIiIgog ICAgICAgICBBcmdzOgogICAgICAgICAgIHBvcnQ6IG9iamVjdCBpbXBsZW1lbnRpbmcgcG9ydC1z cGVjaWZpYyBob29rcwpAQCAtOTIsNyArOTIsNiBAQCBjbGFzcyBTaW5nbGVUZXN0VGhyZWFkKHRo cmVhZGluZy5UaHJlYWQpOgogICAgICAgICAgIHRlc3RfaW5wdXQ6IE9iamVjdCBjb250YWluaW5n IHRoZSB0ZXN0IGZpbGVuYW1lIGFuZCB0aW1lb3V0CiAgICAgICAgICAgdGVzdF90eXBlczogQSBs aXN0IG9mIFRlc3RUeXBlIG9iamVjdHMgdG8gcnVuIHRoZSB0ZXN0IG91dHB1dAogICAgICAgICAg ICAgICBhZ2FpbnN0LgotICAgICAgICAgIHRlc3RfYXJnczogQSBUZXN0QXJndW1lbnRzIG9iamVj dCB0byBwYXNzIHRvIGVhY2ggVGVzdFR5cGUuCiAgICAgICAgICIiIgogCiAgICAgICAgIHRocmVh ZGluZy5UaHJlYWQuX19pbml0X18oc2VsZikKQEAgLTEwMCw3ICs5OSw2IEBAIGNsYXNzIFNpbmds ZVRlc3RUaHJlYWQodGhyZWFkaW5nLlRocmVhZCk6CiAgICAgICAgIHNlbGYuX29wdGlvbnMgPSBv cHRpb25zCiAgICAgICAgIHNlbGYuX3Rlc3RfaW5wdXQgPSB0ZXN0X2lucHV0CiAgICAgICAgIHNl bGYuX3Rlc3RfdHlwZXMgPSB0ZXN0X3R5cGVzCi0gICAgICAgIHNlbGYuX3Rlc3RfYXJncyA9IHRl c3RfYXJncwogICAgICAgICBzZWxmLl9kcml2ZXIgPSBOb25lCiAgICAgICAgIHNlbGYuX3dvcmtl cl9udW1iZXIgPSB3b3JrZXJfbnVtYmVyCiAgICAgICAgIHNlbGYuX25hbWUgPSB3b3JrZXJfbmFt ZQpAQCAtMTE1LDcgKzExMyw3IEBAIGNsYXNzIFNpbmdsZVRlc3RUaHJlYWQodGhyZWFkaW5nLlRo cmVhZCk6CiAgICAgICAgIHNlbGYuX2RyaXZlci5zdGFydCgpCiAgICAgICAgIHNlbGYuX3Rlc3Rf cmVzdWx0ID0gc2luZ2xlX3Rlc3RfcnVubmVyLnJ1bl9zaW5nbGVfdGVzdCgKICAgICAgICAgICAg IHNlbGYuX3BvcnQsIHNlbGYuX29wdGlvbnMsIHNlbGYuX3Rlc3RfaW5wdXQsIHNlbGYuX2RyaXZl ciwKLSAgICAgICAgICAgIHNlbGYuX25hbWUsIHNlbGYuX3Rlc3RfdHlwZXMsIHNlbGYuX3Rlc3Rf YXJncykKKyAgICAgICAgICAgIHNlbGYuX25hbWUsIHNlbGYuX3Rlc3RfdHlwZSkKICAgICAgICAg c2VsZi5fZHJpdmVyLnN0b3AoKQogCiAgICAgZGVmIGdldF90ZXN0X3Jlc3VsdChzZWxmKToKQEAg LTE5NCw3ICsxOTIsNiBAQCBjbGFzcyBUZXN0U2hlbGxUaHJlYWQoV2F0Y2hhYmxlVGhyZWFkKToK ICAgICAgICAgZm9yIGNscyBpbiBzZWxmLl9nZXRfdGVzdF90eXBlX2NsYXNzZXMoKToKICAgICAg ICAgICAgIHNlbGYuX3Rlc3RfdHlwZXMuYXBwZW5kKGNscyhzZWxmLl9wb3J0LAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX29wdGlvbnMucmVzdWx0c19kaXJl Y3RvcnkpKQotICAgICAgICBzZWxmLl90ZXN0X2FyZ3MgPSBzZWxmLl9nZXRfdGVzdF9hcmdzKHdv cmtlcl9udW1iZXIpCiAKICAgICAgICAgIyBDdXJyZW50IGdyb3VwIG9mIHRlc3RzIHdlJ3JlIHJ1 bm5pbmcuCiAgICAgICAgIHNlbGYuX2N1cnJlbnRfZ3JvdXAgPSBOb25lCkBAIC0yMDMsMTQgKzIw MCw2IEBAIGNsYXNzIFRlc3RTaGVsbFRocmVhZChXYXRjaGFibGVUaHJlYWQpOgogICAgICAgICAj IFRpbWUgYXQgd2hpY2ggd2Ugc3RhcnRlZCBydW5uaW5nIHRlc3RzIGZyb20gc2VsZi5fY3VycmVu dF9ncm91cC4KICAgICAgICAgc2VsZi5fY3VycmVudF9ncm91cF9zdGFydF90aW1lID0gTm9uZQog Ci0gICAgZGVmIF9nZXRfdGVzdF9hcmdzKHNlbGYsIHdvcmtlcl9udW1iZXIpOgotICAgICAgICAi IiJSZXR1cm5zIHRoZSB0dXBsZSBvZiBhcmd1bWVudHMgZm9yIHRlc3RzIGFuZCBmb3IgRHVtcFJl bmRlclRyZWUuIiIiCi0gICAgICAgIHRlc3RfYXJncyA9IHRlc3RfdHlwZV9iYXNlLlRlc3RBcmd1 bWVudHMoKQotICAgICAgICB0ZXN0X2FyZ3MubmV3X2Jhc2VsaW5lID0gc2VsZi5fb3B0aW9ucy5u ZXdfYmFzZWxpbmUKLSAgICAgICAgdGVzdF9hcmdzLnJlc2V0X3Jlc3VsdHMgPSBzZWxmLl9vcHRp b25zLnJlc2V0X3Jlc3VsdHMKLQotICAgICAgICByZXR1cm4gdGVzdF9hcmdzCi0KICAgICBkZWYg X2dldF90ZXN0X3R5cGVfY2xhc3NlcyhzZWxmKToKICAgICAgICAgY2xhc3NlcyA9IFt0ZXh0X2Rp ZmYuVGVzdFRleHREaWZmXQogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnBpeGVsX3Rlc3RzOgpA QCAtMzg5LDggKzM3OCw3IEBAIGNsYXNzIFRlc3RTaGVsbFRocmVhZChXYXRjaGFibGVUaHJlYWQp OgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3dvcmtlcl9udW1iZXIs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fbmFtZSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0X2lucHV0LAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHNlbGYuX3Rlc3RfdHlwZXMsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgc2VsZi5fdGVzdF9hcmdzKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNlbGYuX3Rlc3RfdHlwZXMpCiAKICAgICAgICAgd29ya2VyLnN0YXJ0KCkKIApAQCAt NDM1LDcgKzQyMyw3IEBAIGNsYXNzIFRlc3RTaGVsbFRocmVhZChXYXRjaGFibGVUaHJlYWQpOgog ICAgICAgICBzZWxmLl9uZXh0X3RpbWVvdXQgPSB0aW1lLnRpbWUoKSArIHRocmVhZF90aW1lb3V0 CiAgICAgICAgIHRlc3RfcmVzdWx0ID0gc2luZ2xlX3Rlc3RfcnVubmVyLnJ1bl9zaW5nbGVfdGVz dCgKICAgICAgICAgICAgIHNlbGYuX3BvcnQsIHNlbGYuX29wdGlvbnMsIHRlc3RfaW5wdXQsIHNl bGYuX2RyaXZlciwgc2VsZi5fbmFtZSwKLSAgICAgICAgICAgIHNlbGYuX3Rlc3RfdHlwZXMsIHNl bGYuX3Rlc3RfYXJncykKKyAgICAgICAgICAgIHNlbGYuX3Rlc3RfdHlwZXMpCiAgICAgICAgIHNl bGYuX3Rlc3RfcmVzdWx0cy5hcHBlbmQodGVzdF9yZXN1bHQpCiAgICAgICAgIHJldHVybiB0ZXN0 X3Jlc3VsdAogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9sYXlvdXRfcGFja2FnZS9zaW5nbGVfdGVzdF9ydW5uZXIucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5nbGVfdGVzdF9ydW5uZXIucHkK aW5kZXggODU5MmYxOTU4YmMxMmRkZmZlYmM3Zjc4OGFhMGEwZGQyMmVjMTIxYy4uZDg0NjNkOWE0 ZTgzMmFkY2U5YTU3ZTIzMDA1ZDhhYWE4NjQyYzJjZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uvc2luZ2xlX3Rlc3RfcnVubmVy LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNr YWdlL3NpbmdsZV90ZXN0X3J1bm5lci5weQpAQCAtMzksOSArMzksOSBAQCBmcm9tIHdlYmtpdHB5 LmxheW91dF90ZXN0cy5sYXlvdXRfcGFja2FnZS50ZXN0X3Jlc3VsdHMgaW1wb3J0IFRlc3RSZXN1 bHQKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogCi1kZWYgcnVuX3Npbmds ZV90ZXN0KHBvcnQsIG9wdGlvbnMsIHRlc3RfaW5wdXQsIGRyaXZlciwgd29ya2VyX25hbWUsIHRl c3RfdHlwZXMsIHRlc3RfYXJncyk6CitkZWYgcnVuX3NpbmdsZV90ZXN0KHBvcnQsIG9wdGlvbnMs IHRlc3RfaW5wdXQsIGRyaXZlciwgd29ya2VyX25hbWUsIHRlc3RfdHlwZXMpOgogICAgICMgRklY TUU6IFB1bGwgdGhpcyBpbnRvIFRlc3RTaGVsbFRocmVhZC5fcnVuKCkuCi0gICAgcnVubmVyID0g U2luZ2xlVGVzdFJ1bm5lcihvcHRpb25zLCBwb3J0LCBkcml2ZXIsIHRlc3RfaW5wdXQsIHdvcmtl cl9uYW1lLCB0ZXN0X3R5cGVzLCB0ZXN0X2FyZ3MpCisgICAgcnVubmVyID0gU2luZ2xlVGVzdFJ1 bm5lcihvcHRpb25zLCBwb3J0LCBkcml2ZXIsIHRlc3RfaW5wdXQsIHdvcmtlcl9uYW1lLCB0ZXN0 X3R5cGVzKQogICAgIHJldHVybiBydW5uZXIucnVuKCkKIAogCkBAIC01NSw3ICs1NSw3IEBAIGNs YXNzIEV4cGVjdGVkRHJpdmVyT3V0cHV0OgogCiBjbGFzcyBTaW5nbGVUZXN0UnVubmVyOgogCi0g ICAgZGVmIF9faW5pdF9fKHNlbGYsIG9wdGlvbnMsIHBvcnQsIGRyaXZlciwgdGVzdF9pbnB1dCwg d29ya2VyX25hbWUsIHRlc3RfdHlwZXMsIHRlc3RfYXJncyk6CisgICAgZGVmIF9faW5pdF9fKHNl bGYsIG9wdGlvbnMsIHBvcnQsIGRyaXZlciwgdGVzdF9pbnB1dCwgd29ya2VyX25hbWUsIHRlc3Rf dHlwZXMpOgogICAgICAgICBzZWxmLl9vcHRpb25zID0gb3B0aW9ucwogICAgICAgICBzZWxmLl9w b3J0ID0gcG9ydAogICAgICAgICBzZWxmLl9kcml2ZXIgPSBkcml2ZXIKQEAgLTYzLDcgKzYzLDYg QEAgY2xhc3MgU2luZ2xlVGVzdFJ1bm5lcjoKICAgICAgICAgc2VsZi5fdGltZW91dCA9IHRlc3Rf aW5wdXQudGltZW91dAogICAgICAgICBzZWxmLl93b3JrZXJfbmFtZSA9IHdvcmtlcl9uYW1lCiAg ICAgICAgIHNlbGYuX3Rlc3RfdHlwZXMgPSB0ZXN0X3R5cGVzCi0gICAgICAgIHNlbGYuX3Rlc3Rf YXJncyA9IHRlc3RfYXJncwogICAgICAgICBzZWxmLl90ZXN0bmFtZSA9IHBvcnQucmVsYXRpdmVf dGVzdF9maWxlbmFtZSh0ZXN0X2lucHV0LmZpbGVuYW1lKQogCiAgICAgZGVmIF9leHBlY3RlZF9k cml2ZXJfb3V0cHV0KHNlbGYpOgpAQCAtMTIzLDkgKzEyMiw5IEBAIGNsYXNzIFNpbmdsZVRlc3RS dW5uZXI6CiAgICAgICAgIHRpbWVfZm9yX2RpZmZzID0ge30KICAgICAgICAgZm9yIHRlc3RfdHlw ZSBpbiBzZWxmLl90ZXN0X3R5cGVzOgogICAgICAgICAgICAgc3RhcnRfZGlmZl90aW1lID0gdGlt ZS50aW1lKCkKLSAgICAgICAgICAgIG5ld19mYWlsdXJlcyA9IHRlc3RfdHlwZS5jb21wYXJlX291 dHB1dChzZWxmLl9wb3J0LCBzZWxmLl9maWxlbmFtZSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl90ZXN0X2FyZ3MsIGRyaXZlcl9vdXRw dXQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZXhwZWN0ZWRfZHJpdmVyX291dHB1dCkKKyAgICAgICAgICAgIG5ld19mYWlsdXJlcyA9IHRlc3Rf dHlwZS5jb21wYXJlX291dHB1dCgKKyAgICAgICAgICAgICAgICBzZWxmLl9wb3J0LCBzZWxmLl9m aWxlbmFtZSwgc2VsZi5fb3B0aW9ucywgZHJpdmVyX291dHB1dCwKKyAgICAgICAgICAgICAgICBl eHBlY3RlZF9kcml2ZXJfb3V0cHV0KQogICAgICAgICAgICAgIyBEb24ndCBhZGQgYW55IG1vcmUg ZmFpbHVyZXMgaWYgd2UgYWxyZWFkeSBoYXZlIGEgY3Jhc2gsIHNvIHdlIGRvbid0CiAgICAgICAg ICAgICAjIGRvdWJsZS1yZXBvcnQgdGhvc2UgdGVzdHMuIFdlIGRvIGRvdWJsZS1yZXBvcnQgZm9y IHRpbWVvdXRzIHNpbmNlCiAgICAgICAgICAgICAjIHdlIHN0aWxsIHdhbnQgdG8gc2VlIHRoZSB0 ZXh0IGFuZCBpbWFnZSBvdXRwdXQuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL2ltYWdlX2RpZmYucHkKaW5kZXggMzQ5NGUy MTYwZTExMzljNjRlOWY5ZWQ4N2ZkYWExYWFjNzFjN2NlMC4uMGU2YmMxZmI0ZWIxZjJhZDdmNjE1 MDE0NWVkODNlMGZjYWQ5MGUzNSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvdGVzdF90eXBlcy9pbWFnZV9kaWZmLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvaW1hZ2VfZGlmZi5weQpAQCAtODUsNyAr ODUsNyBAQCBjbGFzcyBJbWFnZURpZmYodGVzdF90eXBlX2Jhc2UuVGVzdFR5cGVCYXNlKToKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuRklMRU5BTUVf U1VGRklYX0NPTVBBUkUpCiAgICAgICAgIHJldHVybiBwb3J0LmRpZmZfaW1hZ2UoYWN0dWFsX2lt YWdlLCBleHBlY3RlZF9pbWFnZSwgZGlmZl9maWxlbmFtZSkKIAotICAgIGRlZiBjb21wYXJlX291 dHB1dChzZWxmLCBwb3J0LCBmaWxlbmFtZSwgdGVzdF9hcmdzLCBhY3R1YWxfZHJpdmVyX291dHB1 dCwKKyAgICBkZWYgY29tcGFyZV9vdXRwdXQoc2VsZiwgcG9ydCwgZmlsZW5hbWUsIG9wdGlvbnMs IGFjdHVhbF9kcml2ZXJfb3V0cHV0LAogICAgICAgICAgICAgICAgICAgICAgICBleHBlY3RlZF9k cml2ZXJfb3V0cHV0KToKICAgICAgICAgIiIiSW1wbGVtZW50YXRpb24gb2YgQ29tcGFyZU91dHB1 dCB0aGF0IGNoZWNrcyB0aGUgb3V0cHV0IGltYWdlIGFuZAogICAgICAgICBjaGVja3N1bSBhZ2Fp bnN0IHRoZSBleHBlY3RlZCBmaWxlcyBmcm9tIHRoZSBMYXlvdXRUZXN0IGRpcmVjdG9yeS4KQEAg LTk3LDEwICs5NywxMCBAQCBjbGFzcyBJbWFnZURpZmYodGVzdF90eXBlX2Jhc2UuVGVzdFR5cGVC YXNlKToKICAgICAgICAgICAgIHJldHVybiBmYWlsdXJlcwogCiAgICAgICAgICMgSWYgd2UncmUg Z2VuZXJhdGluZyBhIG5ldyBiYXNlbGluZSwgd2UgcGFzcy4KLSAgICAgICAgaWYgdGVzdF9hcmdz Lm5ld19iYXNlbGluZSBvciB0ZXN0X2FyZ3MucmVzZXRfcmVzdWx0czoKKyAgICAgICAgaWYgb3B0 aW9ucy5uZXdfYmFzZWxpbmUgb3Igb3B0aW9ucy5yZXNldF9yZXN1bHRzOgogICAgICAgICAgICAg c2VsZi5fc2F2ZV9iYXNlbGluZV9maWxlcyhmaWxlbmFtZSwgYWN0dWFsX2RyaXZlcl9vdXRwdXQu aW1hZ2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFjdHVhbF9kcml2 ZXJfb3V0cHV0LmltYWdlX2hhc2gsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHRlc3RfYXJncy5uZXdfYmFzZWxpbmUpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG9wdGlvbnMubmV3X2Jhc2VsaW5lKQogICAgICAgICAgICAgcmV0dXJuIGZhaWx1 cmVzCiAKICAgICAgICAgaWYgbm90IGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQuaW1hZ2U6CmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5cGVzL3Rl c3RfdHlwZV9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVz dF90eXBlcy90ZXN0X3R5cGVfYmFzZS5weQppbmRleCAzM2FkYTViM2I5Mjg3YzQ5NDE0ZTU2MmFj MjE5OGFkMGZiYzlhMzYxLi4zMjI0ZmYzY2Q4ZWNmMjIxMzg2MWRlOGI1MjE1YjljYWIyODg0OTAx IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90ZXN0X3R5 cGVzL3Rlc3RfdHlwZV9iYXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3Rlc3RfdHlwZXMvdGVzdF90eXBlX2Jhc2UucHkKQEAgLTI4LDggKzI4LDYgQEAKICMg T0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KIAogIiIiRGVmaW5lcyB0aGUgaW50ZXJmYWNlIFRlc3RUeXBlQmFzZSB3aGlj aCBvdGhlciB0ZXN0IHR5cGVzIGluaGVyaXQgZnJvbS4KLQotQWxzbyBkZWZpbmVzIHRoZSBUZXN0 QXJndW1lbnRzICJzdHJ1Y3QiIHRvIHBhc3MgdGhlbSBhZGRpdGlvbmFsIGFyZ3VtZW50cy4KICIi IgogCiBpbXBvcnQgY2dpCkBAIC0zOSwyMSArMzcsNiBAQCBpbXBvcnQgbG9nZ2luZwogX2xvZyA9 IGxvZ2dpbmcuZ2V0TG9nZ2VyKCJ3ZWJraXRweS5sYXlvdXRfdGVzdHMudGVzdF90eXBlcy50ZXN0 X3R5cGVfYmFzZSIpCiAKIAotY2xhc3MgVGVzdEFyZ3VtZW50cyhvYmplY3QpOgotICAgICIiIlN0 cnVjdC1saWtlIHdyYXBwZXIgZm9yIGFkZGl0aW9uYWwgYXJndW1lbnRzIG5lZWRlZCBieQotICAg IHNwZWNpZmljIHRlc3RzLiIiIgotICAgICMgV2hldGhlciB0byBzYXZlIG5ldyBiYXNlbGluZSBy ZXN1bHRzLgotICAgIG5ld19iYXNlbGluZSA9IEZhbHNlCi0KLSAgICAjIFBhdGggdG8gdGhlIGFj dHVhbCBQTkcgZmlsZSBnZW5lcmF0ZWQgYnkgcGl4ZWwgdGVzdHMKLSAgICBwbmdfcGF0aCA9IE5v bmUKLQotICAgICMgVmFsdWUgb2YgY2hlY2tzdW0gZ2VuZXJhdGVkIGJ5IHBpeGVsIHRlc3RzLgot ICAgIGhhc2ggPSBOb25lCi0KLSAgICAjIFdoZXRoZXIgdG8gdXNlIHdkaWZmIHRvIGdlbmVyYXRl IGJ5LXdvcmQgZGlmZnMuCi0gICAgd2RpZmYgPSBGYWxzZQotCiAjIFB5dGhvbiBidWcgd29ya2Fy b3VuZC4gIFNlZSB0aGUgd2RpZmYgY29kZSBpbiBXcml0ZU91dHB1dEZpbGVzIGZvciBhbgogIyBl eHBsYW5hdGlvbi4KIF93ZGlmZl9hdmFpbGFibGUgPSBUcnVlCkBAIC0xMzksNyArMTIyLDcgQEAg Y2xhc3MgVGVzdFR5cGVCYXNlKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl9wb3J0LnJlbGF0 aXZlX3Rlc3RfZmlsZW5hbWUoZmlsZW5hbWUpKQogICAgICAgICByZXR1cm4gZnMuc3BsaXRleHQo b3V0cHV0X2ZpbGVuYW1lKVswXSArIG1vZGlmaWVyCiAKLSAgICBkZWYgY29tcGFyZV9vdXRwdXQo c2VsZiwgcG9ydCwgZmlsZW5hbWUsIHRlc3RfYXJncywgYWN0dWFsX2RyaXZlcl9vdXRwdXQsCisg ICAgZGVmIGNvbXBhcmVfb3V0cHV0KHNlbGYsIHBvcnQsIGZpbGVuYW1lLCBvcHRpb25zLCBhY3R1 YWxfZHJpdmVyX291dHB1dCwKICAgICAgICAgICAgICAgICAgICAgICAgIGV4cGVjdGVkX2RyaXZl cl9vdXRwdXQpOgogICAgICAgICAiIiJNZXRob2QgdGhhdCBjb21wYXJlcyB0aGUgb3V0cHV0IGZy b20gdGhlIHRlc3Qgd2l0aCB0aGUKICAgICAgICAgZXhwZWN0ZWQgdmFsdWUuCkBAIC0xNDksOCAr MTMyLDcgQEAgY2xhc3MgVGVzdFR5cGVCYXNlKG9iamVjdCk6CiAgICAgICAgIEFyZ3M6CiAgICAg ICAgICAgcG9ydDogb2JqZWN0IGltcGxlbWVudGluZyBwb3J0LXNwZWNpZmljIGluZm9ybWF0aW9u IGFuZCBtZXRob2RzCiAgICAgICAgICAgZmlsZW5hbWU6IGFic29sdXRlIGZpbGVuYW1lIHRvIHRl c3QgZmlsZQotICAgICAgICAgIHRlc3RfYXJnczogYSBUZXN0QXJndW1lbnRzIG9iamVjdCBob2xk aW5nIG9wdGlvbmFsIGFkZGl0aW9uYWwKLSAgICAgICAgICAgICAgYXJndW1lbnRzCisgICAgICAg ICAgb3B0aW9uczogY29tbWFuZCBsaW5lIGFyZ3VtZW50IG9iamVjdCBmcm9tIG9wdHBhcnNlCiAg ICAgICAgICAgYWN0dWFsX2RyaXZlcl9vdXRwdXQ6IGEgRHJpdmVyT3V0cHV0IG9iamVjdCB3aGlj aCByZXByZXNlbnRzIGFjdHVhbCB0ZXN0CiAgICAgICAgICAgICAgIG91dHB1dAogICAgICAgICAg IGV4cGVjdGVkX2RyaXZlcl9vdXRwdXQ6IGEgRXhwZWN0ZWREcml2ZXJPdXRwdXQgb2JqZWN0IHdo aWNoIHJlcHJlc2VudHMgYQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvdGVzdF90eXBlcy90ZXN0X3R5cGVfYmFzZV91bml0dGVzdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rlc3RfdHlwZXMvdGVzdF90eXBlX2Jhc2VfdW5p dHRlc3QucHkKaW5kZXggNWRiZmNiNjhjMDY4YWUzYzZhY2MwNDI0OTAwZjFiNGY2MmM5MmNmMy4u N2FmNGQ5YzczYzE5NzFhOWU5MjdkYWE1MDVjOTNlYThmMWExZjhmNiAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdGVzdF90eXBlcy90ZXN0X3R5cGVfYmFz ZV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy90 ZXN0X3R5cGVzL3Rlc3RfdHlwZV9iYXNlX3VuaXR0ZXN0LnB5CkBAIC00MCw3ICs0MCw3IEBAIGNs YXNzIFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICB0ZXN0X3R5cGUgPSB0ZXN0X3R5 cGVfYmFzZS5UZXN0VHlwZUJhc2UoTm9uZSwgTm9uZSkKICAgICAgICAgc2VsZi5hc3NlcnRSYWlz ZXMoTm90SW1wbGVtZW50ZWRFcnJvciwgdGVzdF90eXBlLmNvbXBhcmVfb3V0cHV0LAogICAgICAg ICAgICAgICAgICAgICAgICAgICBOb25lLCAiZm9vLnR4dCIsICcnLAotICAgICAgICAgICAgICAg ICAgICAgICAgICB0ZXN0X3R5cGVfYmFzZS5UZXN0QXJndW1lbnRzKCksICdEZWJ1ZycpCisgICAg ICAgICAgICAgICAgICAgICAgICAgIHt9LCAnRGVidWcnKQogCiAKIGlmIF9fbmFtZV9fID09ICdf X21haW5fXyc6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy90ZXN0X3R5cGVzL3RleHRfZGlmZi5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3Rlc3RfdHlwZXMvdGV4dF9kaWZmLnB5CmluZGV4IGNlZTUzODY0NjExMDFmYjkyOWVm MzRlZGJiMDRmZGI0YzVhZjIxMGUuLjhmNjFkZTQzNWY5ZDY4MDU1Njc3OTc5ZjE5ZmFkYmI0ZTJl ZWFjNjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Rl c3RfdHlwZXMvdGV4dF9kaWZmLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3Rlc3RfdHlwZXMvdGV4dF9kaWZmLnB5CkBAIC01MywyMCArNTMsMjAgQEAgY2xhc3Mg VGVzdFRleHREaWZmKHRlc3RfdHlwZV9iYXNlLlRlc3RUeXBlQmFzZSk6CiAgICAgICAgICMgdGhl IG5vcm1hbGl6ZWQgdGV4dCBleHBlY3RhdGlvbiBmaWxlcy4KICAgICAgICAgcmV0dXJuIG91dHB1 dC5yZXBsYWNlKCJcclxyXG4iLCAiXHJcbiIpLnJlcGxhY2UoIlxyXG4iLCAiXG4iKQogCi0gICAg ZGVmIGNvbXBhcmVfb3V0cHV0KHNlbGYsIHBvcnQsIGZpbGVuYW1lLCB0ZXN0X2FyZ3MsIGFjdHVh bF9kcml2ZXJfb3V0cHV0LAorICAgIGRlZiBjb21wYXJlX291dHB1dChzZWxmLCBwb3J0LCBmaWxl bmFtZSwgb3B0aW9ucywgYWN0dWFsX2RyaXZlcl9vdXRwdXQsCiAgICAgICAgICAgICAgICAgICAg ICAgICBleHBlY3RlZF9kcml2ZXJfb3V0cHV0KToKICAgICAgICAgIiIiSW1wbGVtZW50YXRpb24g b2YgQ29tcGFyZU91dHB1dCB0aGF0IGNoZWNrcyB0aGUgb3V0cHV0IHRleHQgYWdhaW5zdAogICAg ICAgICB0aGUgZXhwZWN0ZWQgdGV4dCBmcm9tIHRoZSBMYXlvdXRUZXN0IGRpcmVjdG9yeS4iIiIK ICAgICAgICAgZmFpbHVyZXMgPSBbXQogCiAgICAgICAgICMgSWYgd2UncmUgZ2VuZXJhdGluZyBh IG5ldyBiYXNlbGluZSwgd2UgcGFzcy4KLSAgICAgICAgaWYgdGVzdF9hcmdzLm5ld19iYXNlbGlu ZSBvciB0ZXN0X2FyZ3MucmVzZXRfcmVzdWx0czoKKyAgICAgICAgaWYgb3B0aW9ucy5uZXdfYmFz ZWxpbmUgb3Igb3B0aW9ucy5yZXNldF9yZXN1bHRzOgogICAgICAgICAgICAgIyBBbHRob3VnaCBh bGwgRHVtcFJlbmRlclRyZWUgb3V0cHV0IHNob3VsZCBiZSB1dGYtOCwgd2UgZG8gbm90CiAgICAg ICAgICAgICAjIGV2ZXIgZGVjb2RlIGl0IGluc2lkZSBydW4td2Via2l0LXRlc3RzLiAgRm9yIHNv bWUgdGVzdHMKICAgICAgICAgICAgICMgRHVtcFJlbmRlclRyZWUgbWF5IG5vdCBvdXRwdXQgdXRm LTggdGV4dCAoZS5nLiAgd2ViYXJjaGl2ZXMpLgogICAgICAgICAgICAgc2VsZi5fc2F2ZV9iYXNl bGluZV9kYXRhKGZpbGVuYW1lLCBhY3R1YWxfZHJpdmVyX291dHB1dC50ZXh0LAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICIudHh0IiwgZW5jb2Rpbmc9Tm9uZSwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnZW5lcmF0ZV9uZXdfYmFzZWxpbmU9dGVz dF9hcmdzLm5ld19iYXNlbGluZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBnZW5lcmF0ZV9uZXdfYmFzZWxpbmU9b3B0aW9ucy5uZXdfYmFzZWxpbmUpCiAgICAgICAgICAg ICByZXR1cm4gZmFpbHVyZXMKIAogICAgICAgICAjIE5vcm1hbGl6ZSB0ZXh0IHRvIGRpZmYK