135660 2014-08-06 10:57:26 -0700 The support directory shouldn't be skipped unconditionally in test import 2014-08-07 09:38:19 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bjonesbe bjonesbe commit-queue dpranke glenn rhauck rniwa oldest_to_newest 1027217 0 bjonesbe 2014-08-06 10:57:26 -0700 The support directory shouldn't be skipped unconditionally in test import 1027221 1 236116 bjonesbe 2014-08-06 11:00:35 -0700 Created attachment 236116 Patch 1027312 2 236116 bjonesbe 2014-08-06 15:04:15 -0700 Comment on attachment 236116 Patch I want to make a better solution. 1027390 3 236163 bjonesbe 2014-08-06 19:09:02 -0700 Created attachment 236163 Patch 1027414 4 236163 rniwa 2014-08-06 21:36:05 -0700 Comment on attachment 236163 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236163&action=review > Tools/ChangeLog:12 > + '.'. Please put this in the previous line. It's so awkward to start a new line with '.'. > Tools/Scripts/webkitpy/w3c/test_importer.py:175 > + should_skip = (subdir.startswith('.') or (root == self.source_directory and subdir in DIRS_TO_SKIP)) We don't need the outer parenthesis. > Tools/Scripts/webkitpy/w3c/test_importer.py:186 > + dirs[:] = [subdir for subdir in dirs if self.should_keep_subdir(root, subdir)] why not just dirs = ? 1027496 5 236163 bjonesbe 2014-08-07 09:08:50 -0700 Comment on attachment 236163 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236163&action=review Thanks for the review! >> Tools/ChangeLog:12 >> + '.'. > > Please put this in the previous line. > It's so awkward to start a new line with '.'. ok. >> Tools/Scripts/webkitpy/w3c/test_importer.py:175 >> + should_skip = (subdir.startswith('.') or (root == self.source_directory and subdir in DIRS_TO_SKIP)) > > We don't need the outer parenthesis. ok. >> Tools/Scripts/webkitpy/w3c/test_importer.py:186 >> + dirs[:] = [subdir for subdir in dirs if self.should_keep_subdir(root, subdir)] > > why not just dirs = ? Because the API for os.walk is strange, and dirs is a special variable. If you want to exclude directories from the walk, you need to modify dirs in place. 1027498 6 236189 bjonesbe 2014-08-07 09:13:02 -0700 Created attachment 236189 Patch for landing 1027506 7 236189 commit-queue 2014-08-07 09:38:16 -0700 Comment on attachment 236189 Patch for landing Clearing flags on attachment: 236189 Committed r172214: <http://trac.webkit.org/changeset/172214> 1027507 8 commit-queue 2014-08-07 09:38:19 -0700 All reviewed patches have been landed. Closing bug. 236116 2014-08-06 11:00:35 -0700 2014-08-06 19:08:58 -0700 Patch bug-135660-20140806110023.patch text/plain 1750 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMDM1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTM0OWYxMDU3MmY3ZTBlNWVlYThiNDUwOWI4ZGNkMGRl YjVlOWNhYy4uZjY3OTRhMmVlNWQwN2IxZTliZGI3NDcxYzIwNmUyNDJmNjFmNjRkNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE0LTA4LTA2ICBCZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCisg ICAgICAgIFRoZSBzdXBwb3J0IGRpcmVjdG9yeSBzaG91bGRuJ3QgYmUgc2tpcHBlZCB1bmNvbmRp dGlvbmFsbHkgaW4gdGVzdCBpbXBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNTY2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdoaWxlIHRoZSB0b3AgbGV2ZWwgc3VwcG9ydCBkaXJlY3RvcnkgaW4g dGhlIHJlcG8gc2hvdWxkbid0IGJlCisgICAgICAgIGltcG9ydGVkLCBtYW55IHRlc3RzIGhhdmUg c3VwcG9ydCBkaXJlY3RvcmllcyBvZiB0aGVpciBvd24gdGhhdCBzaG91bGQKKyAgICAgICAgYmUu IFRoZXJlIGlzIGFscmVhZHkgY29kZSB0aGF0IGlnbm9yZXMgc3VwcG9ydCBkaXJlY3RvcmllcyB0 aGF0IGRvbid0CisgICAgICAgIGhhdmUgY29ycmVzcG9uZGluZyB0ZXN0cywgYW5kIHRoYXQgd2ls bCBza2lwIHRoZSB0b3AgbGV2ZWwgc3VwcG9ydAorICAgICAgICBkaXJlY3RvcnkgYXV0b21hdGlj YWxseS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHk6 CisgICAgICAgIChUZXN0SW1wb3J0ZXIuZmluZF9pbXBvcnRhYmxlX3Rlc3RzKTogUmVtb3ZlIHN1 cHBvcnQgZnJvbSBsaXN0IG9mCisgICAgICAgIHNraXBwZWQgZGlycy4KKwogMjAxNC0wOC0wNSAg Vml2ZWsgR2FsYXRhZ2UgIDx2aXZlay52Z0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbZ3RrXSBJ bmNsdWRlIGxsdm0tZGV2KGVsKSBwYWNrYWdlIHRvIHNhdGlzZnkgbWVzYSBidWlsZCBjb25maWd1 cmF0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9y dGVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weQppbmRl eCBmODAxNDU5ZThlZTU2NGYzMGU5OTcxMWUzNjEwOTlhMDg2M2U1OWQ1Li4xYzEyMzFiMTRhZDA5 NDhkOGMzMjBkMGU3Yzg2YTg5M2MyZjJlYWYwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv dzNjL3Rlc3RfaW1wb3J0ZXIucHkKQEAgLTE4Miw3ICsxODIsNyBAQCBjbGFzcyBUZXN0SW1wb3J0 ZXIob2JqZWN0KToKICAgICAgICAgICAgIHJlZnRlc3RzID0gMAogICAgICAgICAgICAganN0ZXN0 cyA9IDAKIAotICAgICAgICAgICAgRElSU19UT19TS0lQID0gKCcuZ2l0JywgJy5oZycsICd3b3Jr LWluLXByb2dyZXNzJywgJ3Rvb2xzJywgJ3N1cHBvcnQnKQorICAgICAgICAgICAgRElSU19UT19T S0lQID0gKCcuZ2l0JywgJy5oZycsICd3b3JrLWluLXByb2dyZXNzJywgJ3Rvb2xzJykKICAgICAg ICAgICAgIGZvciBkIGluIERJUlNfVE9fU0tJUDoKICAgICAgICAgICAgICAgICBpZiBkIGluIGRp cnM6CiAgICAgICAgICAgICAgICAgICAgIGRpcnMucmVtb3ZlKGQpCg== 236163 2014-08-06 19:09:02 -0700 2014-08-07 09:12:57 -0700 Patch bug-135660-20140806190850.patch text/plain 9946 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMDM1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTM0OWYxMDU3MmY3ZTBlNWVlYThiNDUwOWI4ZGNkMGRl YjVlOWNhYy4uZjllZDBiMmMyMmFhZjQxMmQwOTUyYjVjYmIwZDIzZjQxZjk4ZjExYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4 IEBACisyMDE0LTA4LTA2ICBCZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCisg ICAgICAgIFRoZSBzdXBwb3J0IGRpcmVjdG9yeSBzaG91bGRuJ3QgYmUgc2tpcHBlZCB1bmNvbmRp dGlvbmFsbHkgaW4gdGVzdCBpbXBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNTY2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoZSAnRElSU19UT19TS0lQJyBzaG91bGQgb25seSBiZSBza2lwcGVk IHdoZW4gaW4gdGhlIHJvb3QgZGlyZWN0b3J5CisgICAgICAgIG9mIHRoZSB0ZXN0IHJlcG8sIGFz IHRoYXQncyB0aGUgb25seSB0aW1lIHRoZXkgYXJlIHNwZWNpYWwuIEluCisgICAgICAgIGFkZGl0 aW9uLCBpbnN0ZWFkIG9mIGhhcmRjb2RpbmcgLmhnIGFuZCAuZ2l0IGFzIHNwZWNpYWwsIHNraXAg YWxsCisgICAgICAgIGRpcmVjdG9yaWVzIHRoYXQgYmVnaW4gd2l0aCAnLicsIGp1c3QgbGlrZSB3 aXRoIGZpbGVzIHRoYXQgYmVnaW4gd2l0aAorICAgICAgICAnLicuCisgICAgICAgIAorICAgICAg ICBJbiBvcmRlciB0byBtYWtlIHRoaXMgd29yaywgdGhlIHJvb3QgZGlyZWN0b3J5IG11c3QgYWx3 YXlzIGJlCisgICAgICAgIHBhc3NlZCBpbiwgc28gdGhlIGludGVyZmFjZSB0byB0aGUgc2NyaXB0 IGhhcyBiZWVuIGNoYW5nZWQgdG8gdGFrZSB0aGUKKyAgICAgICAgcm9vdCBkaXJlY3RvcnksIGFu ZCBpZiBvbmUgd2FudHMgdG8gb25seSBpbXBvcnQgYSBzdWJzZXQgb2YgdGhlIHRlc3RzLAorICAg ICAgICBhIG5ldyAtdCBvcHRpb24gY2FuIGJlIHVzZWQgdG8gbGltaXQgdGhlIHRlc3RzIGltcG9y dGVkLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weToK KyAgICAgICAgKG1haW4pOiBSZW1vdmUgcmVwb19kaXIgY29tbWFuZCBsaW5lIGFyZ3VtZW50Lgor ICAgICAgICAocGFyc2VfYXJncyk6IEFkZCAtdCBvcHRpb24gYW5kIHNldCBleHBlY3RlZCBub24t b3B0aW9uIGFyZ3MgdG8gMS4KKyAgICAgICAgKFRlc3RJbXBvcnRlci5fX2luaXRfXyk6IFJlbW92 ZSByZXBvX2Rpci4KKyAgICAgICAgKFRlc3RJbXBvcnRlci5kb19pbXBvcnQpOiBIYW5kbGUgdGhl IHZhcnlpbmcgbnVtYmVyIG9mIGltcG9ydAorICAgICAgICAgICAgZGlyZWN0b3JpZXMuCisgICAg ICAgIChUZXN0SW1wb3J0ZXIuc2hvdWxkX2tlZXBfc3ViZGlyKTogSGVscGVyIGZvciBmaW5kX2lt cG9ydGFibGVfdGVzdHMgdG8KKyAgICAgICAgICAgIGRldGVybWluZSBpZiBhIHN1YmRpcmVjdG9y eSBzaG91bGQgYmUgc2tpcHBlZC4KKyAgICAgICAgKFRlc3RJbXBvcnRlci5maW5kX2ltcG9ydGFi bGVfdGVzdHMpOiBGaWx0ZXIgZGlyZWN0b3JpZXMgdXNpbmcgbmV3CisgICAgICAgICAgICBoZWxw ZXIuCisgICAgICAgIChUZXN0SW1wb3J0ZXIuaW1wb3J0X3Rlc3RzKTogUmVtb3ZlIHVzZSBvZiBy ZXBvX2Rpci4KKyAgICAgICAgKFRlc3RJbXBvcnRlci5zZXR1cF9kZXN0aW5hdGlvbl9kaXJlY3Rv cnkpOiBVbnVzZWQsIERlbGV0ZWQuIAorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rl c3RfaW1wb3J0ZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0SW1wb3J0ZXJUZXN0LnRlc3Rf aW1wb3J0X2Rpcl93aXRoX25vX3Rlc3RzX2FuZF9ub19oZyk6IFVwZGF0ZSBmb3IKKyAgICAgICAg ICAgIG5ldyBBUEkuCisgICAgICAgIChUZXN0SW1wb3J0ZXJUZXN0LnRlc3RfaW1wb3J0X2Rpcl93 aXRoX25vX3Rlc3RzKTogRGl0dG8uCisKIDIwMTQtMDgtMDUgIFZpdmVrIEdhbGF0YWdlICA8dml2 ZWsudmdAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW2d0a10gSW5jbHVkZSBsbHZtLWRldihlbCkg cGFja2FnZSB0byBzYXRpc2Z5IG1lc2EgYnVpbGQgY29uZmlndXJhdGlvbgpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkKaW5kZXggZjgwMTQ1OWU4ZWU1NjRmMzBl OTk3MTFlMzYxMDk5YTA4NjNlNTlkNS4uZDg1YmE4MzI1YzI1MGQxMGU0N2E4MjRmNmUxYjU4NDhj NDNhMWE0NCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBv cnRlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5 CkBAIC05MywyMiArOTMsMTMgQEAgX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQog ZGVmIG1haW4oX2FyZ3YsIF9zdGRvdXQsIF9zdGRlcnIpOgogICAgIG9wdGlvbnMsIGFyZ3MgPSBw YXJzZV9hcmdzKCkKICAgICBpbXBvcnRfZGlyID0gYXJnc1swXQotICAgIGlmIGxlbihhcmdzKSA9 PSAxOgotICAgICAgICByZXBvX2RpciA9IGltcG9ydF9kaXIKLSAgICBlbHNlOgotICAgICAgICBy ZXBvX2RpciA9IGFyZ3NbMV0KIAogICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhpbXBvcnRfZGly KToKICAgICAgICAgc3lzLmV4aXQoJ1NvdXJjZSBkaXJlY3RvcnkgJXMgbm90IGZvdW5kIScgJSBp bXBvcnRfZGlyKQogCi0gICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKHJlcG9fZGlyKToKLSAgICAg ICAgc3lzLmV4aXQoJ1JlcG9zaXRvcnkgZGlyZWN0b3J5ICVzIG5vdCBmb3VuZCEnICUgcmVwb19k aXIpCi0gICAgaWYgbm90IHJlcG9fZGlyIGluIGltcG9ydF9kaXI6Ci0gICAgICAgIHN5cy5leGl0 KCdSZXBvc2l0b3J5IGRpcmVjdG9yeSAlcyBtdXN0IGJlIGEgcGFyZW50IG9mICVzJyAlIChyZXBv X2RpciwgaW1wb3J0X2RpcikpCi0KICAgICBjb25maWd1cmVfbG9nZ2luZygpCiAKLSAgICB0ZXN0 X2ltcG9ydGVyID0gVGVzdEltcG9ydGVyKEhvc3QoKSwgaW1wb3J0X2RpciwgcmVwb19kaXIsIG9w dGlvbnMpCisgICAgdGVzdF9pbXBvcnRlciA9IFRlc3RJbXBvcnRlcihIb3N0KCksIGltcG9ydF9k aXIsIG9wdGlvbnMpCiAgICAgdGVzdF9pbXBvcnRlci5kb19pbXBvcnQoKQogCiAKQEAgLTEyOSwy MyArMTIwLDI1IEBAIGRlZiBjb25maWd1cmVfbG9nZ2luZygpOgogCiAKIGRlZiBwYXJzZV9hcmdz KCk6Ci0gICAgcGFyc2VyID0gb3B0cGFyc2UuT3B0aW9uUGFyc2VyKHVzYWdlPSd1c2FnZTogJXBy b2cgW29wdGlvbnNdIHczY190ZXN0X2RpcmVjdG9yeSBbcmVwb19kaXJlY3RvcnldJykKKyAgICBw YXJzZXIgPSBvcHRwYXJzZS5PcHRpb25QYXJzZXIodXNhZ2U9J3VzYWdlOiAlcHJvZyBbb3B0aW9u c10gdzNjX3Rlc3RfZGlyZWN0b3J5JykKICAgICBwYXJzZXIuYWRkX29wdGlvbignLW4nLCAnLS1u by1vdmVyd3JpdGUnLCBkZXN0PSdvdmVyd3JpdGUnLCBhY3Rpb249J3N0b3JlX2ZhbHNlJywgZGVm YXVsdD1UcnVlLAogICAgICAgICBoZWxwPSdGbGFnIHRvIHByZXZlbnQgZHVwbGljYXRlIHRlc3Qg ZmlsZXMgZnJvbSBvdmVyd3JpdGluZyBleGlzdGluZyB0ZXN0cy4gQnkgZGVmYXVsdCwgdGhleSB3 aWxsIGJlIG92ZXJ3cml0dGVuJykKICAgICBwYXJzZXIuYWRkX29wdGlvbignLWEnLCAnLS1hbGwn LCBhY3Rpb249J3N0b3JlX3RydWUnLCBkZWZhdWx0PUZhbHNlLAogICAgICAgICBoZWxwPSdJbXBv cnQgYWxsIHRlc3RzIGluY2x1ZGluZyByZWZ0ZXN0cywgSlMgdGVzdHMsIGFuZCBtYW51YWwvcGl4 ZWwgdGVzdHMuIEJ5IGRlZmF1bHQsIG9ubHkgcmVmdGVzdHMgYW5kIEpTIHRlc3RzIGFyZSBpbXBv cnRlZCcpCiAgICAgcGFyc2VyLmFkZF9vcHRpb24oJy1kJywgJy0tZGVzdC1kaXInLCBkZXN0PSdk ZXN0aW5hdGlvbicsIGRlZmF1bHQ9J3czYycsCiAgICAgICAgIGhlbHA9J0ltcG9ydCBpbnRvIGEg c3BlY2lmaWVkIGRpcmVjdG9yeSByZWxhdGl2ZSB0byB0aGUgTGF5b3V0VGVzdHMgcm9vdC4gQnkg ZGVmYXVsdCwgaW1wb3J0cyBpbnRvIHczYycpCisgICAgcGFyc2VyLmFkZF9vcHRpb24oJy10Jywg Jy0tdGVzdC1wYXRoJywgYWN0aW9uPSdhcHBlbmQnLCBkZXN0PSd0ZXN0X3BhdGhzJywgZGVmYXVs dD1bXSwKKyAgICAgICAgaGVscD0nSW1wb3J0IG9ubHkgdGVzdHMgaW4gdGhlIHN1cHBsaWVkIHN1 YmRpcmVjdG9yeSBvZiB0aGUgdzNjX3Rlc3RfZGlyZWN0b3J5LiBDYW4gYmUgc3VwcGxpZWQgbXVs dGlwbGUgdGltZXMgdG8gZ2l2ZSBtdWx0aXBsZSBwYXRocycpCiAKICAgICBvcHRpb25zLCBhcmdz ID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQotICAgIGlmIGxlbihhcmdzKSBub3QgaW4gKDEsIDIpOgor ICAgIGlmIGxlbihhcmdzKSAhPSAxOgogICAgICAgICBwYXJzZXIuZXJyb3IoJ0luY29ycmVjdCBu dW1iZXIgb2YgYXJndW1lbnRzJykKICAgICByZXR1cm4gb3B0aW9ucywgYXJncwogCiAKIGNsYXNz IFRlc3RJbXBvcnRlcihvYmplY3QpOgogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHNv dXJjZV9kaXJlY3RvcnksIHJlcG9fZGlyLCBvcHRpb25zKToKKyAgICBkZWYgX19pbml0X18oc2Vs ZiwgaG9zdCwgc291cmNlX2RpcmVjdG9yeSwgb3B0aW9ucyk6CiAgICAgICAgIHNlbGYuaG9zdCA9 IGhvc3QKICAgICAgICAgc2VsZi5zb3VyY2VfZGlyZWN0b3J5ID0gc291cmNlX2RpcmVjdG9yeQog ICAgICAgICBzZWxmLm9wdGlvbnMgPSBvcHRpb25zCkBAIC0xNTQsNyArMTQ3LDYgQEAgY2xhc3Mg VGVzdEltcG9ydGVyKG9iamVjdCk6CiAKICAgICAgICAgd2Via2l0X2ZpbmRlciA9IFdlYktpdEZp bmRlcihzZWxmLmZpbGVzeXN0ZW0pCiAgICAgICAgIHNlbGYuX3dlYmtpdF9yb290ID0gd2Via2l0 X2ZpbmRlci53ZWJraXRfYmFzZSgpCi0gICAgICAgIHNlbGYucmVwb19kaXIgPSByZXBvX2Rpcgog CiAgICAgICAgIHNlbGYuZGVzdGluYXRpb25fZGlyZWN0b3J5ID0gd2Via2l0X2ZpbmRlci5wYXRo X2Zyb21fd2Via2l0X2Jhc2UoIkxheW91dFRlc3RzIiwgb3B0aW9ucy5kZXN0aW5hdGlvbikKIApA QCAtMTYzLDcgKzE1NSwxMSBAQCBjbGFzcyBUZXN0SW1wb3J0ZXIob2JqZWN0KToKICAgICAgICAg c2VsZi5pbXBvcnRfbGlzdCA9IFtdCiAKICAgICBkZWYgZG9faW1wb3J0KHNlbGYpOgotICAgICAg ICBzZWxmLmZpbmRfaW1wb3J0YWJsZV90ZXN0cyhzZWxmLnNvdXJjZV9kaXJlY3RvcnkpCisgICAg ICAgIGlmIGxlbihzZWxmLm9wdGlvbnMudGVzdF9wYXRocykgPT0gMDoKKyAgICAgICAgICAgIHNl bGYuZmluZF9pbXBvcnRhYmxlX3Rlc3RzKHNlbGYuc291cmNlX2RpcmVjdG9yeSkKKyAgICAgICAg ZWxzZToKKyAgICAgICAgICAgIGZvciB0ZXN0X3BhdGggaW4gc2VsZi5vcHRpb25zLnRlc3RfcGF0 aHM6CisgICAgICAgICAgICAgICAgc2VsZi5maW5kX2ltcG9ydGFibGVfdGVzdHMob3MucGF0aC5q b2luKHNlbGYuc291cmNlX2RpcmVjdG9yeSwgdGVzdF9wYXRoKSkKICAgICAgICAgc2VsZi5sb2Fk X2NoYW5nZXNldCgpCiAgICAgICAgIHNlbGYuaW1wb3J0X3Rlc3RzKCkKIApAQCAtMTc0LDYgKzE3 MCwxMSBAQCBjbGFzcyBUZXN0SW1wb3J0ZXIob2JqZWN0KToKICAgICAgICAgZXhjZXB0IChPU0Vy cm9yLCBTY3JpcHRFcnJvcik6CiAgICAgICAgICAgICBzZWxmLmNoYW5nZXNldCA9IENIQU5HRVNF VF9OT1RfQVZBSUxBQkxFCiAKKyAgICBkZWYgc2hvdWxkX2tlZXBfc3ViZGlyKHNlbGYsIHJvb3Qs IHN1YmRpcik6CisgICAgICAgIERJUlNfVE9fU0tJUCA9ICgnd29yay1pbi1wcm9ncmVzcycsICd0 b29scycsICdzdXBwb3J0JykKKyAgICAgICAgc2hvdWxkX3NraXAgPSAoc3ViZGlyLnN0YXJ0c3dp dGgoJy4nKSBvciAocm9vdCA9PSBzZWxmLnNvdXJjZV9kaXJlY3RvcnkgYW5kIHN1YmRpciBpbiBE SVJTX1RPX1NLSVApKQorICAgICAgICByZXR1cm4gbm90IHNob3VsZF9za2lwCisKICAgICBkZWYg ZmluZF9pbXBvcnRhYmxlX3Rlc3RzKHNlbGYsIGRpcmVjdG9yeSk6CiAgICAgICAgICMgRklYTUU6 IHVzZSBmaWxlc3lzdGVtCiAgICAgICAgIGZvciByb290LCBkaXJzLCBmaWxlcyBpbiBvcy53YWxr KGRpcmVjdG9yeSk6CkBAIC0xODIsMTAgKzE4Myw3IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmpl Y3QpOgogICAgICAgICAgICAgcmVmdGVzdHMgPSAwCiAgICAgICAgICAgICBqc3Rlc3RzID0gMAog Ci0gICAgICAgICAgICBESVJTX1RPX1NLSVAgPSAoJy5naXQnLCAnLmhnJywgJ3dvcmstaW4tcHJv Z3Jlc3MnLCAndG9vbHMnLCAnc3VwcG9ydCcpCi0gICAgICAgICAgICBmb3IgZCBpbiBESVJTX1RP X1NLSVA6Ci0gICAgICAgICAgICAgICAgaWYgZCBpbiBkaXJzOgotICAgICAgICAgICAgICAgICAg ICBkaXJzLnJlbW92ZShkKQorICAgICAgICAgICAgZGlyc1s6XSA9IFtzdWJkaXIgZm9yIHN1YmRp ciBpbiBkaXJzIGlmIHNlbGYuc2hvdWxkX2tlZXBfc3ViZGlyKHJvb3QsIHN1YmRpcildCiAKICAg ICAgICAgICAgIGNvcHlfbGlzdCA9IFtdCiAKQEAgLTI3Myw3ICsyNzEsNyBAQCBjbGFzcyBUZXN0 SW1wb3J0ZXIob2JqZWN0KToKIAogICAgICAgICAgICAgb3JpZ19wYXRoID0gZGlyX3RvX2NvcHlb J2Rpcm5hbWUnXQogCi0gICAgICAgICAgICBzdWJwYXRoID0gb3MucGF0aC5yZWxwYXRoKG9yaWdf cGF0aCwgc2VsZi5yZXBvX2RpcikKKyAgICAgICAgICAgIHN1YnBhdGggPSBvcy5wYXRoLnJlbHBh dGgob3JpZ19wYXRoLCBzZWxmLnNvdXJjZV9kaXJlY3RvcnkpCiAgICAgICAgICAgICBuZXdfcGF0 aCA9IG9zLnBhdGguam9pbihzZWxmLmRlc3RpbmF0aW9uX2RpcmVjdG9yeSwgc3VicGF0aCkKIAog ICAgICAgICAgICAgaWYgbm90KG9zLnBhdGguZXhpc3RzKG5ld19wYXRoKSk6CkBAIC0zNTEsMTgg KzM0OSw2IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmplY3QpOgogICAgICAgICBmb3IgcHJlZml4 ZWRfcHJvcGVydHkgaW4gc29ydGVkKHRvdGFsX3ByZWZpeGVkX3Byb3BlcnRpZXMsIGtleT1sYW1i ZGEgcDogdG90YWxfcHJlZml4ZWRfcHJvcGVydGllc1twXSk6CiAgICAgICAgICAgICBfbG9nLmlu Zm8oJyAgJXM6ICVzJywgcHJlZml4ZWRfcHJvcGVydHksIHRvdGFsX3ByZWZpeGVkX3Byb3BlcnRp ZXNbcHJlZml4ZWRfcHJvcGVydHldKQogCi0gICAgZGVmIHNldHVwX2Rlc3RpbmF0aW9uX2RpcmVj dG9yeShzZWxmKToKLSAgICAgICAgIiIiIENyZWF0ZXMgYSBkZXN0aW5hdGlvbiBkaXJlY3Rvcnkg dGhhdCBtaXJyb3JzIHRoYXQgb2YgdGhlIHNvdXJjZSBkaXJlY3RvcnkgIiIiCi0KLSAgICAgICAg bmV3X3N1YnBhdGggPSBzZWxmLnNvdXJjZV9kaXJlY3RvcnlbbGVuKHNlbGYucmVwb19kaXIpOl0K LQotICAgICAgICBkZXN0aW5hdGlvbl9kaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4oc2VsZi5kZXN0 aW5hdGlvbl9kaXJlY3RvcnksIG5ld19zdWJwYXRoKQotCi0gICAgICAgIGlmIG5vdCBvcy5wYXRo LmV4aXN0cyhkZXN0aW5hdGlvbl9kaXJlY3RvcnkpOgotICAgICAgICAgICAgb3MubWFrZWRpcnMo ZGVzdGluYXRpb25fZGlyZWN0b3J5KQotCi0gICAgICAgIF9sb2cuaW5mbygnVGVzdHMgd2lsbCBi ZSBpbXBvcnRlZCBpbnRvOiAlcycsIGRlc3RpbmF0aW9uX2RpcmVjdG9yeSkKLQogICAgIGRlZiBy ZW1vdmVfZGVsZXRlZF9maWxlcyhzZWxmLCBpbXBvcnRfZGlyZWN0b3J5LCBuZXdfZmlsZV9saXN0 KToKICAgICAgICAgIiIiIFJlYWRzIGFuIGltcG9ydCBsb2cgaW4gfGltcG9ydF9kaXJlY3Rvcnl8 LCBjb21wYXJlcyBpdCB0byB0aGUgfG5ld19maWxlX2xpc3R8LCBhbmQgcmVtb3ZlcyBmaWxlcyBu b3QgaW4gdGhlIG5ldyBsaXN0LiIiIgogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3czYy90ZXN0X2ltcG9ydGVyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS93M2MvdGVzdF9pbXBvcnRlcl91bml0dGVzdC5weQppbmRleCA4NmI2MjhjZDUxZjg5ZTA2YTRj NDY0N2I1ZjdiZWY0YmZmZjY2ZjJhLi41ZDVhN2VmNGEzYjY4ZDVjMDUwYzQ2MjBiNjYzNzQxZjBj YTM2MGE4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9y dGVyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1w b3J0ZXJfdW5pdHRlc3QucHkKQEAgLTM5LDEyICszOSwxMiBAQCBmcm9tIHdlYmtpdHB5LmNvbW1v bi5zeXN0ZW0ub3V0cHV0Y2FwdHVyZSBpbXBvcnQgT3V0cHV0Q2FwdHVyZQogZnJvbSB3ZWJraXRw eS53M2MudGVzdF9pbXBvcnRlciBpbXBvcnQgVGVzdEltcG9ydGVyCiAKIAotRkFLRV9TT1VSQ0Vf RElSID0gJy9ibGluay93M2MnCi1GQUtFX1JFUE9fRElSID0gJy9ibGluaycKK0ZBS0VfU09VUkNF X0RJUiA9ICcvdGVzdHMvY3Nzd2cnCitGQUtFX1RFU1RfUEFUSCA9ICdjc3MtZmFrZS0xJwogCiBG QUtFX0ZJTEVTID0gewotICAgICcvYmxpbmsvdzNjL2VtcHR5X2Rpci9SRUFETUUudHh0JzogJycs Ci0gICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3czYy9SRUFETUUudHh0JzogJycsCisg ICAgJy90ZXN0cy9jc3N3Zy9jc3MtZmFrZS0xL2VtcHR5X2Rpci9SRUFETUUudHh0JzogJycsCisg ICAgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3czYy9jc3MtZmFrZS0xL1JFQURNRS50eHQn OiAnJywKIH0KIAogY2xhc3MgVGVzdEltcG9ydGVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CkBA IC01NCw3ICs1NCw3IEBAIGNsYXNzIFRlc3RJbXBvcnRlclRlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICBob3N0LmV4ZWN1dGl2ZSA9IE1vY2tFeGVjdXRpdmUyKGV4Y2VwdGlvbj1PU0Vy cm9yKCkpCiAgICAgICAgIGhvc3QuZmlsZXN5c3RlbSA9IE1vY2tGaWxlU3lzdGVtKGZpbGVzPUZB S0VfRklMRVMpCiAKLSAgICAgICAgaW1wb3J0ZXIgPSBUZXN0SW1wb3J0ZXIoaG9zdCwgRkFLRV9T T1VSQ0VfRElSLCBGQUtFX1JFUE9fRElSLCBvcHRwYXJzZS5WYWx1ZXMoeyJvdmVyd3JpdGUiOiBG YWxzZSwgJ2Rlc3RpbmF0aW9uJzogJ3czYyd9KSkKKyAgICAgICAgaW1wb3J0ZXIgPSBUZXN0SW1w b3J0ZXIoaG9zdCwgRkFLRV9TT1VSQ0VfRElSLCBvcHRwYXJzZS5WYWx1ZXMoeyJvdmVyd3JpdGUi OiBGYWxzZSwgJ2Rlc3RpbmF0aW9uJzogJ3czYycsICd0ZXN0X3BhdGhzJzogW0ZBS0VfVEVTVF9Q QVRIXX0pKQogCiAgICAgICAgIG9jID0gT3V0cHV0Q2FwdHVyZSgpCiAgICAgICAgIG9jLmNhcHR1 cmVfb3V0cHV0KCkKQEAgLTY4LDcgKzY4LDcgQEAgY2xhc3MgVGVzdEltcG9ydGVyVGVzdCh1bml0 dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGhvc3QuZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIo ZXhjZXB0aW9uPVNjcmlwdEVycm9yKCJhYm9ydDogbm8gcmVwb3NpdG9yeSBmb3VuZCBpbiAnL1Zv bHVtZXMvU291cmNlL3NyYy93ay9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYycgKC5oZyBub3Qg Zm91bmQpISIpKQogICAgICAgICBob3N0LmZpbGVzeXN0ZW0gPSBNb2NrRmlsZVN5c3RlbShmaWxl cz1GQUtFX0ZJTEVTKQogCi0gICAgICAgIGltcG9ydGVyID0gVGVzdEltcG9ydGVyKGhvc3QsIEZB S0VfU09VUkNFX0RJUiwgRkFLRV9SRVBPX0RJUiwgb3B0cGFyc2UuVmFsdWVzKHsib3ZlcndyaXRl IjogRmFsc2UsICdkZXN0aW5hdGlvbic6ICd3M2MnfSkpCisgICAgICAgIGltcG9ydGVyID0gVGVz dEltcG9ydGVyKGhvc3QsIEZBS0VfU09VUkNFX0RJUiwgb3B0cGFyc2UuVmFsdWVzKHsib3Zlcndy aXRlIjogRmFsc2UsICdkZXN0aW5hdGlvbic6ICd3M2MnLCAndGVzdF9wYXRocyc6IFtGQUtFX1RF U1RfUEFUSF19KSkKICAgICAgICAgb2MgPSBPdXRwdXRDYXB0dXJlKCkKICAgICAgICAgb2MuY2Fw dHVyZV9vdXRwdXQoKQogICAgICAgICB0cnk6Cg== 236189 2014-08-07 09:13:02 -0700 2014-08-07 09:38:16 -0700 Patch for landing bug-135660-20140807091251.patch text/plain 9933 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTcyMDM1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTM0OWYxMDU3MmY3ZTBlNWVlYThiNDUwOWI4ZGNkMGRl YjVlOWNhYy4uYTE1ZTBmYWIzOGJkYTIyZmUzYTk3MjRjOWU1ZDFkZjZhM2U3Mjc4NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3 IEBACisyMDE0LTA4LTA3ICBCZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCisg ICAgICAgIFRoZSBzdXBwb3J0IGRpcmVjdG9yeSBzaG91bGRuJ3QgYmUgc2tpcHBlZCB1bmNvbmRp dGlvbmFsbHkgaW4gdGVzdCBpbXBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNTY2MAorCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3 YS4KKworICAgICAgICBUaGUgJ0RJUlNfVE9fU0tJUCcgc2hvdWxkIG9ubHkgYmUgc2tpcHBlZCB3 aGVuIGluIHRoZSByb290IGRpcmVjdG9yeQorICAgICAgICBvZiB0aGUgdGVzdCByZXBvLCBhcyB0 aGF0J3MgdGhlIG9ubHkgdGltZSB0aGV5IGFyZSBzcGVjaWFsLiBJbgorICAgICAgICBhZGRpdGlv biwgaW5zdGVhZCBvZiBoYXJkY29kaW5nIC5oZyBhbmQgLmdpdCBhcyBzcGVjaWFsLCBza2lwIGFs bAorICAgICAgICBkaXJlY3RvcmllcyB0aGF0IGJlZ2luIHdpdGggJy4nLCBqdXN0IGxpa2Ugd2l0 aCBmaWxlcyB0aGF0IGJlZ2luIHdpdGggJy4nLgorICAgICAgICAKKyAgICAgICAgSW4gb3JkZXIg dG8gbWFrZSB0aGlzIHdvcmssIHRoZSByb290IGRpcmVjdG9yeSBtdXN0IGFsd2F5cyBiZQorICAg ICAgICBwYXNzZWQgaW4sIHNvIHRoZSBpbnRlcmZhY2UgdG8gdGhlIHNjcmlwdCBoYXMgYmVlbiBj aGFuZ2VkIHRvIHRha2UgdGhlCisgICAgICAgIHJvb3QgZGlyZWN0b3J5LCBhbmQgaWYgb25lIHdh bnRzIHRvIG9ubHkgaW1wb3J0IGEgc3Vic2V0IG9mIHRoZSB0ZXN0cywKKyAgICAgICAgYSBuZXcg LXQgb3B0aW9uIGNhbiBiZSB1c2VkIHRvIGxpbWl0IHRoZSB0ZXN0cyBpbXBvcnRlZC4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHk6CisgICAgICAgICht YWluKTogUmVtb3ZlIHJlcG9fZGlyIGNvbW1hbmQgbGluZSBhcmd1bWVudC4KKyAgICAgICAgKHBh cnNlX2FyZ3MpOiBBZGQgLXQgb3B0aW9uIGFuZCBzZXQgZXhwZWN0ZWQgbm9uLW9wdGlvbiBhcmdz IHRvIDEuCisgICAgICAgIChUZXN0SW1wb3J0ZXIuX19pbml0X18pOiBSZW1vdmUgcmVwb19kaXIu CisgICAgICAgIChUZXN0SW1wb3J0ZXIuZG9faW1wb3J0KTogSGFuZGxlIHRoZSB2YXJ5aW5nIG51 bWJlciBvZiBpbXBvcnQKKyAgICAgICAgICAgIGRpcmVjdG9yaWVzLgorICAgICAgICAoVGVzdElt cG9ydGVyLnNob3VsZF9rZWVwX3N1YmRpcik6IEhlbHBlciBmb3IgZmluZF9pbXBvcnRhYmxlX3Rl c3RzIHRvCisgICAgICAgICAgICBkZXRlcm1pbmUgaWYgYSBzdWJkaXJlY3Rvcnkgc2hvdWxkIGJl IHNraXBwZWQuCisgICAgICAgIChUZXN0SW1wb3J0ZXIuZmluZF9pbXBvcnRhYmxlX3Rlc3RzKTog RmlsdGVyIGRpcmVjdG9yaWVzIHVzaW5nIG5ldworICAgICAgICAgICAgaGVscGVyLgorICAgICAg ICAoVGVzdEltcG9ydGVyLmltcG9ydF90ZXN0cyk6IFJlbW92ZSB1c2Ugb2YgcmVwb19kaXIuCisg ICAgICAgIChUZXN0SW1wb3J0ZXIuc2V0dXBfZGVzdGluYXRpb25fZGlyZWN0b3J5KTogVW51c2Vk LCBEZWxldGVkLiAKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2ltcG9ydGVy X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdEltcG9ydGVyVGVzdC50ZXN0X2ltcG9ydF9kaXJf d2l0aF9ub190ZXN0c19hbmRfbm9faGcpOiBVcGRhdGUgZm9yCisgICAgICAgICAgICBuZXcgQVBJ LgorICAgICAgICAoVGVzdEltcG9ydGVyVGVzdC50ZXN0X2ltcG9ydF9kaXJfd2l0aF9ub190ZXN0 cyk6IERpdHRvLgorCiAyMDE0LTA4LTA1ICBWaXZlayBHYWxhdGFnZSAgPHZpdmVrLnZnQHNhbXN1 bmcuY29tPgogCiAgICAgICAgIFtndGtdIEluY2x1ZGUgbGx2bS1kZXYoZWwpIHBhY2thZ2UgdG8g c2F0aXNmeSBtZXNhIGJ1aWxkIGNvbmZpZ3VyYXRpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3czYy90ZXN0X2ltcG9ydGVyLnB5CmluZGV4IGY4MDE0NTllOGVlNTY0ZjMwZTk5NzExZTM2MTA5 OWEwODYzZTU5ZDUuLmJmM2ExNDNlYTM0MDczMzgyMWFlOWU2NDhhYmU0ZjM0Zjk5OWE1YWYgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weQpAQCAtOTMsMjIg KzkzLDEzIEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIGRlZiBtYWluKF9h cmd2LCBfc3Rkb3V0LCBfc3RkZXJyKToKICAgICBvcHRpb25zLCBhcmdzID0gcGFyc2VfYXJncygp CiAgICAgaW1wb3J0X2RpciA9IGFyZ3NbMF0KLSAgICBpZiBsZW4oYXJncykgPT0gMToKLSAgICAg ICAgcmVwb19kaXIgPSBpbXBvcnRfZGlyCi0gICAgZWxzZToKLSAgICAgICAgcmVwb19kaXIgPSBh cmdzWzFdCiAKICAgICBpZiBub3Qgb3MucGF0aC5leGlzdHMoaW1wb3J0X2Rpcik6CiAgICAgICAg IHN5cy5leGl0KCdTb3VyY2UgZGlyZWN0b3J5ICVzIG5vdCBmb3VuZCEnICUgaW1wb3J0X2RpcikK IAotICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhyZXBvX2Rpcik6Ci0gICAgICAgIHN5cy5leGl0 KCdSZXBvc2l0b3J5IGRpcmVjdG9yeSAlcyBub3QgZm91bmQhJyAlIHJlcG9fZGlyKQotICAgIGlm IG5vdCByZXBvX2RpciBpbiBpbXBvcnRfZGlyOgotICAgICAgICBzeXMuZXhpdCgnUmVwb3NpdG9y eSBkaXJlY3RvcnkgJXMgbXVzdCBiZSBhIHBhcmVudCBvZiAlcycgJSAocmVwb19kaXIsIGltcG9y dF9kaXIpKQotCiAgICAgY29uZmlndXJlX2xvZ2dpbmcoKQogCi0gICAgdGVzdF9pbXBvcnRlciA9 IFRlc3RJbXBvcnRlcihIb3N0KCksIGltcG9ydF9kaXIsIHJlcG9fZGlyLCBvcHRpb25zKQorICAg IHRlc3RfaW1wb3J0ZXIgPSBUZXN0SW1wb3J0ZXIoSG9zdCgpLCBpbXBvcnRfZGlyLCBvcHRpb25z KQogICAgIHRlc3RfaW1wb3J0ZXIuZG9faW1wb3J0KCkKIAogCkBAIC0xMjksMjMgKzEyMCwyNSBA QCBkZWYgY29uZmlndXJlX2xvZ2dpbmcoKToKIAogCiBkZWYgcGFyc2VfYXJncygpOgotICAgIHBh cnNlciA9IG9wdHBhcnNlLk9wdGlvblBhcnNlcih1c2FnZT0ndXNhZ2U6ICVwcm9nIFtvcHRpb25z XSB3M2NfdGVzdF9kaXJlY3RvcnkgW3JlcG9fZGlyZWN0b3J5XScpCisgICAgcGFyc2VyID0gb3B0 cGFyc2UuT3B0aW9uUGFyc2VyKHVzYWdlPSd1c2FnZTogJXByb2cgW29wdGlvbnNdIHczY190ZXN0 X2RpcmVjdG9yeScpCiAgICAgcGFyc2VyLmFkZF9vcHRpb24oJy1uJywgJy0tbm8tb3ZlcndyaXRl JywgZGVzdD0nb3ZlcndyaXRlJywgYWN0aW9uPSdzdG9yZV9mYWxzZScsIGRlZmF1bHQ9VHJ1ZSwK ICAgICAgICAgaGVscD0nRmxhZyB0byBwcmV2ZW50IGR1cGxpY2F0ZSB0ZXN0IGZpbGVzIGZyb20g b3ZlcndyaXRpbmcgZXhpc3RpbmcgdGVzdHMuIEJ5IGRlZmF1bHQsIHRoZXkgd2lsbCBiZSBvdmVy d3JpdHRlbicpCiAgICAgcGFyc2VyLmFkZF9vcHRpb24oJy1hJywgJy0tYWxsJywgYWN0aW9uPSdz dG9yZV90cnVlJywgZGVmYXVsdD1GYWxzZSwKICAgICAgICAgaGVscD0nSW1wb3J0IGFsbCB0ZXN0 cyBpbmNsdWRpbmcgcmVmdGVzdHMsIEpTIHRlc3RzLCBhbmQgbWFudWFsL3BpeGVsIHRlc3RzLiBC eSBkZWZhdWx0LCBvbmx5IHJlZnRlc3RzIGFuZCBKUyB0ZXN0cyBhcmUgaW1wb3J0ZWQnKQogICAg IHBhcnNlci5hZGRfb3B0aW9uKCctZCcsICctLWRlc3QtZGlyJywgZGVzdD0nZGVzdGluYXRpb24n LCBkZWZhdWx0PSd3M2MnLAogICAgICAgICBoZWxwPSdJbXBvcnQgaW50byBhIHNwZWNpZmllZCBk aXJlY3RvcnkgcmVsYXRpdmUgdG8gdGhlIExheW91dFRlc3RzIHJvb3QuIEJ5IGRlZmF1bHQsIGlt cG9ydHMgaW50byB3M2MnKQorICAgIHBhcnNlci5hZGRfb3B0aW9uKCctdCcsICctLXRlc3QtcGF0 aCcsIGFjdGlvbj0nYXBwZW5kJywgZGVzdD0ndGVzdF9wYXRocycsIGRlZmF1bHQ9W10sCisgICAg ICAgIGhlbHA9J0ltcG9ydCBvbmx5IHRlc3RzIGluIHRoZSBzdXBwbGllZCBzdWJkaXJlY3Rvcnkg b2YgdGhlIHczY190ZXN0X2RpcmVjdG9yeS4gQ2FuIGJlIHN1cHBsaWVkIG11bHRpcGxlIHRpbWVz IHRvIGdpdmUgbXVsdGlwbGUgcGF0aHMnKQogCiAgICAgb3B0aW9ucywgYXJncyA9IHBhcnNlci5w YXJzZV9hcmdzKCkKLSAgICBpZiBsZW4oYXJncykgbm90IGluICgxLCAyKToKKyAgICBpZiBsZW4o YXJncykgIT0gMToKICAgICAgICAgcGFyc2VyLmVycm9yKCdJbmNvcnJlY3QgbnVtYmVyIG9mIGFy Z3VtZW50cycpCiAgICAgcmV0dXJuIG9wdGlvbnMsIGFyZ3MKIAogCiBjbGFzcyBUZXN0SW1wb3J0 ZXIob2JqZWN0KToKIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBzb3VyY2VfZGlyZWN0 b3J5LCByZXBvX2Rpciwgb3B0aW9ucyk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHNv dXJjZV9kaXJlY3RvcnksIG9wdGlvbnMpOgogICAgICAgICBzZWxmLmhvc3QgPSBob3N0CiAgICAg ICAgIHNlbGYuc291cmNlX2RpcmVjdG9yeSA9IHNvdXJjZV9kaXJlY3RvcnkKICAgICAgICAgc2Vs Zi5vcHRpb25zID0gb3B0aW9ucwpAQCAtMTU0LDcgKzE0Nyw2IEBAIGNsYXNzIFRlc3RJbXBvcnRl cihvYmplY3QpOgogCiAgICAgICAgIHdlYmtpdF9maW5kZXIgPSBXZWJLaXRGaW5kZXIoc2VsZi5m aWxlc3lzdGVtKQogICAgICAgICBzZWxmLl93ZWJraXRfcm9vdCA9IHdlYmtpdF9maW5kZXIud2Vi a2l0X2Jhc2UoKQotICAgICAgICBzZWxmLnJlcG9fZGlyID0gcmVwb19kaXIKIAogICAgICAgICBz ZWxmLmRlc3RpbmF0aW9uX2RpcmVjdG9yeSA9IHdlYmtpdF9maW5kZXIucGF0aF9mcm9tX3dlYmtp dF9iYXNlKCJMYXlvdXRUZXN0cyIsIG9wdGlvbnMuZGVzdGluYXRpb24pCiAKQEAgLTE2Myw3ICsx NTUsMTEgQEAgY2xhc3MgVGVzdEltcG9ydGVyKG9iamVjdCk6CiAgICAgICAgIHNlbGYuaW1wb3J0 X2xpc3QgPSBbXQogCiAgICAgZGVmIGRvX2ltcG9ydChzZWxmKToKLSAgICAgICAgc2VsZi5maW5k X2ltcG9ydGFibGVfdGVzdHMoc2VsZi5zb3VyY2VfZGlyZWN0b3J5KQorICAgICAgICBpZiBsZW4o c2VsZi5vcHRpb25zLnRlc3RfcGF0aHMpID09IDA6CisgICAgICAgICAgICBzZWxmLmZpbmRfaW1w b3J0YWJsZV90ZXN0cyhzZWxmLnNvdXJjZV9kaXJlY3RvcnkpCisgICAgICAgIGVsc2U6CisgICAg ICAgICAgICBmb3IgdGVzdF9wYXRoIGluIHNlbGYub3B0aW9ucy50ZXN0X3BhdGhzOgorICAgICAg ICAgICAgICAgIHNlbGYuZmluZF9pbXBvcnRhYmxlX3Rlc3RzKG9zLnBhdGguam9pbihzZWxmLnNv dXJjZV9kaXJlY3RvcnksIHRlc3RfcGF0aCkpCiAgICAgICAgIHNlbGYubG9hZF9jaGFuZ2VzZXQo KQogICAgICAgICBzZWxmLmltcG9ydF90ZXN0cygpCiAKQEAgLTE3NCw2ICsxNzAsMTEgQEAgY2xh c3MgVGVzdEltcG9ydGVyKG9iamVjdCk6CiAgICAgICAgIGV4Y2VwdCAoT1NFcnJvciwgU2NyaXB0 RXJyb3IpOgogICAgICAgICAgICAgc2VsZi5jaGFuZ2VzZXQgPSBDSEFOR0VTRVRfTk9UX0FWQUlM QUJMRQogCisgICAgZGVmIHNob3VsZF9rZWVwX3N1YmRpcihzZWxmLCByb290LCBzdWJkaXIpOgor ICAgICAgICBESVJTX1RPX1NLSVAgPSAoJ3dvcmstaW4tcHJvZ3Jlc3MnLCAndG9vbHMnLCAnc3Vw cG9ydCcpCisgICAgICAgIHNob3VsZF9za2lwID0gc3ViZGlyLnN0YXJ0c3dpdGgoJy4nKSBvciAo cm9vdCA9PSBzZWxmLnNvdXJjZV9kaXJlY3RvcnkgYW5kIHN1YmRpciBpbiBESVJTX1RPX1NLSVAp CisgICAgICAgIHJldHVybiBub3Qgc2hvdWxkX3NraXAKKwogICAgIGRlZiBmaW5kX2ltcG9ydGFi bGVfdGVzdHMoc2VsZiwgZGlyZWN0b3J5KToKICAgICAgICAgIyBGSVhNRTogdXNlIGZpbGVzeXN0 ZW0KICAgICAgICAgZm9yIHJvb3QsIGRpcnMsIGZpbGVzIGluIG9zLndhbGsoZGlyZWN0b3J5KToK QEAgLTE4MiwxMCArMTgzLDcgQEAgY2xhc3MgVGVzdEltcG9ydGVyKG9iamVjdCk6CiAgICAgICAg ICAgICByZWZ0ZXN0cyA9IDAKICAgICAgICAgICAgIGpzdGVzdHMgPSAwCiAKLSAgICAgICAgICAg IERJUlNfVE9fU0tJUCA9ICgnLmdpdCcsICcuaGcnLCAnd29yay1pbi1wcm9ncmVzcycsICd0b29s cycsICdzdXBwb3J0JykKLSAgICAgICAgICAgIGZvciBkIGluIERJUlNfVE9fU0tJUDoKLSAgICAg ICAgICAgICAgICBpZiBkIGluIGRpcnM6Ci0gICAgICAgICAgICAgICAgICAgIGRpcnMucmVtb3Zl KGQpCisgICAgICAgICAgICBkaXJzWzpdID0gW3N1YmRpciBmb3Igc3ViZGlyIGluIGRpcnMgaWYg c2VsZi5zaG91bGRfa2VlcF9zdWJkaXIocm9vdCwgc3ViZGlyKV0KIAogICAgICAgICAgICAgY29w eV9saXN0ID0gW10KIApAQCAtMjczLDcgKzI3MSw3IEBAIGNsYXNzIFRlc3RJbXBvcnRlcihvYmpl Y3QpOgogCiAgICAgICAgICAgICBvcmlnX3BhdGggPSBkaXJfdG9fY29weVsnZGlybmFtZSddCiAK LSAgICAgICAgICAgIHN1YnBhdGggPSBvcy5wYXRoLnJlbHBhdGgob3JpZ19wYXRoLCBzZWxmLnJl cG9fZGlyKQorICAgICAgICAgICAgc3VicGF0aCA9IG9zLnBhdGgucmVscGF0aChvcmlnX3BhdGgs IHNlbGYuc291cmNlX2RpcmVjdG9yeSkKICAgICAgICAgICAgIG5ld19wYXRoID0gb3MucGF0aC5q b2luKHNlbGYuZGVzdGluYXRpb25fZGlyZWN0b3J5LCBzdWJwYXRoKQogCiAgICAgICAgICAgICBp ZiBub3Qob3MucGF0aC5leGlzdHMobmV3X3BhdGgpKToKQEAgLTM1MSwxOCArMzQ5LDYgQEAgY2xh c3MgVGVzdEltcG9ydGVyKG9iamVjdCk6CiAgICAgICAgIGZvciBwcmVmaXhlZF9wcm9wZXJ0eSBp biBzb3J0ZWQodG90YWxfcHJlZml4ZWRfcHJvcGVydGllcywga2V5PWxhbWJkYSBwOiB0b3RhbF9w cmVmaXhlZF9wcm9wZXJ0aWVzW3BdKToKICAgICAgICAgICAgIF9sb2cuaW5mbygnICAlczogJXMn LCBwcmVmaXhlZF9wcm9wZXJ0eSwgdG90YWxfcHJlZml4ZWRfcHJvcGVydGllc1twcmVmaXhlZF9w cm9wZXJ0eV0pCiAKLSAgICBkZWYgc2V0dXBfZGVzdGluYXRpb25fZGlyZWN0b3J5KHNlbGYpOgot ICAgICAgICAiIiIgQ3JlYXRlcyBhIGRlc3RpbmF0aW9uIGRpcmVjdG9yeSB0aGF0IG1pcnJvcnMg dGhhdCBvZiB0aGUgc291cmNlIGRpcmVjdG9yeSAiIiIKLQotICAgICAgICBuZXdfc3VicGF0aCA9 IHNlbGYuc291cmNlX2RpcmVjdG9yeVtsZW4oc2VsZi5yZXBvX2Rpcik6XQotCi0gICAgICAgIGRl c3RpbmF0aW9uX2RpcmVjdG9yeSA9IG9zLnBhdGguam9pbihzZWxmLmRlc3RpbmF0aW9uX2RpcmVj dG9yeSwgbmV3X3N1YnBhdGgpCi0KLSAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKGRlc3Rp bmF0aW9uX2RpcmVjdG9yeSk6Ci0gICAgICAgICAgICBvcy5tYWtlZGlycyhkZXN0aW5hdGlvbl9k aXJlY3RvcnkpCi0KLSAgICAgICAgX2xvZy5pbmZvKCdUZXN0cyB3aWxsIGJlIGltcG9ydGVkIGlu dG86ICVzJywgZGVzdGluYXRpb25fZGlyZWN0b3J5KQotCiAgICAgZGVmIHJlbW92ZV9kZWxldGVk X2ZpbGVzKHNlbGYsIGltcG9ydF9kaXJlY3RvcnksIG5ld19maWxlX2xpc3QpOgogICAgICAgICAi IiIgUmVhZHMgYW4gaW1wb3J0IGxvZyBpbiB8aW1wb3J0X2RpcmVjdG9yeXwsIGNvbXBhcmVzIGl0 IHRvIHRoZSB8bmV3X2ZpbGVfbGlzdHwsIGFuZCByZW1vdmVzIGZpbGVzIG5vdCBpbiB0aGUgbmV3 IGxpc3QuIiIiCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3Rf aW1wb3J0ZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2lt cG9ydGVyX3VuaXR0ZXN0LnB5CmluZGV4IDg2YjYyOGNkNTFmODllMDZhNGM0NjQ3YjVmN2JlZjRi ZmZmNjZmMmEuLjVkNWE3ZWY0YTNiNjhkNWMwNTBjNDYyMGI2NjM3NDFmMGNhMzYwYTggMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXJfdW5pdHRlc3Qu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlcl91bml0dGVz dC5weQpAQCAtMzksMTIgKzM5LDEyIEBAIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5vdXRw dXRjYXB0dXJlIGltcG9ydCBPdXRwdXRDYXB0dXJlCiBmcm9tIHdlYmtpdHB5LnczYy50ZXN0X2lt cG9ydGVyIGltcG9ydCBUZXN0SW1wb3J0ZXIKIAogCi1GQUtFX1NPVVJDRV9ESVIgPSAnL2JsaW5r L3czYycKLUZBS0VfUkVQT19ESVIgPSAnL2JsaW5rJworRkFLRV9TT1VSQ0VfRElSID0gJy90ZXN0 cy9jc3N3ZycKK0ZBS0VfVEVTVF9QQVRIID0gJ2Nzcy1mYWtlLTEnCiAKIEZBS0VfRklMRVMgPSB7 Ci0gICAgJy9ibGluay93M2MvZW1wdHlfZGlyL1JFQURNRS50eHQnOiAnJywKLSAgICAnL21vY2st Y2hlY2tvdXQvTGF5b3V0VGVzdHMvdzNjL1JFQURNRS50eHQnOiAnJywKKyAgICAnL3Rlc3RzL2Nz c3dnL2Nzcy1mYWtlLTEvZW1wdHlfZGlyL1JFQURNRS50eHQnOiAnJywKKyAgICAnL21vY2stY2hl Y2tvdXQvTGF5b3V0VGVzdHMvdzNjL2Nzcy1mYWtlLTEvUkVBRE1FLnR4dCc6ICcnLAogfQogCiBj bGFzcyBUZXN0SW1wb3J0ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKQEAgLTU0LDcgKzU0LDcg QEAgY2xhc3MgVGVzdEltcG9ydGVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGhv c3QuZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIoZXhjZXB0aW9uPU9TRXJyb3IoKSkKICAgICAg ICAgaG9zdC5maWxlc3lzdGVtID0gTW9ja0ZpbGVTeXN0ZW0oZmlsZXM9RkFLRV9GSUxFUykKIAot ICAgICAgICBpbXBvcnRlciA9IFRlc3RJbXBvcnRlcihob3N0LCBGQUtFX1NPVVJDRV9ESVIsIEZB S0VfUkVQT19ESVIsIG9wdHBhcnNlLlZhbHVlcyh7Im92ZXJ3cml0ZSI6IEZhbHNlLCAnZGVzdGlu YXRpb24nOiAndzNjJ30pKQorICAgICAgICBpbXBvcnRlciA9IFRlc3RJbXBvcnRlcihob3N0LCBG QUtFX1NPVVJDRV9ESVIsIG9wdHBhcnNlLlZhbHVlcyh7Im92ZXJ3cml0ZSI6IEZhbHNlLCAnZGVz dGluYXRpb24nOiAndzNjJywgJ3Rlc3RfcGF0aHMnOiBbRkFLRV9URVNUX1BBVEhdfSkpCiAKICAg ICAgICAgb2MgPSBPdXRwdXRDYXB0dXJlKCkKICAgICAgICAgb2MuY2FwdHVyZV9vdXRwdXQoKQpA QCAtNjgsNyArNjgsNyBAQCBjbGFzcyBUZXN0SW1wb3J0ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICAgICAgaG9zdC5leGVjdXRpdmUgPSBNb2NrRXhlY3V0aXZlMihleGNlcHRpb249U2Ny aXB0RXJyb3IoImFib3J0OiBubyByZXBvc2l0b3J5IGZvdW5kIGluICcvVm9sdW1lcy9Tb3VyY2Uv c3JjL3drL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjJyAoLmhnIG5vdCBmb3VuZCkhIikpCiAg ICAgICAgIGhvc3QuZmlsZXN5c3RlbSA9IE1vY2tGaWxlU3lzdGVtKGZpbGVzPUZBS0VfRklMRVMp CiAKLSAgICAgICAgaW1wb3J0ZXIgPSBUZXN0SW1wb3J0ZXIoaG9zdCwgRkFLRV9TT1VSQ0VfRElS LCBGQUtFX1JFUE9fRElSLCBvcHRwYXJzZS5WYWx1ZXMoeyJvdmVyd3JpdGUiOiBGYWxzZSwgJ2Rl c3RpbmF0aW9uJzogJ3czYyd9KSkKKyAgICAgICAgaW1wb3J0ZXIgPSBUZXN0SW1wb3J0ZXIoaG9z dCwgRkFLRV9TT1VSQ0VfRElSLCBvcHRwYXJzZS5WYWx1ZXMoeyJvdmVyd3JpdGUiOiBGYWxzZSwg J2Rlc3RpbmF0aW9uJzogJ3czYycsICd0ZXN0X3BhdGhzJzogW0ZBS0VfVEVTVF9QQVRIXX0pKQog ICAgICAgICBvYyA9IE91dHB1dENhcHR1cmUoKQogICAgICAgICBvYy5jYXB0dXJlX291dHB1dCgp CiAgICAgICAgIHRyeToK