54431 2011-02-14 20:34:17 -0800 nrwt multiprocessing: fix various windows-related regressions 2011-02-15 12:13:49 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 dpranke dpranke aroben eric mihaip ojan tony oldest_to_newest 351078 0 dpranke 2011-02-14 20:34:17 -0800 nrwt multiprocessing: fix various windows-related regressions 351081 1 82412 dpranke 2011-02-14 20:46:58 -0800 Created attachment 82412 Patch 351082 2 dpranke 2011-02-14 20:48:58 -0800 I am open to better suggestions if anyone has some ... 351390 3 82412 tony 2011-02-15 10:30:12 -0800 Comment on attachment 82412 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=82412&action=review Seems fine to try. > Tools/Scripts/new-run-webkit-tests:40 > + # (which means a file in sys.path that ends in .py). We use the main > + # file in the layout_tests subdirectory, and we also make sure that > + # sys.path / PYTHONPATH is set and propagating correctly. Nit: The second sentence seems to be repeating what is already stated in the first sentence. > Tools/Scripts/new-run-webkit-tests:43 > + script_dir = os.path.dirname(os.path.abspath(__file__)) > + env = os.environ > + env['PYTHONPATH'] = script_dir Should we append the old PYTHONPATH to script_dir? > Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker_unittest.py:47 > +# In order to reliably control when child workers are starting and stopping, > +# we a pair of global variables to hold queues used for messaging. Ideally Nit: we a pair -> we use a pair? > Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker_unittest.py:51 > Nit: Remove blank line between comment and variables. 351465 4 dpranke 2011-02-15 12:12:54 -0800 Committed r78601: <http://trac.webkit.org/changeset/78601> 351467 5 dpranke 2011-02-15 12:13:49 -0800 (In reply to comment #3) > > Tools/Scripts/new-run-webkit-tests:40 > > + # (which means a file in sys.path that ends in .py). We use the main > > + # file in the layout_tests subdirectory, and we also make sure that > > + # sys.path / PYTHONPATH is set and propagating correctly. > > Nit: The second sentence seems to be repeating what is already stated in the first sentence. > The intent was to be slightly different, but it probably wasn't different enough to be worth it. removed. > > Tools/Scripts/new-run-webkit-tests:43 > > + script_dir = os.path.dirname(os.path.abspath(__file__)) > > + env = os.environ > > + env['PYTHONPATH'] = script_dir > > Should we append the old PYTHONPATH to script_dir? > Done. > > Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker_unittest.py:47 > > +# In order to reliably control when child workers are starting and stopping, > > +# we a pair of global variables to hold queues used for messaging. Ideally > > Nit: we a pair -> we use a pair? > Fixed. > > Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker_unittest.py:51 > > > > Nit: Remove blank line between comment and variables. Fixed. 82412 2011-02-14 20:46:58 -0800 2011-02-15 10:30:12 -0800 Patch bug-54431-20110214204657.patch text/plain 8246 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogNzg1MjgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiYjVlZWIwYTkxZmI3NDBkZjEyZTA5NzcyNDViMjg5MTIx ZmE2NDFlLi44MmM2MGEzMGFkYzU3OWZiODUyNjcwMWZlNTU0ZGYyMjYyYzdlYjgwIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUg QEAKIDIwMTEtMDItMTQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBuZXctcnVu LXdlYmtpdC10ZXN0cyAtLXByb2Nlc3NlcyB3b3JrIHVuZGVyIFdpbmRvd3MnIHdlaXJkCisgICAg ICAgIG11bHRpcHJvY2Vzc2luZyBtb2RlbC4gVGhpcyByZXF1aXJlcyB1cyB0byBiZSBydW5uaW5n IGEgUHl0aG9uCisgICAgICAgIGZpbGUgdGhhdCBjYW4gYmUgaW1wb3J0ZWQgYXMgYSBtb2R1bGUs IHNvIEkndmUgbW9kaWZpZWQgdGhlCisgICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3RzIHNjcmlw dCB0byBzcGF3biBhIHN1YnByb2Nlc3MgcnVuaW5nCisgICAgICAgIHdlYmtpdHB5LmxheW91dF90 ZXN0cy5ydW5fd2Via2l0X3Rlc3RzLnB5LiBJJ3ZlIGFsc28gbW9kaWZpZWQKKyAgICAgICAgdGhl IG1hbmFnZXJfd29ya2VyX2Jyb2tlciB0ZXN0cyBiZWNhdXNlIHlvdSBjYW4ndCBwaWNrbGUgYQor ICAgICAgICBuZXN0ZWQgY2xhc3MuIFRoaXMgcmVxdWlyZXMgdXMgdG8gdXNlIGdsb2JhbHMgdG8g cGFzcyBxdWV1ZXMKKyAgICAgICAgYmFjayBhbmQgZm9ydGggZm9yIHRlc3RpbmcsIGJ1dCB0aGUg YWx0ZXJuYXRpdmUgaXMgdG8gcGFzcyBleHRyYQorICAgICAgICBhcmd1bWVudHMgdG8gc3RhcnRf d29ya2VyKCkgYW5kIHRoYXQgZmVlbHMgbGlrZSBhIGJhZCB0cmFkZW9mZgorICAgICAgICBqdXN0 IGZvciB0ZXN0aW5nLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01NDQzMQorCisgICAgICAgICogU2NyaXB0cy9uZXctcnVuLXdlYmtpdC10ZXN0czoK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9t YW5hZ2VyX3dvcmtlcl9icm9rZXJfdW5pdHRlc3QucHk6CisKKzIwMTEtMDItMTQgIERpcmsgUHJh bmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgVW5yZXZpZXdlZCwgYnVpbGQg Zml4LgogCiAgICAgICAgIEZpeCBtaW5vciByZWdyZXNzaW9uIGludHJvZHVjZWQgaW4gcjc4NTIy LiBGb3Igc29tZSByZWFzb24sIFB5dGhvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9uZXct cnVuLXdlYmtpdC10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvbmV3LXJ1bi13ZWJraXQtdGVzdHMKaW5k ZXggOWZjYWNhYTlkODQxYjAxZjE2NDc4NzY5YWFkNjgxZmJjY2RiNTQ0ZC4uODYxZWQyZTgyMTcw OTIzNDVkYTNiNWI3OTMyYTdiYjYzODczZjI4ZCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9u ZXctcnVuLXdlYmtpdC10ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL25ldy1ydW4td2Via2l0LXRl c3RzCkBAIC0yOCwxNCArMjgsMTkgQEAKICMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KIAogIiIiV3JhcHBlciBhcm91 bmQgd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkiIiIKLWltcG9ydCBz aWduYWwKK2ltcG9ydCBvcworaW1wb3J0IHN1YnByb2Nlc3MKIGltcG9ydCBzeXMKIAotaW1wb3J0 IHdlYmtpdHB5LmxheW91dF90ZXN0cy5ydW5fd2Via2l0X3Rlc3RzIGFzIHJ1bl93ZWJraXRfdGVz dHMKLQogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKLSAgICB0cnk6Ci0gICAgICAgIHN5cy5l eGl0KHJ1bl93ZWJraXRfdGVzdHMubWFpbigpKQotICAgIGV4Y2VwdCBLZXlib2FyZEludGVycnVw dDoKLSAgICAgICAgIyB0aGlzIG1pcnJvcnMgd2hhdCB0aGUgc2hlbGwgbm9ybWFsbHkgZG9lcwot ICAgICAgICBzeXMuZXhpdChzaWduYWwuU0lHSU5UICsgMTI4KQorICAgICMgSW4gb3JkZXIgZm9y IHRoZSBtdWx0aXByb2Nlc3NpbmcgbW9kdWxlIHRvIHNwYXduIGNoaWxkcmVuIGNvcnJlY3RseSBv bgorICAgICMgV2luZG93cywgd2UgbmVlZCB0byBiZSBydW5uaW5nIGEgUHl0aG9uIG1vZHVsZSB0 aGF0IGNhbiBiZSBpbXBvcnRlZAorICAgICMgKHdoaWNoIG1lYW5zIGEgZmlsZSBpbiBzeXMucGF0 aCB0aGF0IGVuZHMgaW4gLnB5KS4gV2UgdXNlIHRoZSBtYWluCisgICAgIyBmaWxlIGluIHRoZSBs YXlvdXRfdGVzdHMgc3ViZGlyZWN0b3J5LCBhbmQgd2UgYWxzbyBtYWtlIHN1cmUgdGhhdAorICAg ICMgc3lzLnBhdGggLyBQWVRIT05QQVRIIGlzIHNldCBhbmQgcHJvcGFnYXRpbmcgY29ycmVjdGx5 LgorICAgIHNjcmlwdF9kaXIgPSBvcy5wYXRoLmRpcm5hbWUob3MucGF0aC5hYnNwYXRoKF9fZmls ZV9fKSkKKyAgICBlbnYgPSBvcy5lbnZpcm9uCisgICAgZW52WydQWVRIT05QQVRIJ10gPSBzY3Jp cHRfZGlyCisgICAgbW9kdWxlX3BhdGggPSBvcy5wYXRoLmpvaW4oc2NyaXB0X2RpciwgJ3dlYmtp dHB5JywgJ2xheW91dF90ZXN0cycsICdydW5fd2Via2l0X3Rlc3RzLnB5JykKKyAgICBjbWQgPSBb c3lzLmV4ZWN1dGFibGUsIG1vZHVsZV9wYXRoXSArIHN5cy5hcmd2WzE6XQorICAgIHN5cy5leGl0 KHN1YnByb2Nlc3MuY2FsbChjbWQsIGVudj1lbnYpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvbWFuYWdlcl93b3JrZXJfYnJv a2VyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5 b3V0X3BhY2thZ2UvbWFuYWdlcl93b3JrZXJfYnJva2VyX3VuaXR0ZXN0LnB5CmluZGV4IDRiYWY0 NzI4ZjU2MWNjYzUyNTkwZWU4MmY3ZmU1MTZkMTFiOTIzMzIuLmRlMDg5OGY0ZDBkOGZiZjMyOGQ5 Y2VmOWJmMWUxNzVmZTg4ZmJhNzcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21hbmFnZXJfd29ya2VyX2Jyb2tlcl91bml0dGVz dC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFj a2FnZS9tYW5hZ2VyX3dvcmtlcl9icm9rZXJfdW5pdHRlc3QucHkKQEAgLTQzLDQ4ICs0Myw2NSBA QCBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cyBpbXBvcnQgcG9ydAogZnJvbSB3ZWJraXRweS5s YXlvdXRfdGVzdHMubGF5b3V0X3BhY2thZ2UgaW1wb3J0IG1hbmFnZXJfd29ya2VyX2Jyb2tlcgog ZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubGF5b3V0X3BhY2thZ2UgaW1wb3J0IG1lc3NhZ2Vf YnJva2VyMgogCisjIEluIG9yZGVyIHRvIHJlbGlhYmx5IGNvbnRyb2wgd2hlbiBjaGlsZCB3b3Jr ZXJzIGFyZSBzdGFydGluZyBhbmQgc3RvcHBpbmcsCisjIHdlIGEgcGFpciBvZiBnbG9iYWwgdmFy aWFibGVzIHRvIGhvbGQgcXVldWVzIHVzZWQgZm9yIG1lc3NhZ2luZy4gSWRlYWxseQorIyB3ZSB3 b3VsZG4ndCBuZWVkIGdsb2JhbHMsIGJ1dCB3ZSBjYW4ndCBwYXNzIHRoZXNlIHRocm91Z2ggYSBs ZXhpY2FsIGNsb3N1cmUKKyMgYmVjYXVzZSB0aG9zZSBjYW4ndCBiZSBQaWNrbGVkIGFuZCBzZW50 IHRvIGEgc3VicHJvY2VzcywgYW5kIHdlJ2QgcHJlZmVyIG5vdAorIyB0byBoYXZlIHRvIHBhc3Mg ZXh0cmEgYXJndW1lbnRzIHRvIHRoZSB3b3JrZXIgaW4gdGhlIHN0YXJ0X3dvcmtlcigpIGNhbGwu CiAKLWRlZiB3b3JrZXJfbWFrZXIoc3RhcnRpbmdfcXVldWU9Tm9uZSwgc3RvcHBpbmdfcXVldWU9 Tm9uZSk6Ci0gICAgY2xhc3MgX1Rlc3RXb3JrZXIobWFuYWdlcl93b3JrZXJfYnJva2VyLkFic3Ry YWN0V29ya2VyKToKLSAgICAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGJyb2tlcl9jb25uZWN0aW9u LCB3b3JrZXJfbnVtYmVyLCBvcHRpb25zKToKLSAgICAgICAgICAgIHNlbGYuX2Jyb2tlcl9jb25u ZWN0aW9uID0gYnJva2VyX2Nvbm5lY3Rpb24KLSAgICAgICAgICAgIHNlbGYuX29wdGlvbnMgPSBv cHRpb25zCi0gICAgICAgICAgICBzZWxmLl93b3JrZXJfbnVtYmVyID0gd29ya2VyX251bWJlcgot ICAgICAgICAgICAgc2VsZi5fbmFtZSA9ICdUZXN0V29ya2VyLyVkJyAlIHdvcmtlcl9udW1iZXIK LSAgICAgICAgICAgIHNlbGYuX3N0b3BwZWQgPSBGYWxzZQotICAgICAgICAgICAgc2VsZi5fY2Fu Y2VsZWQgPSBGYWxzZQotICAgICAgICAgICAgc2VsZi5fc3RhcnRpbmdfcXVldWUgPSBzdGFydGlu Z19xdWV1ZQotICAgICAgICAgICAgc2VsZi5fc3RvcHBpbmdfcXVldWUgPSBzdG9wcGluZ19xdWV1 ZQotCi0gICAgICAgIGRlZiBoYW5kbGVfc3RvcChzZWxmLCBzcmMpOgotICAgICAgICAgICAgc2Vs Zi5fc3RvcHBlZCA9IFRydWUKLQotICAgICAgICBkZWYgaGFuZGxlX3Rlc3Qoc2VsZiwgc3JjLCBh bl9pbnQsIGFfc3RyKToKLSAgICAgICAgICAgIGFzc2VydCBhbl9pbnQgPT0gMQotICAgICAgICAg ICAgYXNzZXJ0IGFfc3RyID09ICJoZWxsbywgd29ybGQiCi0gICAgICAgICAgICBzZWxmLl9icm9r ZXJfY29ubmVjdGlvbi5wb3N0X21lc3NhZ2UoJ3Rlc3QnLCAyLCAnaGksIGV2ZXJ5Ym9keScpCi0K LSAgICAgICAgZGVmIGlzX2RvbmUoc2VsZik6Ci0gICAgICAgICAgICByZXR1cm4gc2VsZi5fc3Rv cHBlZCBvciBzZWxmLl9jYW5jZWxlZAotCi0gICAgICAgIGRlZiBuYW1lKHNlbGYpOgotICAgICAg ICAgICAgcmV0dXJuIHNlbGYuX25hbWUKLQotICAgICAgICBkZWYgY2FuY2VsKHNlbGYpOgotICAg ICAgICAgICAgc2VsZi5fY2FuY2VsZWQgPSBUcnVlCi0KLSAgICAgICAgZGVmIHJ1bihzZWxmLCBw b3J0KToKLSAgICAgICAgICAgIGlmIHNlbGYuX3N0YXJ0aW5nX3F1ZXVlOgotICAgICAgICAgICAg ICAgIHNlbGYuX3N0YXJ0aW5nX3F1ZXVlLnB1dCgnJykKLSAgICAgICAgICAgIGlmIHNlbGYuX3N0 b3BwaW5nX3F1ZXVlOgotICAgICAgICAgICAgICAgIHNlbGYuX3N0b3BwaW5nX3F1ZXVlLmdldCgp Ci0gICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgc2VsZi5fYnJva2VyX2Nvbm5lY3Rp b24ucnVuX21lc3NhZ2VfbG9vcCgpCi0gICAgICAgICAgICAgICAgc2VsZi5fYnJva2VyX2Nvbm5l Y3Rpb24ueWllbGRfdG9fYnJva2VyKCkKLSAgICAgICAgICAgICAgICBzZWxmLl9icm9rZXJfY29u bmVjdGlvbi5wb3N0X21lc3NhZ2UoJ2RvbmUnKQotICAgICAgICAgICAgZXhjZXB0IEV4Y2VwdGlv biwgZToKLSAgICAgICAgICAgICAgICBzZWxmLl9icm9rZXJfY29ubmVjdGlvbi5wb3N0X21lc3Nh Z2UoJ2V4Y2VwdGlvbicsICh0eXBlKGUpLCBzdHIoZSksIE5vbmUpKQotICAgIHJldHVybiBfVGVz dFdvcmtlcgorc3RhcnRpbmdfcXVldWUgPSBOb25lCitzdG9wcGluZ19xdWV1ZSA9IE5vbmUKKwor CitkZWYgbWFrZV9icm9rZXIobWFuYWdlciwgd29ya2VyX21vZGVsLCBzdGFydF9xdWV1ZT1Ob25l LCBzdG9wX3F1ZXVlPU5vbmUpOgorICAgIGdsb2JhbCBzdGFydGluZ19xdWV1ZQorICAgIGdsb2Jh bCBzdG9wcGluZ19xdWV1ZQorICAgIHN0YXJ0aW5nX3F1ZXVlID0gc3RhcnRfcXVldWUKKyAgICBz dG9wcGluZ19xdWV1ZSA9IHN0b3BfcXVldWUKKyAgICBvcHRpb25zID0gZ2V0X29wdGlvbnMod29y a2VyX21vZGVsKQorICAgIHJldHVybiBtYW5hZ2VyX3dvcmtlcl9icm9rZXIuZ2V0KHBvcnQuZ2V0 KCJ0ZXN0IiksIG9wdGlvbnMsIG1hbmFnZXIsIF9UZXN0V29ya2VyKQorCisKK2NsYXNzIF9UZXN0 V29ya2VyKG1hbmFnZXJfd29ya2VyX2Jyb2tlci5BYnN0cmFjdFdvcmtlcik6CisgICAgZGVmIF9f aW5pdF9fKHNlbGYsIGJyb2tlcl9jb25uZWN0aW9uLCB3b3JrZXJfbnVtYmVyLCBvcHRpb25zKToK KyAgICAgICAgc2VsZi5fYnJva2VyX2Nvbm5lY3Rpb24gPSBicm9rZXJfY29ubmVjdGlvbgorICAg ICAgICBzZWxmLl9vcHRpb25zID0gb3B0aW9ucworICAgICAgICBzZWxmLl93b3JrZXJfbnVtYmVy ID0gd29ya2VyX251bWJlcgorICAgICAgICBzZWxmLl9uYW1lID0gJ1Rlc3RXb3JrZXIvJWQnICUg d29ya2VyX251bWJlcgorICAgICAgICBzZWxmLl9zdG9wcGVkID0gRmFsc2UKKyAgICAgICAgc2Vs Zi5fY2FuY2VsZWQgPSBGYWxzZQorICAgICAgICBzZWxmLl9zdGFydGluZ19xdWV1ZSA9IHN0YXJ0 aW5nX3F1ZXVlCisgICAgICAgIHNlbGYuX3N0b3BwaW5nX3F1ZXVlID0gc3RvcHBpbmdfcXVldWUK KworICAgIGRlZiBoYW5kbGVfc3RvcChzZWxmLCBzcmMpOgorICAgICAgICBzZWxmLl9zdG9wcGVk ID0gVHJ1ZQorCisgICAgZGVmIGhhbmRsZV90ZXN0KHNlbGYsIHNyYywgYW5faW50LCBhX3N0cik6 CisgICAgICAgIGFzc2VydCBhbl9pbnQgPT0gMQorICAgICAgICBhc3NlcnQgYV9zdHIgPT0gImhl bGxvLCB3b3JsZCIKKyAgICAgICAgc2VsZi5fYnJva2VyX2Nvbm5lY3Rpb24ucG9zdF9tZXNzYWdl KCd0ZXN0JywgMiwgJ2hpLCBldmVyeWJvZHknKQorCisgICAgZGVmIGlzX2RvbmUoc2VsZik6Cisg ICAgICAgIHJldHVybiBzZWxmLl9zdG9wcGVkIG9yIHNlbGYuX2NhbmNlbGVkCisKKyAgICBkZWYg bmFtZShzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYuX25hbWUKKworICAgIGRlZiBjYW5jZWwo c2VsZik6CisgICAgICAgIHNlbGYuX2NhbmNlbGVkID0gVHJ1ZQorCisgICAgZGVmIHJ1bihzZWxm LCBwb3J0KToKKyAgICAgICAgaWYgc2VsZi5fc3RhcnRpbmdfcXVldWU6CisgICAgICAgICAgICBz ZWxmLl9zdGFydGluZ19xdWV1ZS5wdXQoJycpCisKKyAgICAgICAgaWYgc2VsZi5fc3RvcHBpbmdf cXVldWU6CisgICAgICAgICAgICBzZWxmLl9zdG9wcGluZ19xdWV1ZS5nZXQoKQorICAgICAgICB0 cnk6CisgICAgICAgICAgICBzZWxmLl9icm9rZXJfY29ubmVjdGlvbi5ydW5fbWVzc2FnZV9sb29w KCkKKyAgICAgICAgICAgIHNlbGYuX2Jyb2tlcl9jb25uZWN0aW9uLnlpZWxkX3RvX2Jyb2tlcigp CisgICAgICAgICAgICBzZWxmLl9icm9rZXJfY29ubmVjdGlvbi5wb3N0X21lc3NhZ2UoJ2RvbmUn KQorICAgICAgICBleGNlcHQgRXhjZXB0aW9uLCBlOgorICAgICAgICAgICAgc2VsZi5fYnJva2Vy X2Nvbm5lY3Rpb24ucG9zdF9tZXNzYWdlKCdleGNlcHRpb24nLCAodHlwZShlKSwgc3RyKGUpLCBO b25lKSkKIAogCiBkZWYgZ2V0X29wdGlvbnMod29ya2VyX21vZGVsKToKQEAgLTk0LDExICsxMTEs NiBAQCBkZWYgZ2V0X29wdGlvbnMod29ya2VyX21vZGVsKToKICAgICByZXR1cm4gb3B0aW9ucwog CiAKLWRlZiBtYWtlX2Jyb2tlcihtYW5hZ2VyLCB3b3JrZXJfbW9kZWwsIHN0YXJ0aW5nX3F1ZXVl PU5vbmUsIHN0b3BwaW5nX3F1ZXVlPU5vbmUpOgotICAgIG9wdGlvbnMgPSBnZXRfb3B0aW9ucyh3 b3JrZXJfbW9kZWwpCi0gICAgcmV0dXJuIG1hbmFnZXJfd29ya2VyX2Jyb2tlci5nZXQocG9ydC5n ZXQoInRlc3QiKSwgb3B0aW9ucywgbWFuYWdlciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB3b3JrZXJfbWFrZXIoc3RhcnRpbmdfcXVldWUsIHN0b3BwaW5nX3F1ZXVlKSkK LQogCiBjbGFzcyBGdW5jdGlvblRlc3RzKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVz dF9nZXRfX2lubGluZShzZWxmKToKQEAgLTI1OCw3ICsyNzAsNyBAQCBjbGFzcyBJbnRlcmZhY2VU ZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgIyBUZXN0IHRoYXQgYWxsIHRoZSBiYXNl IGNsYXNzIG1ldGhvZHMgYXJlIGFic3RyYWN0IGFuZCBoYXZlIHRoZQogICAgICAgICAjIHNpZ25h dHVyZSB3ZSBleHBlY3QuCiAgICAgICAgIGJyb2tlciA9IG1ha2VfYnJva2VyKHNlbGYsICdpbmxp bmUnKQotICAgICAgICBvYmogPSBtYW5hZ2VyX3dvcmtlcl9icm9rZXIuX1dvcmtlckNvbm5lY3Rp b24oYnJva2VyLl9icm9rZXIsIHdvcmtlcl9tYWtlcigpLCAwLCBOb25lKQorICAgICAgICBvYmog PSBtYW5hZ2VyX3dvcmtlcl9icm9rZXIuX1dvcmtlckNvbm5lY3Rpb24oYnJva2VyLl9icm9rZXIs IF9UZXN0V29ya2VyLCAwLCBOb25lKQogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhOb3RJbXBs ZW1lbnRlZEVycm9yLCBvYmouY2FuY2VsKQogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhOb3RJ bXBsZW1lbnRlZEVycm9yLCBvYmouaXNfYWxpdmUpCiAgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2Vz KE5vdEltcGxlbWVudGVkRXJyb3IsIG9iai5qb2luLCBOb25lKQo=