119631 2013-08-09 08:25:32 -0700 [webkitpy] perf profiler attaches to WKTR after the WebProcess was launched 2013-09-15 02:28:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan commit-queue dpranke glenn rniwa oldest_to_newest 915837 0 zan 2013-08-09 08:25:32 -0700 [webkitpy] perf profiler attaches to WKTR after the WebProcess was launched 915847 1 208437 zan 2013-08-09 08:45:36 -0700 Created attachment 208437 Patch 926825 2 208437 rniwa 2013-09-09 11:59:16 -0700 Comment on attachment 208437 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208437&action=review > Tools/Scripts/webkitpy/common/system/profiler.py:-162 > - if perf_exitcode is None: # This should always be the case, unless perf error'd out early. > - self._host.executive.interrupt(self._perf_process.pid) > - > - perf_exitcode = self._perf_process.wait() > - if perf_exitcode not in (0, -2): # The exit code should always be -2, as we're always interrupting perf. > - print "'perf record' failed (exit code: %i), can't process results:" % perf_exitcode > - return Who is catching the error now? > Tools/Scripts/webkitpy/port/driver.py:218 > + if self._port.get_option('wrapper'): Why don't we store this on a temporary variable? 927253 3 211188 zan 2013-09-10 03:45:24 -0700 Created attachment 211188 Patch 929398 4 zan 2013-09-15 02:25:54 -0700 Thanks! 929399 5 211188 zan 2013-09-15 02:28:50 -0700 Comment on attachment 211188 Patch Clearing flags on attachment: 211188 Committed r155803: <http://trac.webkit.org/changeset/155803> 929400 6 zan 2013-09-15 02:28:56 -0700 All reviewed patches have been landed. Closing bug. 208437 2013-08-09 08:45:36 -0700 2013-09-10 03:45:19 -0700 Patch bug-119631-20130809084534.patch text/plain 8945 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzODg0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGM3YjNkOTJjMTIxM2NjNTcxZTQzOGUyNjI1NGFmMzgw N2Y5ZDlkMy4uNTllZTIwMGEwNmZhZmQwYzBiOWVlNjIxYTYzNTc2MTdkM2IzMGI2ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQx IEBACisyMDEzLTA4LTA5ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKwor ICAgICAgICBbd2Via2l0cHldIHBlcmYgcHJvZmlsZXIgYXR0YWNoZXMgdG8gV0tUUiBhZnRlciB0 aGUgV2ViUHJvY2VzcyB3YXMgbGF1bmNoZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExOTYzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZSBwZXJmIHByb2ZpbGVyIGlzIGF0dGFjaGVkIHRvIHRoZSB0 ZXN0IHJ1bm5lciBhZnRlciB0aGUgdGVzdCBydW5uZXIgaGFzIGJlZW4gbGF1bmNoZWQsCisgICAg ICAgIGJ1dCBpbiB0aGUgY2FzZSBvZiBXZWJLaXRUZXN0UnVubmVyLCB0aGlzIGlzIGRvbmUgYWZ0 ZXIgdGhlIFdlYlByb2Nlc3Mgd2FzIHNwYXduZWQgYnkgdGhlCisgICAgICAgIFVJUHJvY2Vzcywg bWVhbmluZyB0aGF0IFdlYlByb2Nlc3Mgb3BlcmF0aW9ucyB3aWxsIG5vdCBiZSBwcm9maWxlZC4K KworICAgICAgICBUbyBhdm9pZCB0aGF0LCB0aGUgcGVyZiBwcm9maWxlciBpcyBjaGFuZ2VkIHRv IHByb3ZpZGUgYSB3cmFwcGVyIGNvbW1hbmQgZm9yIHRoZSB0ZXN0IHJ1bm5lci4KKyAgICAgICAg VGhpcyBpcyBkb25lIGluIHRoZSBzY29wZSBvZiBhbHJlYWR5IHByZXNlbnQgc3VwcG9ydCBmb3Ig d3JhcHBlciBzY3JpcHRzIChzdWNoIGFzIHZhbGdyaW5kKQorICAgICAgICB0aGF0IGFyZSBzZXR0 YWJsZSB0aHJvdWdoIHRoZSAtLXdyYXBwZXIgb3B0aW9uLiBUaGlzIGNhdXNlcyB0aGUgcGVyZiBw cm9maWxlciB0byBjb3JyZWN0bHkKKyAgICAgICAgY29udGludWUgcHJvZmlsaW5nIHRoZSBXZWJQ cm9jZXNzIGFmdGVyIGl0IHdhcyBzcGF3bmVkLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9jb21tb24vc3lzdGVtL3Byb2ZpbGVyLnB5OgorICAgICAgICAoUHJvZmlsZXIud3JhcHBlcl9h cmd1bWVudHMpOiBUaGUgbWV0aG9kIHJldHVybnMgYW4gZW1wdHkgbGlzdCBieSBkZWZhdWx0Lgor ICAgICAgICAoUGVyZi5fX2luaXRfXyk6IFJlbW92ZSB1bm5lY2Vzc2FyeSBtZW1iZXIgdmFyaWFi bGVzLgorICAgICAgICAoUGVyZi53cmFwcGVyX2FyZ3VtZW50cyk6IFVzZWQgaW5zdGVhZCBvZiBh dHRhY2hfdG9fcGlkLCB0aGUgbWV0aG9kIHJldHVybnMgYSBsaXN0IG9mIGFyZ3VtZW50cworICAg ICAgICB0aGF0IGFyZSB0byBiZSB1c2VkIGFzIGEgd3JhcHBlciBmb3IgdGhlIHRlc3QgcnVubmVy LiBUaGUgYXJndW1lbnRzIHNwZWNpZnkgdGhlICdwZXJmIHJlY29yZCcKKyAgICAgICAgY29tbWFu ZCwgd2l0aCB0aGUgb3V0cHV0IGZpbGUgYW5kIHRoZSBpbnN0cnVjdGlvbiB0byBjb25zdHJ1Y3Qg dGhlIGNhbGwgZ3JhcGggZ2l2ZW4gYXMgd2VsbC4KKyAgICAgICAgKFBlcmYucHJvZmlsZV9hZnRl cl9leHQpOiBUaGUgcGVyZiBwcm9jZXNzIG5vdyBleGl0cyBhZnRlciB0aGUgdGVzdCBydW5uZXIs IHNvIHRoZXJlJ3Mgbm8gbmVlZAorICAgICAgICB0byBtYW5hZ2UgdGhlIHByb2Nlc3MnIGNsb3N1 cmUuIFRoaXMgbGVhdmVzIG9ubHkgZm9yIHRoZSAncGVyZiByZXBvcnQnIHN1bW1hcnkgdG8gYmUg cHJpbnRlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5OgorICAg ICAgICAoRHJpdmVyLl9jb21tYW5kX3dyYXBwZXIpOiBUaGUgbWV0aG9kIGlzIG5vdyBhIG1lbWJl ciBvZiB0aGUgRHJpdmVyIGNsYXNzLCByZXR1cm5pbmcgdGhlIHdyYXBwZXIKKyAgICAgICAgYXMg c3BlY2lmaWVkIGJ5IHRoZSAtLXdyYXBwZXIgb3B0aW9uIGlmIGdpdmVuLCBvciB0aGUgcHJvZmls ZXIgd3JhcHBlciBpZiB0aGUgcHJvZmlsZXIgaXMgcHJlc2VudCwKKyAgICAgICAgb3IgYW4gZW1w dHkgbGlzdCBvdGhlcndpc2UuCisgICAgICAgIChEcml2ZXIuY21kX2xpbmUpOgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChEcml2 ZXJUZXN0Lm1ha2VfcG9ydCk6IEFkanVzdGVkIHNvIG1vY2sgaG9zdCBvciBvcHRpb25zIG9iamVj dHMgY2FuIGJlIHNwZWNpZmllZAorICAgICAgICBmb3IgdGhlIHRlc3Rpbmctc3BlY2lmaWMgUG9y dCBvYmplY3QuCisgICAgICAgIChEcml2ZXJUZXN0Ll9hc3NlcnRfd3JhcHBlcik6IFBhc3MgYSBN b2NrT3B0aW9ucyBvYmplY3Qgd2l0aCB0aGUgd3JhcHBlciB2YWx1ZSB0byB0aGUgbWFrZV9wb3J0 IG1ldGhvZCwKKyAgICAgICAgYXMgdGhlIERyaXZlci5fY29tbWFuZF93cmFwcGVyIG5vdyBvcGVy YXRlcyBvbiB0aGUgb3B0aW9uJ3MgdmFsdWUgZGlyZWN0bHkgcmF0aGVyIHRoYW4gYWNjZXB0aW5n IGl0IHRocm91Z2gKKyAgICAgICAgYSBwYXJhbWV0ZXIuCisgICAgICAgIChEcml2ZXJUZXN0LnRl c3RfcHJvZmlsZXJfYXNfd3JhcHBlcik6IFByb3ZpZGUgYSB0ZXN0IGNhc2UgdG8gY2hlY2sgdGhl IGNvcnJlY3QgcHJvZmlsZXIgd3JhcHBlciBpcyB1c2VkCisgICAgICAgIHdoZW4gcHJvZmlsaW5n IG9uIHRoZSBMaW51eCBwbGF0Zm9ybSB3aXRoIHRoZSBwZXJmIHByb2ZpbGVyLgorCiAyMDEzLTA4 LTA4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQGFwcGxlLmNvbT4KIAogICAgICAg ICBXaW5kb3dzIGJ1aWxkIGZpeGVzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vc3lzdGVtL3Byb2ZpbGVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vc3lzdGVtL3Byb2ZpbGVyLnB5CmluZGV4IDAyMDhjZjg5OGViMmRiNjQ3ZWMzODJjOTAzNWY1 Zjc5OGI3YjNkNDkuLmVhZTVkODQwNDhlZmQ5N2Y3NmQzNGJhNDNjY2M3MGZjODNiYjI0YmMgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wcm9maWxlci5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcHJvZmlsZXIucHkK QEAgLTc5LDYgKzc5LDkgQEAgY2xhc3MgUHJvZmlsZXIob2JqZWN0KToKICAgICBkZWYgYXR0YWNo X3RvX3BpZChzZWxmLCBwaWQpOgogICAgICAgICBwYXNzCiAKKyAgICBkZWYgd3JhcHBlcl9hcmd1 bWVudHMoc2VsZik6CisgICAgICAgIHJldHVybiBbXQorCiAgICAgZGVmIHByb2ZpbGVfYWZ0ZXJf ZXhpdChzZWxmKToKICAgICAgICAgcGFzcwogCkBAIC0xMzEsMzYgKzEzNCwxOSBAQCBjbGFzcyBQ ZXJmKFNpbmdsZUZpbGVPdXRwdXRQcm9maWxlcik6CiAKICAgICBkZWYgX19pbml0X18oc2VsZiwg aG9zdCwgZXhlY3V0YWJsZV9wYXRoLCBvdXRwdXRfZGlyLCBpZGVudGlmaWVyPU5vbmUpOgogICAg ICAgICBzdXBlcihQZXJmLCBzZWxmKS5fX2luaXRfXyhob3N0LCBleGVjdXRhYmxlX3BhdGgsIG91 dHB1dF9kaXIsICJkYXRhIiwgaWRlbnRpZmllcikKLSAgICAgICAgc2VsZi5fcGVyZl9wcm9jZXNz ID0gTm9uZQotICAgICAgICBzZWxmLl9waWRfYmVpbmdfcHJvZmlsZWQgPSBOb25lCiAKICAgICBk ZWYgX3BlcmZfcGF0aChzZWxmKToKICAgICAgICAgIyBGSVhNRTogV2UgbWF5IG5lZWQgdG8gc3Vw cG9ydCBmaW5kaW5nIHRoZSBwZXJmIGJpbmFyeSBpbiBvdGhlciBsb2NhdGlvbnMuCiAgICAgICAg IHJldHVybiAncGVyZicKIAotICAgIGRlZiBhdHRhY2hfdG9fcGlkKHNlbGYsIHBpZCk6Ci0gICAg ICAgIGFzc2VydChub3Qgc2VsZi5fcGVyZl9wcm9jZXNzIGFuZCBub3Qgc2VsZi5fcGlkX2JlaW5n X3Byb2ZpbGVkKQotICAgICAgICBzZWxmLl9waWRfYmVpbmdfcHJvZmlsZWQgPSBwaWQKLSAgICAg ICAgY21kID0gW3NlbGYuX3BlcmZfcGF0aCgpLCAicmVjb3JkIiwgIi0tY2FsbC1ncmFwaCIsICIt LXBpZCIsIHBpZCwgIi0tb3V0cHV0Iiwgc2VsZi5fb3V0cHV0X3BhdGhdCi0gICAgICAgIHNlbGYu X3BlcmZfcHJvY2VzcyA9IHNlbGYuX2hvc3QuZXhlY3V0aXZlLnBvcGVuKGNtZCkKKyAgICBkZWYg d3JhcHBlcl9hcmd1bWVudHMoc2VsZik6CisgICAgICAgIHJldHVybiBbc2VsZi5fcGVyZl9wYXRo KCksICJyZWNvcmQiLCAiLS1jYWxsLWdyYXBoIiwgIi0tb3V0cHV0Iiwgc2VsZi5fb3V0cHV0X3Bh dGhdCiAKICAgICBkZWYgX2ZpcnN0X3Rlbl9saW5lc19vZl9wcm9maWxlKHNlbGYsIHBlcmZfb3V0 cHV0KToKICAgICAgICAgbWF0Y2ggPSByZS5zZWFyY2goIl4jW15cbl0qXG4oKD86IFteXG5dKlxu KXsxLDEwfSkiLCBwZXJmX291dHB1dCwgcmUuTVVMVElMSU5FKQogICAgICAgICByZXR1cm4gbWF0 Y2guZ3JvdXAoMSkgaWYgbWF0Y2ggZWxzZSBOb25lCiAKICAgICBkZWYgcHJvZmlsZV9hZnRlcl9l eGl0KHNlbGYpOgotICAgICAgICAjIFBlcmYgZG9lc24ndCBhdXRvbWF0aWNhbGx5IHdhdGNoIHRo ZSBhdHRhY2hlZCBwaWQgZm9yIGRlYXRoIG5vdGlmaWNhdGlvbnMsCi0gICAgICAgICMgc28gd2Ug aGF2ZSB0byBkbyBpdCBmb3IgaXQsIGFuZCB0aGVuIHRlbGwgaXQgaXRzIHRpbWUgdG8gc3RvcCBz YW1wbGluZy4gOigKLSAgICAgICAgc2VsZi5faG9zdC5leGVjdXRpdmUud2FpdF9saW1pdGVkKHNl bGYuX3BpZF9iZWluZ19wcm9maWxlZCwgbGltaXRfaW5fc2Vjb25kcz0xMCkKLSAgICAgICAgcGVy Zl9leGl0Y29kZSA9IHNlbGYuX3BlcmZfcHJvY2Vzcy5wb2xsKCkKLSAgICAgICAgaWYgcGVyZl9l eGl0Y29kZSBpcyBOb25lOiAgIyBUaGlzIHNob3VsZCBhbHdheXMgYmUgdGhlIGNhc2UsIHVubGVz cyBwZXJmIGVycm9yJ2Qgb3V0IGVhcmx5LgotICAgICAgICAgICAgc2VsZi5faG9zdC5leGVjdXRp dmUuaW50ZXJydXB0KHNlbGYuX3BlcmZfcHJvY2Vzcy5waWQpCi0KLSAgICAgICAgcGVyZl9leGl0 Y29kZSA9IHNlbGYuX3BlcmZfcHJvY2Vzcy53YWl0KCkKLSAgICAgICAgaWYgcGVyZl9leGl0Y29k ZSBub3QgaW4gKDAsIC0yKTogICMgVGhlIGV4aXQgY29kZSBzaG91bGQgYWx3YXlzIGJlIC0yLCBh cyB3ZSdyZSBhbHdheXMgaW50ZXJydXB0aW5nIHBlcmYuCi0gICAgICAgICAgICBwcmludCAiJ3Bl cmYgcmVjb3JkJyBmYWlsZWQgKGV4aXQgY29kZTogJWkpLCBjYW4ndCBwcm9jZXNzIHJlc3VsdHM6 IiAlIHBlcmZfZXhpdGNvZGUKLSAgICAgICAgICAgIHJldHVybgotCiAgICAgICAgIHBlcmZfYXJn cyA9IFtzZWxmLl9wZXJmX3BhdGgoKSwgJ3JlcG9ydCcsICctLWNhbGwtZ3JhcGgnLCAnbm9uZScs ICctLWlucHV0Jywgc2VsZi5fb3V0cHV0X3BhdGhdCiAgICAgICAgIHByaW50ICJGaXJzdCAxMCBs aW5lcyBvZiAncGVyZiByZXBvcnQgLS1jYWxsLWdyYXBoPW5vbmUnOiIKIApkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9kcml2ZXIucHkKaW5kZXggNTA2MWJkNmQxZjIxOTJlNmNiOTRkY2Q3YjMzNjI5 YTYzZjMyMGMwNy4uMzYyMjI4YWFkNjRhYTA1Mjg3YzdiNWMyMTIyZThiODNjYWRkZTA2ZiAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlci5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CkBAIC0yMTMsMTIgKzIxMywxMyBAQCBj bGFzcyBEcml2ZXIob2JqZWN0KToKICAgICBkZWYgX2dldF9jcmFzaF9sb2coc2VsZiwgc3Rkb3V0 LCBzdGRlcnIsIG5ld2VyX3RoYW4pOgogICAgICAgICByZXR1cm4gc2VsZi5fcG9ydC5fZ2V0X2Ny YXNoX2xvZyhzZWxmLl9jcmFzaGVkX3Byb2Nlc3NfbmFtZSwgc2VsZi5fY3Jhc2hlZF9waWQsIHN0 ZG91dCwgc3RkZXJyLCBuZXdlcl90aGFuKQogCi0gICAgIyBGSVhNRTogU2VlbXMgdGhpcyBjb3Vs ZCBqdXN0IGJlIGlubGluZWQgaW50byBjYWxsZXJzLgotICAgIEBjbGFzc21ldGhvZAotICAgIGRl ZiBfY29tbWFuZF93cmFwcGVyKGNscywgd3JhcHBlcl9vcHRpb24pOgotICAgICAgICAjIEhvb2sg Zm9yIGluamVjdGluZyB2YWxncmluZCBvciBvdGhlciBydW50aW1lIGluc3RydW1lbnRhdGlvbiwK LSAgICAgICAgIyB1c2VkIGJ5IGUuZy4gdG9vbHMvdmFsZ3JpbmQvdmFsZ3JpbmRfdGVzdHMucHku Ci0gICAgICAgIHJldHVybiBzaGxleC5zcGxpdCh3cmFwcGVyX29wdGlvbikgaWYgd3JhcHBlcl9v cHRpb24gZWxzZSBbXQorICAgIGRlZiBfY29tbWFuZF93cmFwcGVyKHNlbGYpOgorICAgICAgICAj IEhvb2sgZm9yIGluamVjdGluZyB2YWxncmluZCBvciBvdGhlciBydW50aW1lIGluc3RydW1lbnRh dGlvbiwgdXNlZCBieSBlLmcuIHRvb2xzL3ZhbGdyaW5kL3ZhbGdyaW5kX3Rlc3RzLnB5LgorICAg ICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ3dyYXBwZXInKToKKyAgICAgICAgICAgIHJl dHVybiBzaGxleC5zcGxpdChzZWxmLl9wb3J0LmdldF9vcHRpb24oJ3dyYXBwZXInKSkKKyAgICAg ICAgaWYgc2VsZi5fcHJvZmlsZXI6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5fcHJvZmlsZXIu d3JhcHBlcl9hcmd1bWVudHMoKQorICAgICAgICByZXR1cm4gW10KIAogICAgIEhUVFBfRElSID0g Imh0dHAvdGVzdHMvIgogICAgIEhUVFBfTE9DQUxfRElSID0gImh0dHAvdGVzdHMvbG9jYWwvIgpA QCAtMzI3LDcgKzMyOCw3IEBAIGNsYXNzIERyaXZlcihvYmplY3QpOgogICAgICAgICAgICAgc2Vs Zi5fZHJpdmVyX3RlbXBkaXIgPSBOb25lCiAKICAgICBkZWYgY21kX2xpbmUoc2VsZiwgcGl4ZWxf dGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgotICAgICAgICBjbWQgPSBzZWxmLl9jb21tYW5kX3dyYXBw ZXIoc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCd3cmFwcGVyJykpCisgICAgICAgIGNtZCA9IHNlbGYu X2NvbW1hbmRfd3JhcHBlcigpCiAgICAgICAgIGNtZC5hcHBlbmQoc2VsZi5fcG9ydC5fcGF0aF90 b19kcml2ZXIoKSkKICAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdnY19iZXR3ZWVu X3Rlc3RzJyk6CiAgICAgICAgICAgICBjbWQuYXBwZW5kKCctLWdjLWJldHdlZW4tdGVzdHMnKQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlcl91bml0dGVzdC5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXJfdW5pdHRlc3QucHkKaW5kZXgg YWRmZGM2MzQ0ODIyMjdkMDc0NDM2YTJjNTNhNzQ4Y2Y1ZDdmZmU2ZC4uNzg3ZjJkY2Y1MDhhNjQz YmQ4NjNmNDJkZWU4Yzc4ZDIyZjFjNGJlZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2RyaXZlcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5CkBAIC04MSwxMyArODEsMTMgQEAgY2xhc3MgRHJpdmVy T3V0cHV0VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKIAogY2xhc3MgRHJpdmVyVGVzdCh1bml0 dGVzdC5UZXN0Q2FzZSk6Ci0gICAgZGVmIG1ha2VfcG9ydChzZWxmKToKLSAgICAgICAgcG9ydCA9 IFBvcnQoTW9ja1N5c3RlbUhvc3QoKSwgJ3Rlc3QnLCBNb2NrT3B0aW9ucyhjb25maWd1cmF0aW9u PSdSZWxlYXNlJykpCisgICAgZGVmIG1ha2VfcG9ydChzZWxmLCBob3N0PU5vbmUsIG9wdGlvbnM9 Tm9uZSk6CisgICAgICAgIHBvcnQgPSBQb3J0KGhvc3Qgb3IgTW9ja1N5c3RlbUhvc3QoKSwgJ3Rl c3QnLCBvcHRpb25zIG9yIE1vY2tPcHRpb25zKGNvbmZpZ3VyYXRpb249J1JlbGVhc2UnKSkKICAg ICAgICAgcG9ydC5fY29uZmlnLmJ1aWxkX2RpcmVjdG9yeSA9IGxhbWJkYSBjb25maWd1cmF0aW9u OiAnL21vY2stYnVpbGQnCiAgICAgICAgIHJldHVybiBwb3J0CiAKICAgICBkZWYgX2Fzc2VydF93 cmFwcGVyKHNlbGYsIHdyYXBwZXJfc3RyaW5nLCBleHBlY3RlZF93cmFwcGVyKToKLSAgICAgICAg d3JhcHBlciA9IERyaXZlcihzZWxmLm1ha2VfcG9ydCgpLCBOb25lLCBwaXhlbF90ZXN0cz1GYWxz ZSkuX2NvbW1hbmRfd3JhcHBlcih3cmFwcGVyX3N0cmluZykKKyAgICAgICAgd3JhcHBlciA9IERy aXZlcihzZWxmLm1ha2VfcG9ydChvcHRpb25zPU1vY2tPcHRpb25zKHdyYXBwZXI9d3JhcHBlcl9z dHJpbmcpKSwgTm9uZSwgcGl4ZWxfdGVzdHM9RmFsc2UpLl9jb21tYW5kX3dyYXBwZXIoKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHdyYXBwZXIsIGV4cGVjdGVkX3dyYXBwZXIpCiAKICAgICBk ZWYgdGVzdF9jb21tYW5kX3dyYXBwZXIoc2VsZik6CkBAIC05OSw2ICs5OSwxMCBAQCBjbGFzcyBE cml2ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgZXhwZWN0ZWRfcGFyc2UgPSBb InZhbGdyaW5kIiwgIi0tc21jLWNoZWNrPWNoZWNrIHdpdGggc3BhY2VzISIsICItLWZvbyJdCiAg ICAgICAgIHNlbGYuX2Fzc2VydF93cmFwcGVyKGNvbW1hbmRfd2l0aF9zcGFjZXMsIGV4cGVjdGVk X3BhcnNlKQogCisgICAgZGVmIHRlc3RfcHJvZmlsZXJfYXNfd3JhcHBlcihzZWxmKToKKyAgICAg ICAgZHJpdmVyID0gRHJpdmVyKHNlbGYubWFrZV9wb3J0KE1vY2tTeXN0ZW1Ib3N0KG9zX25hbWU9 J2xpbnV4JyksIE1vY2tPcHRpb25zKHByb2ZpbGU9VHJ1ZSwgcHJvZmlsZXI9J3BlcmYnKSksIE5v bmUsIEZhbHNlKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGRyaXZlci5fY29tbWFuZF93cmFw cGVyKCksIFsncGVyZicsICdyZWNvcmQnLCAnLS1jYWxsLWdyYXBoJywgJy0tb3V0cHV0JywgJy9t b2NrLWJ1aWxkL2xheW91dC10ZXN0LXJlc3VsdHMvdGVzdC5kYXRhJ10pCisKICAgICBkZWYgdGVz dF90ZXN0X3RvX3VyaShzZWxmKToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKICAg ICAgICAgZHJpdmVyID0gRHJpdmVyKHBvcnQsIE5vbmUsIHBpeGVsX3Rlc3RzPUZhbHNlKQo= 211188 2013-09-10 03:45:24 -0700 2013-09-15 02:28:50 -0700 Patch bug-119631-20130910034523.patch text/plain 11711 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1MzcyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTJhMjJjYmJiNTBkMWM0ODRhZWZkZGIzZTY4MzBjMjNi ZTBjNzRlOC4uYjExMzc1NTc4MmM3MTkzYmNkNzBkOTJlOWRlOWIyNTdiZWI2MjI4OSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUy IEBACisyMDEzLTA5LTEwICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKwor ICAgICAgICBbd2Via2l0cHldIHBlcmYgcHJvZmlsZXIgYXR0YWNoZXMgdG8gV0tUUiBhZnRlciB0 aGUgV2ViUHJvY2VzcyB3YXMgbGF1bmNoZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExOTYzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZSBwZXJmIHByb2ZpbGVyIGlzIGF0dGFjaGVkIHRvIHRoZSB0 ZXN0IHJ1bm5lciBhZnRlciB0aGUgdGVzdCBydW5uZXIgaGFzIGJlZW4gbGF1bmNoZWQsCisgICAg ICAgIGJ1dCBpbiB0aGUgY2FzZSBvZiBXZWJLaXRUZXN0UnVubmVyLCB0aGlzIGlzIGRvbmUgYWZ0 ZXIgdGhlIFdlYlByb2Nlc3Mgd2FzIHNwYXduZWQgYnkgdGhlCisgICAgICAgIFVJUHJvY2Vzcywg bWVhbmluZyB0aGF0IFdlYlByb2Nlc3Mgb3BlcmF0aW9ucyB3aWxsIG5vdCBiZSBwcm9maWxlZC4K KworICAgICAgICBUbyBhdm9pZCB0aGF0LCB0aGUgcGVyZiBwcm9maWxlciBpcyBjaGFuZ2VkIHRv IHByb3ZpZGUgYSB3cmFwcGVyIGNvbW1hbmQgZm9yIHRoZSB0ZXN0IHJ1bm5lci4KKyAgICAgICAg VGhpcyBpcyBkb25lIGluIHRoZSBzY29wZSBvZiBhbHJlYWR5IHByZXNlbnQgc3VwcG9ydCBmb3Ig d3JhcHBlciBzY3JpcHRzIChzdWNoIGFzIHZhbGdyaW5kKQorICAgICAgICB0aGF0IGFyZSBzZXR0 YWJsZSB0aHJvdWdoIHRoZSAtLXdyYXBwZXIgb3B0aW9uLiBUaGlzIGNhdXNlcyB0aGUgcGVyZiBw cm9maWxlciB0byBjb3JyZWN0bHkKKyAgICAgICAgY29udGludWUgcHJvZmlsaW5nIHRoZSBXZWJQ cm9jZXNzIGFmdGVyIGl0IHdhcyBzcGF3bmVkLgorCisgICAgICAgIFdoZW4gdGhlIHByb2ZpbGVy IGlzIGxhdW5jaGVkLCBhIHdhaXQgcHJvY2VzcyBpcyBsYXVuY2hlZCB3aXRoIHRoZSBwcm9maWxl cidzIHBpZCBhcyB0aGUKKyAgICAgICAgYXJndW1lbnQuIFRoaXMgZW5zdXJlcyB3ZSBjYW4gY2hl Y2sgdGhhdCB0aGUgcHJvZmlsZXIgZXhpdGVkIG5vcm1hbGx5LiBJZiBpdCBkaWQgbm90LCBpdHMK KyAgICAgICAgb3V0cHV0IGNhbiBiZSBjb3JydXB0ZWQgYW5kIGNhbiBjYXVzZSBwcm9ibGVtcyB3 aGVuIHRoYXQgb3V0cHV0IGlzIGV4YW1pbmVkLiBUaGUgYWZ0ZXItZXhpdAorICAgICAgICByZXBv cnQgaXMgYXZvaWRlZCBpbiB0aGF0IGNhc2UuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vcHJvZmlsZXIucHk6CisgICAgICAgIChQcm9maWxlci53cmFwcGVyX2Fy Z3VtZW50cyk6IFRoZSBtZXRob2QgcmV0dXJucyBhbiBlbXB0eSBsaXN0IGJ5IGRlZmF1bHQuCisg ICAgICAgIChQZXJmLl9faW5pdF9fKTogUmVtb3ZlIHVubmVjZXNzYXJ5IG1lbWJlciB2YXJpYWJs ZXMuCisgICAgICAgIChQZXJmLmF0dGFjaF90b19waWQpOiBMYXVuY2ggdGhlIHdhaXQgcHJvY2Vz cyB3aXRoIHRoZSBwcm9maWxlcidzIHBpZCBhcyB0aGUgYXJndW1lbnQuCisgICAgICAgIChQZXJm LndyYXBwZXJfYXJndW1lbnRzKTogVXNlZCBpbnN0ZWFkIG9mIGF0dGFjaGluZyB0aGUgcHJvZmls ZXIgdG8gdGhlIHByb2ZpbGVkIHByb2Nlc3MnIHBpZCwKKyAgICAgICAgdGhlIG1ldGhvZCByZXR1 cm5zIGEgbGlzdCBvZiBhcmd1bWVudHMgdGhhdCBzaG91bGQgYmUgdXNlZCBhcyBhIHdyYXBwZXIg Zm9yIHRoZSB0ZXN0IHJ1bm5lci4KKyAgICAgICAgVGhlIGFyZ3VtZW50cyBzcGVjaWZ5IHRoZSAn cGVyZiByZWNvcmQnIGNvbW1hbmQsIHdpdGggdGhlIG91dHB1dCBmaWxlIGFuZCB0aGUgaW5zdHJ1 Y3Rpb24gdG8KKyAgICAgICAgY29uc3RydWN0IHRoZSBjYWxsIGdyYXBoIGdpdmVuIGFzIHdlbGwu CisgICAgICAgIChQZXJmLl9maXJzdF90ZW5fbGluZXNfb2ZfcHJvZmlsZSk6IFByZXR0aWZ5IHRo ZSBvdXRwdXQgYnkgYXZvaWRpbmcgdGhlIHVubmVjZXNzYXJ5IHRyYWlsaW5nCisgICAgICAgIHdo aXRlc3BhY2UgaW4gdGhlIHByb2ZpbGUgbGluZXMuCisgICAgICAgIChQZXJmLnByb2ZpbGVfYWZ0 ZXJfZXhpdCk6IEtpbGwgdGhlIHByb2ZpbGVyIHByb2Nlc3MgdGhyb3VnaCBpdHMgcGlkIGlmIHRo ZSB3YWl0IHByb2Nlc3MgaXMgc3RpbGwKKyAgICAgICAgcnVubmluZy4gSWYgaXQgaXMgcnVubmlu ZyBldmVuIGFmdGVyIHRoYXQsIG9yIGlmIHRoZSBwcm9maWxlciBwcm9jZXNzIHByb2R1Y2VkIGEg bm9uLXplcm8gZXhpdAorICAgICAgICBjb2RlLCB0aGUgbWV0aG9kIHJlcG9ydHMgdGhlIHByb2Zp bGluZyBmYWlsdXJlIGFuZCByZXR1cm5zLiBPdGhlcndpc2UgaXQgY29udGludWVzIG9uIHJlcG9y dGluZworICAgICAgICB0aGUgdG9wIDEwIGxpbmVzIG9mIHRoZSBwcm9maWxlIGFuZCBob3cgdG8g ZXhhbWluZSB0aGUgcHJvZmlsZSBmdXJ0aGVyLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv cG9ydC9kcml2ZXIucHk6CisgICAgICAgIChEcml2ZXIuX2NvbW1hbmRfd3JhcHBlcik6IFRoZSBt ZXRob2QgaXMgbm93IGEgbWVtYmVyIG9mIHRoZSBEcml2ZXIgY2xhc3MsIHJldHVybmluZyB0aGUg d3JhcHBlcgorICAgICAgICBhcyBzcGVjaWZpZWQgYnkgdGhlIC0td3JhcHBlciBvcHRpb24gaWYg Z2l2ZW4sIG9yIHRoZSBwcm9maWxlciB3cmFwcGVyIGlmIHRoZSBwcm9maWxlciBpcyBwcmVzZW50 LAorICAgICAgICBvciBhbiBlbXB0eSBsaXN0IG90aGVyd2lzZS4KKyAgICAgICAgKERyaXZlci5j bWRfbGluZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlcl91bml0dGVz dC5weToKKyAgICAgICAgKERyaXZlclRlc3QubWFrZV9wb3J0KTogQWRqdXN0ZWQgc28gbW9jayBo b3N0IG9yIG9wdGlvbnMgb2JqZWN0cyBjYW4gYmUgc3BlY2lmaWVkCisgICAgICAgIGZvciB0aGUg dGVzdGluZy1zcGVjaWZpYyBQb3J0IG9iamVjdC4KKyAgICAgICAgKERyaXZlclRlc3QuX2Fzc2Vy dF93cmFwcGVyKTogUGFzcyBhIE1vY2tPcHRpb25zIG9iamVjdCB3aXRoIHRoZSB3cmFwcGVyIHZh bHVlIHRvIHRoZSBtYWtlX3BvcnQgbWV0aG9kLAorICAgICAgICBhcyB0aGUgRHJpdmVyLl9jb21t YW5kX3dyYXBwZXIgbm93IG9wZXJhdGVzIG9uIHRoZSBvcHRpb24ncyB2YWx1ZSBkaXJlY3RseSBy YXRoZXIgdGhhbiBhY2NlcHRpbmcgaXQgdGhyb3VnaAorICAgICAgICBhIHBhcmFtZXRlci4KKyAg ICAgICAgKERyaXZlclRlc3QudGVzdF9wcm9maWxlcl9hc193cmFwcGVyKTogUHJvdmlkZSBhIHRl c3QgY2FzZSB0byBjaGVjayB0aGUgY29ycmVjdCBwcm9maWxlciB3cmFwcGVyIGlzIHVzZWQKKyAg ICAgICAgd2hlbiBwcm9maWxpbmcgb24gdGhlIExpbnV4IHBsYXRmb3JtIHdpdGggdGhlIHBlcmYg cHJvZmlsZXIuCisKIDIwMTMtMDktMDkgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtHVEtdIDMyLWJpdCBidWlsZGVyIHNob3VsZCBydW4gdGhlIEpTQyB0 ZXN0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3By b2ZpbGVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3Byb2ZpbGVy LnB5CmluZGV4IDAyMDhjZjg5OGViMmRiNjQ3ZWMzODJjOTAzNWY1Zjc5OGI3YjNkNDkuLjA1MmI2 NzJlYTdkMTU3Y2Q3ODRhZGI1ODZmNjk5OTQ4ZGE3OTFhYmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wcm9maWxlci5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcHJvZmlsZXIucHkKQEAgLTc5LDYgKzc5LDkgQEAg Y2xhc3MgUHJvZmlsZXIob2JqZWN0KToKICAgICBkZWYgYXR0YWNoX3RvX3BpZChzZWxmLCBwaWQp OgogICAgICAgICBwYXNzCiAKKyAgICBkZWYgd3JhcHBlcl9hcmd1bWVudHMoc2VsZik6CisgICAg ICAgIHJldHVybiBbXQorCiAgICAgZGVmIHByb2ZpbGVfYWZ0ZXJfZXhpdChzZWxmKToKICAgICAg ICAgcGFzcwogCkBAIC0xMzEsNDIgKzEzNCw1NCBAQCBjbGFzcyBQZXJmKFNpbmdsZUZpbGVPdXRw dXRQcm9maWxlcik6CiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgZXhlY3V0YWJsZV9w YXRoLCBvdXRwdXRfZGlyLCBpZGVudGlmaWVyPU5vbmUpOgogICAgICAgICBzdXBlcihQZXJmLCBz ZWxmKS5fX2luaXRfXyhob3N0LCBleGVjdXRhYmxlX3BhdGgsIG91dHB1dF9kaXIsICJkYXRhIiwg aWRlbnRpZmllcikKLSAgICAgICAgc2VsZi5fcGVyZl9wcm9jZXNzID0gTm9uZQotICAgICAgICBz ZWxmLl9waWRfYmVpbmdfcHJvZmlsZWQgPSBOb25lCisgICAgICAgIHNlbGYuX3dhdGNoZWRfcGlk ID0gTm9uZQorICAgICAgICBzZWxmLl93YWl0X3Byb2Nlc3MgPSBOb25lCiAKICAgICBkZWYgX3Bl cmZfcGF0aChzZWxmKToKICAgICAgICAgIyBGSVhNRTogV2UgbWF5IG5lZWQgdG8gc3VwcG9ydCBm aW5kaW5nIHRoZSBwZXJmIGJpbmFyeSBpbiBvdGhlciBsb2NhdGlvbnMuCiAgICAgICAgIHJldHVy biAncGVyZicKIAogICAgIGRlZiBhdHRhY2hfdG9fcGlkKHNlbGYsIHBpZCk6Ci0gICAgICAgIGFz c2VydChub3Qgc2VsZi5fcGVyZl9wcm9jZXNzIGFuZCBub3Qgc2VsZi5fcGlkX2JlaW5nX3Byb2Zp bGVkKQotICAgICAgICBzZWxmLl9waWRfYmVpbmdfcHJvZmlsZWQgPSBwaWQKLSAgICAgICAgY21k ID0gW3NlbGYuX3BlcmZfcGF0aCgpLCAicmVjb3JkIiwgIi0tY2FsbC1ncmFwaCIsICItLXBpZCIs IHBpZCwgIi0tb3V0cHV0Iiwgc2VsZi5fb3V0cHV0X3BhdGhdCi0gICAgICAgIHNlbGYuX3BlcmZf cHJvY2VzcyA9IHNlbGYuX2hvc3QuZXhlY3V0aXZlLnBvcGVuKGNtZCkKKyAgICAgICAgIyBUaGUg cGFzc2VkLWluIHBpZCBoZXJlIGlzIHRoZSBwaWQgb2YgdGhlIHByb2ZpbGVyLiBBIHdhaXQgcHJv Y2VzcyBpcyBsYXVuY2hlZCBoZXJlIHRoYXQKKyAgICAgICAgIyB3YXRjaGVzIHRoYXQgcGlkIGFu ZCByZXR1cm5zIHRoZSBzYW1lIHJldHVybiBjb2RlIGFzIHRoZSBwcm9maWxlciBwcm9jZXNzLgor ICAgICAgICBzZWxmLl93YXRjaGVkX3BpZCA9IHBpZAorICAgICAgICBzZWxmLl93YWl0X3Byb2Nl c3MgPSBzZWxmLl9ob3N0LmV4ZWN1dGl2ZS5wb3BlbihbIndhaXQiLCAiJWQiICUgcGlkXSwgc2hl bGw9VHJ1ZSkKKworICAgIGRlZiB3cmFwcGVyX2FyZ3VtZW50cyhzZWxmKToKKyAgICAgICAgcmV0 dXJuIFtzZWxmLl9wZXJmX3BhdGgoKSwgInJlY29yZCIsICItLWNhbGwtZ3JhcGgiLCAiLS1vdXRw dXQiLCBzZWxmLl9vdXRwdXRfcGF0aF0KIAogICAgIGRlZiBfZmlyc3RfdGVuX2xpbmVzX29mX3By b2ZpbGUoc2VsZiwgcGVyZl9vdXRwdXQpOgotICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaCgiXiNb XlxuXSpcbigoPzogW15cbl0qXG4pezEsMTB9KSIsIHBlcmZfb3V0cHV0LCByZS5NVUxUSUxJTkUp Ci0gICAgICAgIHJldHVybiBtYXRjaC5ncm91cCgxKSBpZiBtYXRjaCBlbHNlIE5vbmUKKyAgICAg ICAgb3V0cHV0X2xpbmVzID0gcmUuZmluZGl0ZXIociJeKD86KCBbXlxuXSo/KVxzKlxuKSIsIHBl cmZfb3V0cHV0LCByZS5NVUxUSUxJTkUpCisgICAgICAgIHByZXR0aWZpZWRfbGluZXMgPSBbXQor ICAgICAgICBmb3IgaSBpbiByYW5nZSgwLCAxMCk6CisgICAgICAgICAgICBsaW5lID0gbmV4dChv dXRwdXRfbGluZXMsIE5vbmUpCisgICAgICAgICAgICBpZiBub3QgbGluZToKKyAgICAgICAgICAg ICAgICBicmVhaworICAgICAgICAgICAgcHJldHRpZmllZF9saW5lcy5hcHBlbmQobGluZS5ncm91 cCgxKSkKKworICAgICAgICByZXR1cm4gcHJldHRpZmllZF9saW5lcwogCiAgICAgZGVmIHByb2Zp bGVfYWZ0ZXJfZXhpdChzZWxmKToKLSAgICAgICAgIyBQZXJmIGRvZXNuJ3QgYXV0b21hdGljYWxs eSB3YXRjaCB0aGUgYXR0YWNoZWQgcGlkIGZvciBkZWF0aCBub3RpZmljYXRpb25zLAotICAgICAg ICAjIHNvIHdlIGhhdmUgdG8gZG8gaXQgZm9yIGl0LCBhbmQgdGhlbiB0ZWxsIGl0IGl0cyB0aW1l IHRvIHN0b3Agc2FtcGxpbmcuIDooCi0gICAgICAgIHNlbGYuX2hvc3QuZXhlY3V0aXZlLndhaXRf bGltaXRlZChzZWxmLl9waWRfYmVpbmdfcHJvZmlsZWQsIGxpbWl0X2luX3NlY29uZHM9MTApCi0g ICAgICAgIHBlcmZfZXhpdGNvZGUgPSBzZWxmLl9wZXJmX3Byb2Nlc3MucG9sbCgpCi0gICAgICAg IGlmIHBlcmZfZXhpdGNvZGUgaXMgTm9uZTogICMgVGhpcyBzaG91bGQgYWx3YXlzIGJlIHRoZSBj YXNlLCB1bmxlc3MgcGVyZiBlcnJvcidkIG91dCBlYXJseS4KLSAgICAgICAgICAgIHNlbGYuX2hv c3QuZXhlY3V0aXZlLmludGVycnVwdChzZWxmLl9wZXJmX3Byb2Nlc3MucGlkKQotCi0gICAgICAg IHBlcmZfZXhpdGNvZGUgPSBzZWxmLl9wZXJmX3Byb2Nlc3Mud2FpdCgpCi0gICAgICAgIGlmIHBl cmZfZXhpdGNvZGUgbm90IGluICgwLCAtMik6ICAjIFRoZSBleGl0IGNvZGUgc2hvdWxkIGFsd2F5 cyBiZSAtMiwgYXMgd2UncmUgYWx3YXlzIGludGVycnVwdGluZyBwZXJmLgotICAgICAgICAgICAg cHJpbnQgIidwZXJmIHJlY29yZCcgZmFpbGVkIChleGl0IGNvZGU6ICVpKSwgY2FuJ3QgcHJvY2Vz cyByZXN1bHRzOiIgJSBwZXJmX2V4aXRjb2RlCisgICAgICAgICMgS2lsbCB0aGUgd2F0Y2hlZCBw cm9jZXNzIGlmIGl0J3Mgc3RpbGwgcnVubmluZy4KKyAgICAgICAgaWYgc2VsZi5fd2FpdF9wcm9j ZXNzLnBvbGwoKSBpcyBOb25lOgorICAgICAgICAgICAgc2VsZi5faG9zdC5leGVjdXRpdmUua2ls bF9wcm9jZXNzKHNlbGYuX3dhdGNoZWRfcGlkKQorCisgICAgICAgICMgUmV0dXJuIGVhcmx5IGlm IHRoZSBwcm9jZXNzIHByb2R1Y2VkIG5vbi16ZXJvIGV4aXQgY29kZSBvciBpcyBzdGlsbCBydW5u aW5nIChpZiBpdCBjb3VsZG4ndCBiZSBraWxsZWQpLgorICAgICAgICBleGl0X2NvZGUgPSBzZWxm Ll93YWl0X3Byb2Nlc3MucG9sbCgpCisgICAgICAgIGlmIGV4aXRfY29kZSBpcyBub3QgMDoKKyAg ICAgICAgICAgIHByaW50ICIncGVyZiByZWNvcmQnIGZhaWxlZCwgIiwKKyAgICAgICAgICAgIGlm IGV4aXRfY29kZToKKyAgICAgICAgICAgICAgICBwcmludCAiZXhpdCBjb2RlIHdhcyAlaS4iICUg ZXhpdF9jb2RlCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIHByaW50ICJ0aGUg cHJvZmlsZWQgcHJvY2VzcyB3aXRoIHBpZCAlaSBpcyBzdGlsbCBydW5uaW5nLiIgJSBzZWxmLl93 YXRjaGVkX3BpZAogICAgICAgICAgICAgcmV0dXJuCiAKLSAgICAgICAgcGVyZl9hcmdzID0gW3Nl bGYuX3BlcmZfcGF0aCgpLCAncmVwb3J0JywgJy0tY2FsbC1ncmFwaCcsICdub25lJywgJy0taW5w dXQnLCBzZWxmLl9vdXRwdXRfcGF0aF0KKyAgICAgICAgcGVyZl9yZXBvcnRfYXJncyA9IFtzZWxm Ll9wZXJmX3BhdGgoKSwgJ3JlcG9ydCcsICctLWNhbGwtZ3JhcGgnLCAnbm9uZScsICctLWlucHV0 Jywgc2VsZi5fb3V0cHV0X3BhdGhdCisgICAgICAgIHBlcmZfcmVwb3J0X291dHB1dCA9IHNlbGYu X2hvc3QuZXhlY3V0aXZlLnJ1bl9jb21tYW5kKHBlcmZfcmVwb3J0X2FyZ3MpCiAgICAgICAgIHBy aW50ICJGaXJzdCAxMCBsaW5lcyBvZiAncGVyZiByZXBvcnQgLS1jYWxsLWdyYXBoPW5vbmUnOiIK IAotICAgICAgICBwcmludCAiICIuam9pbihwZXJmX2FyZ3MpCi0gICAgICAgIHBlcmZfb3V0cHV0 ID0gc2VsZi5faG9zdC5leGVjdXRpdmUucnVuX2NvbW1hbmQocGVyZl9hcmdzKQotICAgICAgICBw cmludCBzZWxmLl9maXJzdF90ZW5fbGluZXNfb2ZfcHJvZmlsZShwZXJmX291dHB1dCkKKyAgICAg ICAgcHJpbnQgIiAiLmpvaW4ocGVyZl9yZXBvcnRfYXJncykKKyAgICAgICAgcHJpbnQgIlxuIi5q b2luKHNlbGYuX2ZpcnN0X3Rlbl9saW5lc19vZl9wcm9maWxlKHBlcmZfcmVwb3J0X291dHB1dCkp CiAKICAgICAgICAgcHJpbnQgIlRvIHZpZXcgdGhlIGZ1bGwgcHJvZmlsZSwgcnVuOiIKICAgICAg ICAgcHJpbnQgJyAnLmpvaW4oW3NlbGYuX3BlcmZfcGF0aCgpLCAncmVwb3J0JywgJy1pJywgc2Vs Zi5fb3V0cHV0X3BhdGhdKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L2RyaXZlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkKaW5kZXgg NTA2MWJkNmQxZjIxOTJlNmNiOTRkY2Q3YjMzNjI5YTYzZjMyMGMwNy4uMzYyMjI4YWFkNjRhYTA1 Mjg3YzdiNWMyMTIyZThiODNjYWRkZTA2ZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2RyaXZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJp dmVyLnB5CkBAIC0yMTMsMTIgKzIxMywxMyBAQCBjbGFzcyBEcml2ZXIob2JqZWN0KToKICAgICBk ZWYgX2dldF9jcmFzaF9sb2coc2VsZiwgc3Rkb3V0LCBzdGRlcnIsIG5ld2VyX3RoYW4pOgogICAg ICAgICByZXR1cm4gc2VsZi5fcG9ydC5fZ2V0X2NyYXNoX2xvZyhzZWxmLl9jcmFzaGVkX3Byb2Nl c3NfbmFtZSwgc2VsZi5fY3Jhc2hlZF9waWQsIHN0ZG91dCwgc3RkZXJyLCBuZXdlcl90aGFuKQog Ci0gICAgIyBGSVhNRTogU2VlbXMgdGhpcyBjb3VsZCBqdXN0IGJlIGlubGluZWQgaW50byBjYWxs ZXJzLgotICAgIEBjbGFzc21ldGhvZAotICAgIGRlZiBfY29tbWFuZF93cmFwcGVyKGNscywgd3Jh cHBlcl9vcHRpb24pOgotICAgICAgICAjIEhvb2sgZm9yIGluamVjdGluZyB2YWxncmluZCBvciBv dGhlciBydW50aW1lIGluc3RydW1lbnRhdGlvbiwKLSAgICAgICAgIyB1c2VkIGJ5IGUuZy4gdG9v bHMvdmFsZ3JpbmQvdmFsZ3JpbmRfdGVzdHMucHkuCi0gICAgICAgIHJldHVybiBzaGxleC5zcGxp dCh3cmFwcGVyX29wdGlvbikgaWYgd3JhcHBlcl9vcHRpb24gZWxzZSBbXQorICAgIGRlZiBfY29t bWFuZF93cmFwcGVyKHNlbGYpOgorICAgICAgICAjIEhvb2sgZm9yIGluamVjdGluZyB2YWxncmlu ZCBvciBvdGhlciBydW50aW1lIGluc3RydW1lbnRhdGlvbiwgdXNlZCBieSBlLmcuIHRvb2xzL3Zh bGdyaW5kL3ZhbGdyaW5kX3Rlc3RzLnB5LgorICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRp b24oJ3dyYXBwZXInKToKKyAgICAgICAgICAgIHJldHVybiBzaGxleC5zcGxpdChzZWxmLl9wb3J0 LmdldF9vcHRpb24oJ3dyYXBwZXInKSkKKyAgICAgICAgaWYgc2VsZi5fcHJvZmlsZXI6CisgICAg ICAgICAgICByZXR1cm4gc2VsZi5fcHJvZmlsZXIud3JhcHBlcl9hcmd1bWVudHMoKQorICAgICAg ICByZXR1cm4gW10KIAogICAgIEhUVFBfRElSID0gImh0dHAvdGVzdHMvIgogICAgIEhUVFBfTE9D QUxfRElSID0gImh0dHAvdGVzdHMvbG9jYWwvIgpAQCAtMzI3LDcgKzMyOCw3IEBAIGNsYXNzIERy aXZlcihvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5fZHJpdmVyX3RlbXBkaXIgPSBOb25lCiAK ICAgICBkZWYgY21kX2xpbmUoc2VsZiwgcGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgotICAg ICAgICBjbWQgPSBzZWxmLl9jb21tYW5kX3dyYXBwZXIoc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCd3 cmFwcGVyJykpCisgICAgICAgIGNtZCA9IHNlbGYuX2NvbW1hbmRfd3JhcHBlcigpCiAgICAgICAg IGNtZC5hcHBlbmQoc2VsZi5fcG9ydC5fcGF0aF90b19kcml2ZXIoKSkKICAgICAgICAgaWYgc2Vs Zi5fcG9ydC5nZXRfb3B0aW9uKCdnY19iZXR3ZWVuX3Rlc3RzJyk6CiAgICAgICAgICAgICBjbWQu YXBwZW5kKCctLWdjLWJldHdlZW4tdGVzdHMnKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L2RyaXZlcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9kcml2ZXJfdW5pdHRlc3QucHkKaW5kZXggYWRmZGM2MzQ0ODIyMjdkMDc0NDM2YTJjNTNh NzQ4Y2Y1ZDdmZmU2ZC4uNzg3ZjJkY2Y1MDhhNjQzYmQ4NjNmNDJkZWU4Yzc4ZDIyZjFjNGJlZiAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RyaXZlcl91bml0dGVzdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5CkBA IC04MSwxMyArODEsMTMgQEAgY2xhc3MgRHJpdmVyT3V0cHV0VGVzdCh1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAKIAogY2xhc3MgRHJpdmVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6Ci0gICAgZGVmIG1h a2VfcG9ydChzZWxmKToKLSAgICAgICAgcG9ydCA9IFBvcnQoTW9ja1N5c3RlbUhvc3QoKSwgJ3Rl c3QnLCBNb2NrT3B0aW9ucyhjb25maWd1cmF0aW9uPSdSZWxlYXNlJykpCisgICAgZGVmIG1ha2Vf cG9ydChzZWxmLCBob3N0PU5vbmUsIG9wdGlvbnM9Tm9uZSk6CisgICAgICAgIHBvcnQgPSBQb3J0 KGhvc3Qgb3IgTW9ja1N5c3RlbUhvc3QoKSwgJ3Rlc3QnLCBvcHRpb25zIG9yIE1vY2tPcHRpb25z KGNvbmZpZ3VyYXRpb249J1JlbGVhc2UnKSkKICAgICAgICAgcG9ydC5fY29uZmlnLmJ1aWxkX2Rp cmVjdG9yeSA9IGxhbWJkYSBjb25maWd1cmF0aW9uOiAnL21vY2stYnVpbGQnCiAgICAgICAgIHJl dHVybiBwb3J0CiAKICAgICBkZWYgX2Fzc2VydF93cmFwcGVyKHNlbGYsIHdyYXBwZXJfc3RyaW5n LCBleHBlY3RlZF93cmFwcGVyKToKLSAgICAgICAgd3JhcHBlciA9IERyaXZlcihzZWxmLm1ha2Vf cG9ydCgpLCBOb25lLCBwaXhlbF90ZXN0cz1GYWxzZSkuX2NvbW1hbmRfd3JhcHBlcih3cmFwcGVy X3N0cmluZykKKyAgICAgICAgd3JhcHBlciA9IERyaXZlcihzZWxmLm1ha2VfcG9ydChvcHRpb25z PU1vY2tPcHRpb25zKHdyYXBwZXI9d3JhcHBlcl9zdHJpbmcpKSwgTm9uZSwgcGl4ZWxfdGVzdHM9 RmFsc2UpLl9jb21tYW5kX3dyYXBwZXIoKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHdyYXBw ZXIsIGV4cGVjdGVkX3dyYXBwZXIpCiAKICAgICBkZWYgdGVzdF9jb21tYW5kX3dyYXBwZXIoc2Vs Zik6CkBAIC05OSw2ICs5OSwxMCBAQCBjbGFzcyBEcml2ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICAgICAgZXhwZWN0ZWRfcGFyc2UgPSBbInZhbGdyaW5kIiwgIi0tc21jLWNoZWNrPWNo ZWNrIHdpdGggc3BhY2VzISIsICItLWZvbyJdCiAgICAgICAgIHNlbGYuX2Fzc2VydF93cmFwcGVy KGNvbW1hbmRfd2l0aF9zcGFjZXMsIGV4cGVjdGVkX3BhcnNlKQogCisgICAgZGVmIHRlc3RfcHJv ZmlsZXJfYXNfd3JhcHBlcihzZWxmKToKKyAgICAgICAgZHJpdmVyID0gRHJpdmVyKHNlbGYubWFr ZV9wb3J0KE1vY2tTeXN0ZW1Ib3N0KG9zX25hbWU9J2xpbnV4JyksIE1vY2tPcHRpb25zKHByb2Zp bGU9VHJ1ZSwgcHJvZmlsZXI9J3BlcmYnKSksIE5vbmUsIEZhbHNlKQorICAgICAgICBzZWxmLmFz c2VydEVxdWFsKGRyaXZlci5fY29tbWFuZF93cmFwcGVyKCksIFsncGVyZicsICdyZWNvcmQnLCAn LS1jYWxsLWdyYXBoJywgJy0tb3V0cHV0JywgJy9tb2NrLWJ1aWxkL2xheW91dC10ZXN0LXJlc3Vs dHMvdGVzdC5kYXRhJ10pCisKICAgICBkZWYgdGVzdF90ZXN0X3RvX3VyaShzZWxmKToKICAgICAg ICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKICAgICAgICAgZHJpdmVyID0gRHJpdmVyKHBvcnQs IE5vbmUsIHBpeGVsX3Rlc3RzPUZhbHNlKQo=