91450 2012-07-16 17:25:08 -0700 nrwt: move config-specific logging to printing.py 2012-07-17 16:21:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 670805 0 dpranke 2012-07-16 17:25:08 -0700 nrwt: move config-specific logging to printing.py 670806 1 152652 dpranke 2012-07-16 17:26:08 -0700 Created attachment 152652 Patch 671717 2 dpranke 2012-07-17 16:21:05 -0700 Committed r122894: <http://trac.webkit.org/changeset/122894> 152652 2012-07-16 17:26:08 -0700 2012-07-17 13:42:31 -0700 Patch bug-91450-20120716172607.patch text/plain 11346 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNzc3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTIwNWZmNzgyYmU1ODYzN2I0YTdmNDAyOTFhMzY3MjM4 ZjY0NTBiNy4uZWIxNTY0NmYwMzc0ZjhkYTM5ZDc4ZjI3YjI5YjBmOWMxOTE1ZjkzMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMx IEBACiAyMDEyLTA3LTE2ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IG1vdmUgY29uZmlnLXNwZWNpZmljIGxvZ2dpbmcgdG8gcHJpbnRpbmcucHkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkxNDUwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW9yZSByZWZh Y3RvcmluZyAuLi4gdGhpcyBtb3ZlcyB0aGUgJ2NvbmZpZycgb3V0cHV0IHRvCisgICAgICAgIHBy aW50aW5nLnB5LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAgKE1hbmFnZXIuX3Jlc2l6ZV9zaGFyZHMpOgor ICAgICAgICAoTWFuYWdlci5fcnVuX3Rlc3RzKToKKyAgICAgICAgKE1hbmFnZXIuX3VwbG9hZF9q c29uX2ZpbGVzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250 cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoTWFuYWdlclRlc3QuZ2V0X29w dGlvbnMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHMucHk6CisgICAgICAgIChydW4pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5OgorICAgICAgICAoUHJpbnRlci5wcmludF9j b25maWcpOgorICAgICAgICAoUHJpbnRlci5wcmludF93b3JrZXJzX2FuZF9zaGFyZHMpOgorICAg ICAgICAoUHJpbnRlci5fcHJpbnRfY29uZmlnKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZ191bml0dGVzdC5weToKKyAgICAgICAgKFRlc3Rw cmludGVyLnRlc3RfZmFsbGJhY2tfcGF0aF9pbl9jb25maWcpOgorICAgICAgICAoVGVzdHByaW50 ZXIudGVzdF9wcmludF9jb25maWcpOgorCisyMDEyLTA3LTE2ICBEaXJrIFByYW5rZSAgPGRwcmFu a2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIG5yd3Q6IGNsZWFuIHVwIGxvZ2dpbmcgd2hlbiB3 ZSdyZSBvbmx5IHJ1bm5pbmcgb25lIGNodW5rIG9mIHRoZSB0ZXN0cwogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTE0NDcKIApkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIu cHkKaW5kZXggMzAzMWFjZGIxN2M4MDVmZTFlYzIwMDJiNzZjMDYwOTk4OGM0ZDg5Yy4uY2RjODc1 YTNkMzIwYjg5MDJiMjBjMzU5MjY0ZWQ1ZThkYzI1NTFjZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5 CkBAIC02ODksMTYgKzY4OSw2IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBleHRyYWN0X2FuZF9mbGF0dGVuKHNvbWVfc2hh cmRzKSkpCiAgICAgICAgIHJldHVybiBuZXdfc2hhcmRzCiAKLSAgICBkZWYgX2xvZ19udW1fd29y a2VycyhzZWxmLCBudW1fd29ya2VycywgbnVtX3NoYXJkcywgbnVtX2xvY2tlZF9zaGFyZHMpOgot ICAgICAgICBkcml2ZXJfbmFtZSA9IHNlbGYuX3BvcnQuZHJpdmVyX25hbWUoKQotICAgICAgICBp ZiBudW1fd29ya2VycyA9PSAxOgotICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9jb25m aWcoIlJ1bm5pbmcgMSAlcyBvdmVyICVzLiIgJQotICAgICAgICAgICAgICAgIChkcml2ZXJfbmFt ZSwgZ3JhbW1hci5wbHVyYWxpemUoJ3NoYXJkJywgbnVtX3NoYXJkcykpKQotICAgICAgICBlbHNl OgotICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9jb25maWcoIlJ1bm5pbmcgJWQgJXNz IGluIHBhcmFsbGVsIG92ZXIgJWQgc2hhcmRzICglZCBsb2NrZWQpLiIgJQotICAgICAgICAgICAg ICAgIChudW1fd29ya2VycywgZHJpdmVyX25hbWUsIG51bV9zaGFyZHMsIG51bV9sb2NrZWRfc2hh cmRzKSkKLSAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9jb25maWcoJycpCi0KICAgICBkZWYg X3J1bl90ZXN0cyhzZWxmLCBmaWxlX2xpc3QsIHJlc3VsdF9zdW1tYXJ5LCBudW1fd29ya2Vycyk6 CiAgICAgICAgICIiIlJ1bnMgdGhlIHRlc3RzIGluIHRoZSBmaWxlX2xpc3QuCiAKQEAgLTc0MCw3 ICs3MzAsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLnN0YXJ0 X3NlcnZlcnNfd2l0aF9sb2NrKDIgKiBtaW4obnVtX3dvcmtlcnMsIGxlbihsb2NrZWRfc2hhcmRz KSkpCiAKICAgICAgICAgbnVtX3dvcmtlcnMgPSBtaW4obnVtX3dvcmtlcnMsIGxlbihhbGxfc2hh cmRzKSkKLSAgICAgICAgc2VsZi5fbG9nX251bV93b3JrZXJzKG51bV93b3JrZXJzLCBsZW4oYWxs X3NoYXJkcyksIGxlbihsb2NrZWRfc2hhcmRzKSkKKyAgICAgICAgc2VsZi5fcHJpbnRlci5wcmlu dF93b3JrZXJzX2FuZF9zaGFyZHMobnVtX3dvcmtlcnMsIGxlbihhbGxfc2hhcmRzKSwgbGVuKGxv Y2tlZF9zaGFyZHMpKQogCiAgICAgICAgIGRlZiB3b3JrZXJfZmFjdG9yeSh3b3JrZXJfY29ubmVj dGlvbik6CiAgICAgICAgICAgICByZXR1cm4gd29ya2VyLldvcmtlcih3b3JrZXJfY29ubmVjdGlv biwgc2VsZi5yZXN1bHRzX2RpcmVjdG9yeSgpLCBzZWxmLl9vcHRpb25zKQpAQCAtMTA4NCwzMyAr MTA3NCw2IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fZmlsZXN5c3Rl bS5yZW1vdmUodGltZXNfanNvbl9wYXRoKQogICAgICAgICBzZWxmLl9maWxlc3lzdGVtLnJlbW92 ZShpbmNyZW1lbnRhbF9yZXN1bHRzX3BhdGgpCiAKLSAgICBkZWYgcHJpbnRfY29uZmlnKHNlbGYp OgotICAgICAgICAiIiJQcmludHMgdGhlIGNvbmZpZ3VyYXRpb24gZm9yIHRoZSB0ZXN0IHJ1bi4i IiIKLSAgICAgICAgcCA9IHNlbGYuX3ByaW50ZXIKLSAgICAgICAgcC5wcmludF9jb25maWcoIlVz aW5nIHBvcnQgJyVzJyIgJSBzZWxmLl9wb3J0Lm5hbWUoKSkKLSAgICAgICAgcC5wcmludF9jb25m aWcoIlRlc3QgY29uZmlndXJhdGlvbjogJXMiICUgc2VsZi5fcG9ydC50ZXN0X2NvbmZpZ3VyYXRp b24oKSkKLSAgICAgICAgcC5wcmludF9jb25maWcoIlBsYWNpbmcgdGVzdCByZXN1bHRzIGluICVz IiAlIHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5KQotICAgICAgICBpZiBzZWxmLl9vcHRpb25zLm5l d19iYXNlbGluZToKLSAgICAgICAgICAgIHAucHJpbnRfY29uZmlnKCJQbGFjaW5nIG5ldyBiYXNl bGluZXMgaW4gJXMiICUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3BvcnQuYmFz ZWxpbmVfcGF0aCgpKQotCi0gICAgICAgIGZhbGxiYWNrX3BhdGggPSBbc2VsZi5fZmlsZXN5c3Rl bS5zcGxpdCh4KVsxXSBmb3IgeCBpbiBzZWxmLl9wb3J0LmJhc2VsaW5lX3NlYXJjaF9wYXRoKCld Ci0gICAgICAgIHAucHJpbnRfY29uZmlnKCJCYXNlbGluZSBzZWFyY2ggcGF0aDogJXMgLT4gZ2Vu ZXJpYyIgJSAiIC0+ICIuam9pbihmYWxsYmFja19wYXRoKSkKLQotICAgICAgICBwLnByaW50X2Nv bmZpZygiVXNpbmcgJXMgYnVpbGQiICUgc2VsZi5fb3B0aW9ucy5jb25maWd1cmF0aW9uKQotICAg ICAgICBpZiBzZWxmLl9vcHRpb25zLnBpeGVsX3Rlc3RzOgotICAgICAgICAgICAgcC5wcmludF9j b25maWcoIlBpeGVsIHRlc3RzIGVuYWJsZWQiKQotICAgICAgICBlbHNlOgotICAgICAgICAgICAg cC5wcmludF9jb25maWcoIlBpeGVsIHRlc3RzIGRpc2FibGVkIikKLQotICAgICAgICBwLnByaW50 X2NvbmZpZygiUmVndWxhciB0aW1lb3V0OiAlcywgc2xvdyB0ZXN0IHRpbWVvdXQ6ICVzIiAlCi0g ICAgICAgICAgICAgICAgICAgICAgIChzZWxmLl9vcHRpb25zLnRpbWVfb3V0X21zLAotICAgICAg ICAgICAgICAgICAgICAgICAgc2VsZi5fb3B0aW9ucy5zbG93X3RpbWVfb3V0X21zKSkKLQotICAg ICAgICBwLnByaW50X2NvbmZpZygnQ29tbWFuZCBsaW5lOiAnICsKLSAgICAgICAgICAgICAgICAg ICAgICAgJyAnLmpvaW4oc2VsZi5fcG9ydC5kcml2ZXJfY21kX2xpbmUoKSkpCi0gICAgICAgIHAu cHJpbnRfY29uZmlnKCIiKQotCiAgICAgZGVmIF9udW1fZGlnaXRzKHNlbGYsIG51bSk6CiAgICAg ICAgICIiIlJldHVybnMgdGhlIG51bWJlciBvZiBkaWdpdHMgbmVlZGVkIHRvIHJlcHJlc2VudCB0 aGUgbGVuZ3RoIG9mIGEKICAgICAgICAgc2VxdWVuY2UuIiIiCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFu YWdlcl91bml0dGVzdC5weQppbmRleCA1YWE4YjMyZWJjZmNhZTljYzk4Y2M4OTU5ZDUxZjdmMjUx OTNlZDUzLi43YmU2YmQwNDA4OWQyNTQxNzZlMDUyMWFhM2EyZTA2MDg2NTJiOGNiIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5h Z2VyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRlc3QucHkKQEAgLTIwMCwyNSArMjAwLDYgQEAgY2xh c3MgTWFuYWdlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBnZXRfb3B0aW9ucyhz ZWxmKToKICAgICAgICAgcmV0dXJuIE1vY2tPcHRpb25zKHBpeGVsX3Rlc3RzPUZhbHNlLCBuZXdf YmFzZWxpbmU9RmFsc2UsIHRpbWVfb3V0X21zPTYwMDAsIHNsb3dfdGltZV9vdXRfbXM9MzAwMDAs IHdvcmtlcl9tb2RlbD0naW5saW5lJykKIAotICAgIGRlZiBnZXRfcHJpbnRlcihzZWxmKToKLSAg ICAgICAgY2xhc3MgRmFrZVByaW50ZXIob2JqZWN0KToKLSAgICAgICAgICAgIGRlZiBfX2luaXRf XyhzZWxmKToKLSAgICAgICAgICAgICAgICBzZWxmLm91dHB1dCA9IFtdCi0KLSAgICAgICAgICAg IGRlZiBwcmludF9jb25maWcoc2VsZiwgbXNnKToKLSAgICAgICAgICAgICAgICBzZWxmLm91dHB1 dC5hcHBlbmQobXNnKQotCi0gICAgICAgIHJldHVybiBGYWtlUHJpbnRlcigpCi0KLSAgICBkZWYg dGVzdF9mYWxsYmFja19wYXRoX2luX2NvbmZpZyhzZWxmKToKLSAgICAgICAgb3B0aW9ucyA9IHNl bGYuZ2V0X29wdGlvbnMoKQotICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQotICAgICAgICBwb3J0 ID0gaG9zdC5wb3J0X2ZhY3RvcnkuZ2V0KCd0ZXN0LW1hYy1sZW9wYXJkJywgb3B0aW9ucz1vcHRp b25zKQotICAgICAgICBwcmludGVyID0gc2VsZi5nZXRfcHJpbnRlcigpCi0gICAgICAgIG1hbmFn ZXIgPSBNYW5hZ2VyKHBvcnQsIG9wdGlvbnMsIHByaW50ZXIpCi0gICAgICAgIG1hbmFnZXIucHJp bnRfY29uZmlnKCkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdCYXNlbGluZSBzZWFyY2ggcGF0 aDogdGVzdC1tYWMtbGVvcGFyZCAtPiB0ZXN0LW1hYy1zbm93bGVvcGFyZCAtPiBnZW5lcmljJyBp biBwcmludGVyLm91dHB1dCkKLQogICAgIGRlZiB0ZXN0X2h0dHBfbG9ja2luZyh0ZXN0ZXIpOgog ICAgICAgICBvcHRpb25zLCBhcmdzID0gcnVuX3dlYmtpdF90ZXN0cy5wYXJzZV9hcmdzKFsnLS1w bGF0Zm9ybT10ZXN0JywgJy0tcHJpbnQ9bm90aGluZycsICdodHRwL3Rlc3RzL3Bhc3NlcycsICdw YXNzZXMnXSkKICAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IDk2 MWNiYTg0ODJiNTcxZGY2YWJhZTRhNTM1ZDhiYzRlN2FmMjEyOWUuLmVlYTU0NTFiYWRhYjEwN2Qz NWE5MTMxN2UyNmQ0YjY4MzE0ZDE5NWEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMTA5LDcgKzEwOSw3 IEBAIGRlZiBydW4ocG9ydCwgb3B0aW9ucywgYXJncywgcmVndWxhcl9vdXRwdXQ9c3lzLnN0ZGVy ciwgYnVpbGRib3Rfb3V0cHV0PXN5cy5zdGRvCiAgICAgdW5leHBlY3RlZF9yZXN1bHRfY291bnQg PSAtMQogICAgIHRyeToKICAgICAgICAgbWFuYWdlciA9IE1hbmFnZXIocG9ydCwgb3B0aW9ucywg cHJpbnRlcikKLSAgICAgICAgbWFuYWdlci5wcmludF9jb25maWcoKQorICAgICAgICBwcmludGVy LnByaW50X2NvbmZpZygpCiAKICAgICAgICAgcHJpbnRlci5wcmludF91cGRhdGUoIkNvbGxlY3Rp bmcgdGVzdHMgLi4uIikKICAgICAgICAgdHJ5OgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmcucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weQppbmRleCA4OGRmMjk2ZDA5NTMw M2NlODI1NGMyMGY5MzVkZjMwNzFiMjZkNTc5Li40YzU1MGIwYTUxZjA5YWVhZTlhYTZiNDgxZDY3 MDI5NmI4NTAwMzZiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy92aWV3cy9wcmludGluZy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy92aWV3cy9wcmludGluZy5weQpAQCAtMTk0LDYgKzE5NCwzMiBAQCBjbGFzcyBQcmlu dGVyKG9iamVjdCk6CiAgICAgZGVmIGhlbHBfcHJpbnRpbmcoc2VsZik6CiAgICAgICAgIHNlbGYu X3dyaXRlKEhFTFBfUFJJTlRJTkcpCiAKKyAgICBkZWYgcHJpbnRfY29uZmlnKHNlbGYpOgorICAg ICAgICAiIiJQcmludHMgdGhlIGNvbmZpZ3VyYXRpb24gZm9yIHRoZSB0ZXN0IHJ1bi4iIiIKKyAg ICAgICAgc2VsZi5fcHJpbnRfY29uZmlnKCJVc2luZyBwb3J0ICclcyciICUgc2VsZi5fcG9ydC5u YW1lKCkpCisgICAgICAgIHNlbGYuX3ByaW50X2NvbmZpZygiVGVzdCBjb25maWd1cmF0aW9uOiAl cyIgJSBzZWxmLl9wb3J0LnRlc3RfY29uZmlndXJhdGlvbigpKQorICAgICAgICBzZWxmLl9wcmlu dF9jb25maWcoIlBsYWNpbmcgdGVzdCByZXN1bHRzIGluICVzIiAlIHNlbGYuX29wdGlvbnMucmVz dWx0c19kaXJlY3RvcnkpCisKKyAgICAgICAgIyBGSVhNRTogc2hvdWxkIHRoZXNlIG9wdGlvbnMg YmUgaW4gcHJpbnRpbmdfb3B0aW9ucz8KKyAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5uZXdfYmFz ZWxpbmU6CisgICAgICAgICAgICBzZWxmLl9wcmludF9jb25maWcoIlBsYWNpbmcgbmV3IGJhc2Vs aW5lcyBpbiAlcyIgJSBzZWxmLl9wb3J0LmJhc2VsaW5lX3BhdGgoKSkKKworICAgICAgICBmcyA9 IHNlbGYuX3BvcnQuaG9zdC5maWxlc3lzdGVtCisgICAgICAgIGZhbGxiYWNrX3BhdGggPSBbZnMu c3BsaXQoeClbMV0gZm9yIHggaW4gc2VsZi5fcG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aCgpXQor ICAgICAgICBzZWxmLl9wcmludF9jb25maWcoIkJhc2VsaW5lIHNlYXJjaCBwYXRoOiAlcyAtPiBn ZW5lcmljIiAlICIgLT4gIi5qb2luKGZhbGxiYWNrX3BhdGgpKQorCisgICAgICAgIHNlbGYuX3By aW50X2NvbmZpZygiVXNpbmcgJXMgYnVpbGQiICUgc2VsZi5fb3B0aW9ucy5jb25maWd1cmF0aW9u KQorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnBpeGVsX3Rlc3RzOgorICAgICAgICAgICAgc2Vs Zi5fcHJpbnRfY29uZmlnKCJQaXhlbCB0ZXN0cyBlbmFibGVkIikKKyAgICAgICAgZWxzZToKKyAg ICAgICAgICAgIHNlbGYuX3ByaW50X2NvbmZpZygiUGl4ZWwgdGVzdHMgZGlzYWJsZWQiKQorCisg ICAgICAgIHNlbGYuX3ByaW50X2NvbmZpZygiUmVndWxhciB0aW1lb3V0OiAlcywgc2xvdyB0ZXN0 IHRpbWVvdXQ6ICVzIiAlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAoc2VsZi5fb3B0aW9u cy50aW1lX291dF9tcywgc2VsZi5fb3B0aW9ucy5zbG93X3RpbWVfb3V0X21zKSkKKworICAgICAg ICBzZWxmLl9wcmludF9jb25maWcoJ0NvbW1hbmQgbGluZTogJyArICcgJy5qb2luKHNlbGYuX3Bv cnQuZHJpdmVyX2NtZF9saW5lKCkpKQorICAgICAgICBzZWxmLl9wcmludF9jb25maWcoJycpCisK ICAgICBkZWYgcHJpbnRfZXhwZWN0ZWQoc2VsZiwgbnVtX2FsbF90ZXN0X2ZpbGVzLCByZXN1bHRf c3VtbWFyeSwgdGVzdHNfd2l0aF9yZXN1bHRfdHlwZV9jYWxsYmFjayk6CiAgICAgICAgIHNlbGYu X3ByaW50X2V4cGVjdGVkKCdGb3VuZCAlcy4nICUgZ3JhbW1hci5wbHVyYWxpemUoJ3Rlc3QnLCBu dW1fYWxsX3Rlc3RfZmlsZXMpKQogICAgICAgICBzZWxmLl9wcmludF9leHBlY3RlZF9yZXN1bHRz X29mX3R5cGUocmVzdWx0X3N1bW1hcnksIHRlc3RfZXhwZWN0YXRpb25zLlBBU1MsICJwYXNzZXMi LCB0ZXN0c193aXRoX3Jlc3VsdF90eXBlX2NhbGxiYWNrKQpAQCAtMjA5LDYgKzIzNSwxNiBAQCBj bGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMuaXRlcmF0aW9u cyA+IDEgb3Igc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCA+IDE6CiAgICAgICAgICAgICBzZWxm Ll9wcmludF9leHBlY3RlZCgnJykKIAorICAgIGRlZiBwcmludF93b3JrZXJzX2FuZF9zaGFyZHMo c2VsZiwgbnVtX3dvcmtlcnMsIG51bV9zaGFyZHMsIG51bV9sb2NrZWRfc2hhcmRzKToKKyAgICAg ICAgZHJpdmVyX25hbWUgPSBzZWxmLl9wb3J0LmRyaXZlcl9uYW1lKCkKKyAgICAgICAgaWYgbnVt X3dvcmtlcnMgPT0gMToKKyAgICAgICAgICAgIHNlbGYuX3ByaW50X2NvbmZpZygiUnVubmluZyAx ICVzIG92ZXIgJXMuIiAlCisgICAgICAgICAgICAgICAgKGRyaXZlcl9uYW1lLCBncmFtbWFyLnBs dXJhbGl6ZSgnc2hhcmQnLCBudW1fc2hhcmRzKSkpCisgICAgICAgIGVsc2U6CisgICAgICAgICAg ICBzZWxmLl9wcmludF9jb25maWcoIlJ1bm5pbmcgJWQgJXNzIGluIHBhcmFsbGVsIG92ZXIgJWQg c2hhcmRzICglZCBsb2NrZWQpLiIgJQorICAgICAgICAgICAgICAgIChudW1fd29ya2VycywgZHJp dmVyX25hbWUsIG51bV9zaGFyZHMsIG51bV9sb2NrZWRfc2hhcmRzKSkKKyAgICAgICAgc2VsZi5f cHJpbnRfY29uZmlnKCcnKQorCiAgICAgZGVmIF9wcmludF9leHBlY3RlZF9yZXN1bHRzX29mX3R5 cGUoc2VsZiwgcmVzdWx0X3N1bW1hcnksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcmVzdWx0X3R5cGUsIHJlc3VsdF90eXBlX3N0ciwgdGVzdHNfd2l0aF9yZXN1bHRf dHlwZV9jYWxsYmFjayk6CiAgICAgICAgICIiIlByaW50IHRoZSBudW1iZXIgb2YgdGhlIHRlc3Rz IGluIGEgZ2l2ZW4gcmVzdWx0IGNsYXNzLgpAQCAtNDYxLDcgKzQ5Nyw3IEBAIGNsYXNzIFByaW50 ZXIob2JqZWN0KToKICAgICAgICAgICAgIHJldHVybgogICAgICAgICBzZWxmLl9idWlsZGJvdF9z dHJlYW0ud3JpdGUoIiVzXG4iICUgbXNnKQogCi0gICAgZGVmIHByaW50X2NvbmZpZyhzZWxmLCBt c2cpOgorICAgIGRlZiBfcHJpbnRfY29uZmlnKHNlbGYsIG1zZyk6CiAgICAgICAgIHNlbGYud3Jp dGUobXNnLCAnY29uZmlnJykKIAogICAgIGRlZiBfcHJpbnRfZXhwZWN0ZWQoc2VsZiwgbXNnKToK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3By aW50aW5nX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv dmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHkKaW5kZXggNjNkMzJmNDY1OTlmNmFhYjNkZDg4NzI0 NWUyNzNhMzYxNGZlNjM3Zi4uNjJiOTRkN2M5ZDIxMmI1NDc2NDA3MTNiMzhmOTA4MTMzMzc0ZTlk OCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3Mv cHJpbnRpbmdfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHkKQEAgLTE4NCw4ICsxODQsMTkgQEAgY2xh c3MgIFRlc3RwcmludGVyKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgIyBidWlsZGJvdCBp cyBleHBlY3RpbmcuCiAgICAgICAgIHBhc3MKIAorICAgIGRlZiB0ZXN0X2ZhbGxiYWNrX3BhdGhf aW5fY29uZmlnKHNlbGYpOgorICAgICAgICBwcmludGVyLCBlcnIsIG91dCA9IHNlbGYuZ2V0X3By aW50ZXIoWyctLXByaW50JywgJ2V2ZXJ5dGhpbmcnXSkKKyAgICAgICAgIyBGSVhNRTogaXQncyBs YW1lIHRoYXQgaSBoYXZlIHRvIHNldCB0aGVzZSBvcHRpb25zIGRpcmVjdGx5LgorICAgICAgICBw cmludGVyLl9vcHRpb25zLnJlc3VsdHNfZGlyZWN0b3J5ID0gJy90bXAnCisgICAgICAgIHByaW50 ZXIuX29wdGlvbnMucGl4ZWxfdGVzdHMgPSBUcnVlCisgICAgICAgIHByaW50ZXIuX29wdGlvbnMu bmV3X2Jhc2VsaW5lID0gVHJ1ZQorICAgICAgICBwcmludGVyLl9vcHRpb25zLnRpbWVfb3V0X21z ID0gNjAwMAorICAgICAgICBwcmludGVyLl9vcHRpb25zLnNsb3dfdGltZV9vdXRfbXMgPSAxMjAw MAorICAgICAgICBwcmludGVyLnByaW50X2NvbmZpZygpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1 ZSgnQmFzZWxpbmUgc2VhcmNoIHBhdGg6IHRlc3QtbWFjLWxlb3BhcmQgLT4gdGVzdC1tYWMtc25v d2xlb3BhcmQgLT4gZ2VuZXJpYycgaW4gZXJyLmdldHZhbHVlKCkpCisKICAgICBkZWYgdGVzdF9w cmludF9jb25maWcoc2VsZik6Ci0gICAgICAgIHNlbGYuZG9fc3dpdGNoX3Rlc3RzKCdwcmludF9j b25maWcnLCAnY29uZmlnJywgdG9fYnVpbGRib3Q9RmFsc2UpCisgICAgICAgIHNlbGYuZG9fc3dp dGNoX3Rlc3RzKCdfcHJpbnRfY29uZmlnJywgJ2NvbmZpZycsIHRvX2J1aWxkYm90PUZhbHNlKQog CiAgICAgZGVmIHRlc3RfcHJpbnRfZXhwZWN0ZWQoc2VsZik6CiAgICAgICAgIHNlbGYuZG9fc3dp dGNoX3Rlc3RzKCdfcHJpbnRfZXhwZWN0ZWQnLCAnZXhwZWN0ZWQnLCB0b19idWlsZGJvdD1GYWxz ZSkK