75809 2012-01-08 15:55:51 -0800 Remove the concept of core builders from webkitpy 2012-01-08 16:12:57 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 75766 1 rniwa rniwa abarth aroben eric ojan ossy simon.fraser webkit.review.bot oldest_to_newest 531851 0 rniwa 2012-01-08 15:55:51 -0800 Now that we've got rid of the concept of core/non-core builders, webkitpy doesn't need to know about them. 531855 1 121598 rniwa 2012-01-08 15:59:39 -0800 Created attachment 121598 cleanup 531861 2 rniwa 2012-01-08 16:12:57 -0800 Committed r104417: <http://trac.webkit.org/changeset/104417> 121598 2012-01-08 15:59:39 -0800 2012-01-08 16:02:17 -0800 cleanup bug-75809-20120108155938.patch text/plain 13659 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEwNDQxNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDEyLTAxLTA4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFJlbW92ZSB0aGUgY29uY2VwdCBvZiBjb3JlIGJ1aWxkZXJzIGZyb20gd2Via2l0 cHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1ODA5 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHJlYXQg YWxsIGJvdHMgZXF1YWxseSBzaW5jZSBjb3JlL25vbi1jb3JlIHNlcHJhdGlvbiBoYXMgYmVlbiBy ZW1vdmVkIGZyb20gYnVpbGQud2Via2l0Lm9yZywKKyAgICAgICAgYW5kIHJlbW92ZSB0aGUgcmVs ZXZhbnQgY29kZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWls ZGJvdC9idWlsZGJvdC5weToKKyAgICAgICAgKEJ1aWxkQm90Ll9faW5pdF9fKToKKyAgICAgICAg KEJ1aWxkQm90Ll9tYXRjaGVzX3JlZ2V4cHMpOgorICAgICAgICAoQnVpbGRCb3QuX2J1aWxkZXJf c3RhdHVzZXNfd2l0aF9uYW1lc19tYXRjaGluZ19yZWdleHBzKToKKyAgICAgICAgKEJ1aWxkQm90 LmJ1aWxkZXJfc3RhdHVzZXMpOgorICAgICAgICAoQnVpbGRCb3QuZmFpbHVyZV9tYXApOgorICAg ICAgICAoQnVpbGRCb3QuX2xhdGVzdF9idWlsZHNfZnJvbV9idWlsZGVycyk6CisgICAgICAgIChC dWlsZEJvdC5sYXN0X2dyZWVuX3JldmlzaW9uKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVpbGRib3RfbW9jay5weToKKyAgICAgICAgKE1vY2tCdWls ZEJvdC5idWlsZGVyX3N0YXR1c2VzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvYnVpbGRib3QvYnVpbGRib3RfdW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0X3N0YXR1 c19wYXJzaW5nKToKKyAgICAgICAgKHRlc3RfbGFzdF9ncmVlbl9yZXZpc2lvbik6CisgICAgICAg ICh0ZXN0X2xhc3RfZ3JlZW5fcmV2aXNpb24ubW9ja19idWlsZHNfZnJvbV9idWlsZGVycyk6CisK IDIwMTItMDEtMDggIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAg Q2F0ZWdvcml6ZSBib3RzIGJ5IHBvcnRzIGluc3RlYWQgb2YgY29yZS9ub24tY29yZSBzZXBhcmF0 aW9uCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVp bGRib3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0 L2J1aWxkYm90L2J1aWxkYm90LnB5CShyZXZpc2lvbiAxMDQ0MTMpCisrKyBUb29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVpbGRib3QucHkJKHdvcmtpbmcgY29weSkK QEAgLTI4NywyNiArMjg3LDYgQEAgY2xhc3MgQnVpbGRCb3Qob2JqZWN0KToKICAgICAgICAgc2Vs Zi5idWlsZGJvdF91cmwgPSB1cmwgaWYgdXJsIGVsc2Ugc2VsZi5fZGVmYXVsdF91cmwKICAgICAg ICAgc2VsZi5fYnVpbGRlcl9ieV9uYW1lID0ge30KIAotICAgICAgICAjIElmIGFueSBjb3JlIGJ1 aWxkZXIgaXMgcmVkIHdlIHNob3VsZCBub3QgYmUgbGFuZGluZyBwYXRjaGVzLiAgT3RoZXIKLSAg ICAgICAgIyBidWlsZGVycyBzaG91bGQgYmUgYWRkZWQgdG8gdGhpcyBsaXN0IG9uY2UgdGhleSBh cmUga25vd24gdG8gYmUKLSAgICAgICAgIyByZWxpYWJsZS4KLSAgICAgICAgIyBTZWUgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzMjk2IGFuZCByZWxhdGVkIGJ1Z3Mu Ci0gICAgICAgIHNlbGYuY29yZV9idWlsZGVyX25hbWVzX3JlZ2V4cHMgPSBbCi0gICAgICAgICAg ICAiU25vd0xlb3BhcmQuKkJ1aWxkIiwKLSAgICAgICAgICAgICJTbm93TGVvcGFyZC4qXChUZXN0 IiwKLSAgICAgICAgICAgICJTbm93TGVvcGFyZC4qXChXZWJLaXQyIFRlc3QiLAotICAgICAgICAg ICAgIkxlb3BhcmQuKlwoKD86QnVpbGR8VGVzdCkiLAotICAgICAgICAgICAgIldpbmRvd3MuKkJ1 aWxkIiwKLSAgICAgICAgICAgICJXaW5kb3dzLipcKFRlc3QiLAotICAgICAgICAgICAgIldpbkNF IiwKLSAgICAgICAgICAgICJFRkwiLAotICAgICAgICAgICAgIkdUSy4qMzIiLAotICAgICAgICAg ICAgIkdUSy4qNjQiLAotICAgICAgICAgICAgIlF0IiwKLSAgICAgICAgICAgICJDaHJvbWl1bS4q KE1hY3xMaW51eHxXaW4pLipSZWxlYXNlJCIsCi0gICAgICAgICAgICAiQ2hyb21pdW0uKihNYWN8 TGludXh8V2luKS4qUmVsZWFzZS4qXChUZXN0cyIsCi0gICAgICAgIF0KLQogICAgIGRlZiBfcGFy c2VfbGFzdF9idWlsZF9jZWxsKHNlbGYsIGJ1aWxkZXIsIGNlbGwpOgogICAgICAgICBzdGF0dXNf bGluayA9IGNlbGwuZmluZCgnYScpCiAgICAgICAgIGlmIHN0YXR1c19saW5rOgpAQCAtMzYwLDI2 ICszNDAsMTAgQEAgY2xhc3MgQnVpbGRCb3Qob2JqZWN0KToKICAgICAgICAgICAgICAgICByZXR1 cm4gVHJ1ZQogICAgICAgICByZXR1cm4gRmFsc2UKIAotICAgICMgRklYTUU6IFNob3VsZCBtb3Zl IG9udG8gQnVpbGRlcgotICAgIGRlZiBfaXNfY29yZV9idWlsZGVyKHNlbGYsIGJ1aWxkZXJfbmFt ZSk6Ci0gICAgICAgIHJldHVybiBzZWxmLl9tYXRjaGVzX3JlZ2V4cHMoYnVpbGRlcl9uYW1lLCBz ZWxmLmNvcmVfYnVpbGRlcl9uYW1lc19yZWdleHBzKQotCiAgICAgIyBGSVhNRTogVGhpcyBtZXRo b2QgbmVlZHMgdG8gZGllLCBidXQgaXMgdXNlZCBieSBhIHVuaXQgdGVzdCBhdCB0aGUgbW9tZW50 LgogICAgIGRlZiBfYnVpbGRlcl9zdGF0dXNlc193aXRoX25hbWVzX21hdGNoaW5nX3JlZ2V4cHMo c2VsZiwgYnVpbGRlcl9zdGF0dXNlcywgbmFtZV9yZWdleHBzKToKICAgICAgICAgcmV0dXJuIFti dWlsZGVyIGZvciBidWlsZGVyIGluIGJ1aWxkZXJfc3RhdHVzZXMgaWYgc2VsZi5fbWF0Y2hlc19y ZWdleHBzKGJ1aWxkZXJbIm5hbWUiXSwgbmFtZV9yZWdleHBzKV0KIAotICAgIGRlZiByZWRfY29y ZV9idWlsZGVycyhzZWxmKToKLSAgICAgICAgcmV0dXJuIFtidWlsZGVyIGZvciBidWlsZGVyIGlu IHNlbGYuY29yZV9idWlsZGVyX3N0YXR1c2VzKCkgaWYgbm90IGJ1aWxkZXJbImlzX2dyZWVuIl1d Ci0KLSAgICBkZWYgcmVkX2NvcmVfYnVpbGRlcnNfbmFtZXMoc2VsZik6Ci0gICAgICAgIHJldHVy biBbYnVpbGRlclsibmFtZSJdIGZvciBidWlsZGVyIGluIHNlbGYucmVkX2NvcmVfYnVpbGRlcnMo KV0KLQotICAgIGRlZiBpZGxlX3JlZF9jb3JlX2J1aWxkZXJzKHNlbGYpOgotICAgICAgICByZXR1 cm4gW2J1aWxkZXIgZm9yIGJ1aWxkZXIgaW4gc2VsZi5yZWRfY29yZV9idWlsZGVycygpIGlmIGJ1 aWxkZXJbImFjdGl2aXR5Il0gPT0gImlkbGUiXQotCi0gICAgZGVmIGNvcmVfYnVpbGRlcnNfYXJl X2dyZWVuKHNlbGYpOgotICAgICAgICByZXR1cm4gbm90IHNlbGYucmVkX2NvcmVfYnVpbGRlcnMo KQotCiAgICAgIyBGSVhNRTogVGhlc2UgX2ZldGNoIG1ldGhvZHMgc2hvdWxkIG1vdmUgdG8gYSBu ZXR3b3JraW5nIGNsYXNzLgogICAgIGRlZiBfZmV0Y2hfYnVpbGRfZGljdGlvbmFyeShzZWxmLCBi dWlsZGVyLCBidWlsZF9udW1iZXIpOgogICAgICAgICAjIE5vdGU6IGZpbHRlcj0xIHdpbGwgcmVt b3ZlIE5vbmUgYW5kIHt9IGFuZCAnJywgd2hpY2ggY3V0cyBub2lzZSBidXQgY2FuCkBAIC00Mzcs OSArNDAxLDYgQEAgY2xhc3MgQnVpbGRCb3Qob2JqZWN0KToKICAgICAgICAgc291cCA9IEJlYXV0 aWZ1bFNvdXAoc2VsZi5fZmV0Y2hfb25lX2JveF9wZXJfYnVpbGRlcigpKQogICAgICAgICByZXR1 cm4gW3NlbGYuX3BhcnNlX2J1aWxkZXJfc3RhdHVzX2Zyb21fcm93KHN0YXR1c19yb3cpIGZvciBz dGF0dXNfcm93IGluIHNvdXAuZmluZCgndGFibGUnKS5maW5kQWxsKCd0cicpXQogCi0gICAgZGVm IGNvcmVfYnVpbGRlcl9zdGF0dXNlcyhzZWxmKToKLSAgICAgICAgcmV0dXJuIFtidWlsZGVyIGZv ciBidWlsZGVyIGluIHNlbGYuYnVpbGRlcl9zdGF0dXNlcygpIGlmIHNlbGYuX2lzX2NvcmVfYnVp bGRlcihidWlsZGVyWyJuYW1lIl0pXQotCiAgICAgZGVmIGJ1aWxkZXJfd2l0aF9uYW1lKHNlbGYs IG5hbWUpOgogICAgICAgICBidWlsZGVyID0gc2VsZi5fYnVpbGRlcl9ieV9uYW1lLmdldChuYW1l KQogICAgICAgICBpZiBub3QgYnVpbGRlcjoKQEAgLTQ0NywxMSArNDA4LDEwIEBAIGNsYXNzIEJ1 aWxkQm90KG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl9idWlsZGVyX2J5X25hbWVbbmFtZV0g PSBidWlsZGVyCiAgICAgICAgIHJldHVybiBidWlsZGVyCiAKLSAgICBkZWYgZmFpbHVyZV9tYXAo c2VsZiwgb25seV9jb3JlX2J1aWxkZXJzPVRydWUpOgotICAgICAgICBidWlsZGVyX3N0YXR1c2Vz ID0gc2VsZi5jb3JlX2J1aWxkZXJfc3RhdHVzZXMoKSBpZiBvbmx5X2NvcmVfYnVpbGRlcnMgZWxz ZSBzZWxmLmJ1aWxkZXJfc3RhdHVzZXMoKQorICAgIGRlZiBmYWlsdXJlX21hcChzZWxmKToKICAg ICAgICAgZmFpbHVyZV9tYXAgPSBGYWlsdXJlTWFwKCkKICAgICAgICAgcmV2aXNpb25fdG9fZmFp bGluZ19ib3RzID0ge30KLSAgICAgICAgZm9yIGJ1aWxkZXJfc3RhdHVzIGluIGJ1aWxkZXJfc3Rh dHVzZXM6CisgICAgICAgIGZvciBidWlsZGVyX3N0YXR1cyBpbiBzZWxmLmJ1aWxkZXJfc3RhdHVz ZXMoKToKICAgICAgICAgICAgIGlmIGJ1aWxkZXJfc3RhdHVzWyJpc19ncmVlbiJdOgogICAgICAg ICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgICAgICBidWlsZGVyID0gc2VsZi5idWlsZGVyX3dp dGhfbmFtZShidWlsZGVyX3N0YXR1c1sibmFtZSJdKQpAQCAtNDYyLDggKzQyMiw4IEBAIGNsYXNz IEJ1aWxkQm90KG9iamVjdCk6CiAKICAgICAjIFRoaXMgbWFrZXMgZmV3ZXIgcmVxdWVzdHMgdGhh biBjYWxsaW5nIEJ1aWxkZXIubGF0ZXN0X2J1aWxkIHdvdWxkLiAgSXQgZ3JhYnMgYWxsIGJ1aWxk ZXIKICAgICAjIHN0YXR1c2VzIGluIG9uZSByZXF1ZXN0IHVzaW5nIHNlbGYuYnVpbGRlcl9zdGF0 dXNlcyAoZmV0Y2hpbmcgL29uZV9ib3hfcGVyX2J1aWxkZXIgaW5zdGVhZCBvZiBidWlsZGVyIHBh Z2VzKS4KLSAgICBkZWYgX2xhdGVzdF9idWlsZHNfZnJvbV9idWlsZGVycyhzZWxmLCBvbmx5X2Nv cmVfYnVpbGRlcnM9VHJ1ZSk6Ci0gICAgICAgIGJ1aWxkZXJfc3RhdHVzZXMgPSBzZWxmLmNvcmVf YnVpbGRlcl9zdGF0dXNlcygpIGlmIG9ubHlfY29yZV9idWlsZGVycyBlbHNlIHNlbGYuYnVpbGRl cl9zdGF0dXNlcygpCisgICAgZGVmIF9sYXRlc3RfYnVpbGRzX2Zyb21fYnVpbGRlcnMoc2VsZik6 CisgICAgICAgIGJ1aWxkZXJfc3RhdHVzZXMgPSBzZWxmLmJ1aWxkZXJfc3RhdHVzZXMoKQogICAg ICAgICByZXR1cm4gW3NlbGYuYnVpbGRlcl93aXRoX25hbWUoc3RhdHVzWyJuYW1lIl0pLmJ1aWxk KHN0YXR1c1siYnVpbGRfbnVtYmVyIl0pIGZvciBzdGF0dXMgaW4gYnVpbGRlcl9zdGF0dXNlc10K IAogICAgIGRlZiBfYnVpbGRfYXRfb3JfYmVmb3JlX3JldmlzaW9uKHNlbGYsIGJ1aWxkLCByZXZp c2lvbik6CkBAIC00NzIsOCArNDMyLDggQEAgY2xhc3MgQnVpbGRCb3Qob2JqZWN0KToKICAgICAg ICAgICAgICAgICByZXR1cm4gYnVpbGQKICAgICAgICAgICAgIGJ1aWxkID0gYnVpbGQucHJldmlv dXNfYnVpbGQoKQogCi0gICAgZGVmIGxhc3RfZ3JlZW5fcmV2aXNpb24oc2VsZiwgb25seV9jb3Jl X2J1aWxkZXJzPVRydWUpOgotICAgICAgICBidWlsZHMgPSBzZWxmLl9sYXRlc3RfYnVpbGRzX2Zy b21fYnVpbGRlcnMob25seV9jb3JlX2J1aWxkZXJzKQorICAgIGRlZiBsYXN0X2dyZWVuX3Jldmlz aW9uKHNlbGYpOgorICAgICAgICBidWlsZHMgPSBzZWxmLl9sYXRlc3RfYnVpbGRzX2Zyb21fYnVp bGRlcnMoKQogICAgICAgICB0YXJnZXRfcmV2aXNpb24gPSBidWlsZHNbMF0ucmV2aXNpb24oKQog ICAgICAgICAjIEFuIGFsdGVybmF0ZSB3YXkgdG8gZG8gdGhpcyB3b3VsZCBiZSB0byBzdGFydCBh dCBvbmUgcmV2aXNpb24gYW5kIHdhbGsgYmFja3dhcmRzCiAgICAgICAgICMgY2hlY2tpbmcgYnVp bGRlci5idWlsZF9mb3JfcmV2aXNpb24sIGhvd2V2ZXIgYnVpbGRfZm9yX3JldmlzaW9uIGlzIHZl cnkgc2xvdyBvbiBmaXJzdCBsb2FkLgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vbmV0L2J1aWxkYm90L2J1aWxkYm90X21vY2sucHkKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90L2J1aWxkYm90X21vY2sucHkJKHJldmlz aW9uIDEwNDQxMykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJv dC9idWlsZGJvdF9tb2NrLnB5CSh3b3JraW5nIGNvcHkpCkBAIC05MCwyMSArOTAsNiBAQCBjbGFz cyBNb2NrQnVpbGRCb3Qob2JqZWN0KToKICAgICAgICAgICAgIHNlbGYuX21vY2tfYnVpbGRlcjJf c3RhdHVzLAogICAgICAgICBdCiAKLSAgICBkZWYgcmVkX2NvcmVfYnVpbGRlcnNfbmFtZXMoc2Vs Zik6Ci0gICAgICAgIGlmIG5vdCBzZWxmLl9tb2NrX2J1aWxkZXIyX3N0YXR1c1siaXNfZ3JlZW4i XToKLSAgICAgICAgICAgIHJldHVybiBbc2VsZi5fbW9ja19idWlsZGVyMl9zdGF0dXNbIm5hbWUi XV0KLSAgICAgICAgcmV0dXJuIFtdCi0KLSAgICBkZWYgcmVkX2NvcmVfYnVpbGRlcnMoc2VsZik6 Ci0gICAgICAgIGlmIG5vdCBzZWxmLl9tb2NrX2J1aWxkZXIyX3N0YXR1c1siaXNfZ3JlZW4iXToK LSAgICAgICAgICAgIHJldHVybiBbc2VsZi5fbW9ja19idWlsZGVyMl9zdGF0dXNdCi0gICAgICAg IHJldHVybiBbXQotCi0gICAgZGVmIGlkbGVfcmVkX2NvcmVfYnVpbGRlcnMoc2VsZik6Ci0gICAg ICAgIGlmIG5vdCBzZWxmLl9tb2NrX2J1aWxkZXIyX3N0YXR1c1siaXNfZ3JlZW4iXToKLSAgICAg ICAgICAgIHJldHVybiBbc2VsZi5fbW9ja19idWlsZGVyMl9zdGF0dXNdCi0gICAgICAgIHJldHVy biBbXQotCiAgICAgZGVmIGxhc3RfZ3JlZW5fcmV2aXNpb24oc2VsZik6CiAgICAgICAgIHJldHVy biA5NDc5CiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJv dC9idWlsZGJvdF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9uZXQvYnVpbGRib3QvYnVpbGRib3RfdW5pdHRlc3QucHkJKHJldmlzaW9uIDEw NDQxMykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJvdC9idWls ZGJvdF91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjE5LDExMyArMjE5LDYgQEAgY2xh c3MgQnVpbGRCb3RUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgIGZvciBrZXks IGV4cGVjdGVkX3ZhbHVlIGluIGV4cGVjdGVkX3BhcnNpbmcuaXRlbXMoKToKICAgICAgICAgICAg ICAgICBzZWxmLmFzc2VydEVxdWFscyhidWlsZGVyW2tleV0sIGV4cGVjdGVkX3ZhbHVlLCAoIkJ1 aWxkZXIgJWQgcGFyc2UgZmFpbHVyZSBmb3Iga2V5OiAlczogQWN0dWFsPSclcycgRXhwZWN0ZWQ9 JyVzJyIgJSAoeCwga2V5LCBidWlsZGVyW2tleV0sIGV4cGVjdGVkX3ZhbHVlKSkpCiAKLSAgICBk ZWYgdGVzdF9jb3JlX2J1aWxkZXJfbWV0aG9kcyhzZWxmKToKLSAgICAgICAgYnVpbGRib3QgPSBC dWlsZEJvdCgpCi0KLSAgICAgICAgIyBPdmVycmlkZSBidWlsZGVyX3N0YXR1c2VzIGZ1bmN0aW9u IHRvIG5vdCB0b3VjaCB0aGUgbmV0d29yay4KLSAgICAgICAgZGVmIGV4YW1wbGVfYnVpbGRlcl9z dGF0dXNlcygpOiAjIFdlIGNvdWxkIHVzZSBpbnN0YW5jZW1ldGhvZCgpIHRvIGJpbmQgJ3NlbGYn IGJ1dCB3ZSBkb24ndCBuZWVkIHRvLgotICAgICAgICAgICAgcmV0dXJuIEJ1aWxkQm90VGVzdC5f ZXhwZWN0ZWRfZXhhbXBsZV9vbmVfYm94X3BhcnNpbmdzCi0gICAgICAgIGJ1aWxkYm90LmJ1aWxk ZXJfc3RhdHVzZXMgPSBleGFtcGxlX2J1aWxkZXJfc3RhdHVzZXMKLQotICAgICAgICBidWlsZGJv dC5jb3JlX2J1aWxkZXJfbmFtZXNfcmVnZXhwcyA9IFsgJ0xlb3BhcmQnLCAiV2luZG93cy4qQnVp bGQiIF0KLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoYnVpbGRib3QucmVkX2NvcmVfYnVpbGRl cnNfbmFtZXMoKSwgW10pCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShidWlsZGJvdC5jb3JlX2J1 aWxkZXJzX2FyZV9ncmVlbigpKQotCi0gICAgICAgIGJ1aWxkYm90LmNvcmVfYnVpbGRlcl9uYW1l c19yZWdleHBzID0gWyAnU25vd0xlb3BhcmQnLCAnUXQnIF0KLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbHMoYnVpbGRib3QucmVkX2NvcmVfYnVpbGRlcnNfbmFtZXMoKSwgWyB1J1Nub3dMZW9wYXJk IEludGVsIFJlbGVhc2UnLCB1J1F0IExpbnV4IFJlbGVhc2UnIF0pCi0gICAgICAgIHNlbGYuYXNz ZXJ0RmFsc2UoYnVpbGRib3QuY29yZV9idWlsZGVyc19hcmVfZ3JlZW4oKSkKLQotICAgIGRlZiB0 ZXN0X2J1aWxkZXJfbmFtZV9yZWdleHBzKHNlbGYpOgotICAgICAgICBidWlsZGJvdCA9IEJ1aWxk Qm90KCkKLQotICAgICAgICAjIEZvciBjb21wbGV0ZSB0ZXN0aW5nLCB0aGlzIGxpc3Qgc2hvdWxk IG1hdGNoIHRoZSBsaXN0IG9mIGJ1aWxkZXJzIGF0IGJ1aWxkLndlYmtpdC5vcmc6Ci0gICAgICAg IGV4YW1wbGVfYnVpbGRlcnMgPSBbCi0gICAgICAgICAgICB7J25hbWUnOiB1J0xlb3BhcmQgSW50 ZWwgUmVsZWFzZSAoQnVpbGQpJywgfSwKLSAgICAgICAgICAgIHsnbmFtZSc6IHUnTGVvcGFyZCBJ bnRlbCBSZWxlYXNlIChUZXN0cyknLCB9LAotICAgICAgICAgICAgeyduYW1lJzogdSdMZW9wYXJk IEludGVsIERlYnVnIChCdWlsZCknLCB9LAotICAgICAgICAgICAgeyduYW1lJzogdSdMZW9wYXJk IEludGVsIERlYnVnIChUZXN0cyknLCB9LAotICAgICAgICAgICAgeyduYW1lJzogdSdTbm93TGVv cGFyZCBJbnRlbCBSZWxlYXNlIChCdWlsZCknLCB9LAotICAgICAgICAgICAgeyduYW1lJzogdSdT bm93TGVvcGFyZCBJbnRlbCBSZWxlYXNlIChUZXN0cyknLCB9LAotICAgICAgICAgICAgeyduYW1l JzogdSdTbm93TGVvcGFyZCBJbnRlbCBSZWxlYXNlIChXZWJLaXQyIFRlc3RzKScsIH0sCi0gICAg ICAgICAgICB7J25hbWUnOiB1J1Nub3dMZW9wYXJkIEludGVsIExlYWtzJywgfSwKLSAgICAgICAg ICAgIHsnbmFtZSc6IHUnV2luZG93cyBSZWxlYXNlIChCdWlsZCknLCB9LAotICAgICAgICAgICAg eyduYW1lJzogdSdXaW5kb3dzIDcgUmVsZWFzZSAoVGVzdHMpJywgfSwKLSAgICAgICAgICAgIHsn bmFtZSc6IHUnV2luZG93cyBEZWJ1ZyAoQnVpbGQpJywgfSwKLSAgICAgICAgICAgIHsnbmFtZSc6 IHUnV2luZG93cyBYUCBEZWJ1ZyAoVGVzdHMpJywgfSwKLSAgICAgICAgICAgIHsnbmFtZSc6IHUn V2luZG93cyA3IFJlbGVhc2UgKFdlYktpdDIgVGVzdHMpJywgfSwKLSAgICAgICAgICAgIHsnbmFt ZSc6IHUnR1RLIExpbnV4IDMyLWJpdCBSZWxlYXNlJywgfSwKLSAgICAgICAgICAgIHsnbmFtZSc6 IHUnR1RLIExpbnV4IDY0LWJpdCBSZWxlYXNlJywgfSwKLSAgICAgICAgICAgIHsnbmFtZSc6IHUn R1RLIExpbnV4IDY0LWJpdCBEZWJ1ZycsIH0sCi0gICAgICAgICAgICB7J25hbWUnOiB1J1F0IExp bnV4IFJlbGVhc2UnLCB9LAotICAgICAgICAgICAgeyduYW1lJzogdSdRdCBMaW51eCBSZWxlYXNl IG1pbmltYWwnLCB9LAotICAgICAgICAgICAgeyduYW1lJzogdSdRdCBMaW51eCBBUk12NyBSZWxl YXNlJywgfSwKLSAgICAgICAgICAgIHsnbmFtZSc6IHUnUXQgV2luZG93cyAzMi1iaXQgUmVsZWFz ZScsIH0sCi0gICAgICAgICAgICB7J25hbWUnOiB1J1F0IFdpbmRvd3MgMzItYml0IERlYnVnJywg fSwKLSAgICAgICAgICAgIHsnbmFtZSc6IHUnQ2hyb21pdW0gQW5kcm9pZCBSZWxlYXNlJywgfSwK LSAgICAgICAgICAgIHsnbmFtZSc6IHUnQ2hyb21pdW0gV2luIFJlbGVhc2UnLCB9LAotICAgICAg ICAgICAgeyduYW1lJzogdSdDaHJvbWl1bSBXaW4gUmVsZWFzZSAoVGVzdHMpJywgfSwKLSAgICAg ICAgICAgIHsnbmFtZSc6IHUnQ2hyb21pdW0gTWFjIFJlbGVhc2UnLCB9LAotICAgICAgICAgICAg eyduYW1lJzogdSdDaHJvbWl1bSBNYWMgUmVsZWFzZSAoVGVzdHMpJywgfSwKLSAgICAgICAgICAg IHsnbmFtZSc6IHUnQ2hyb21pdW0gTGludXggUmVsZWFzZScsIH0sCi0gICAgICAgICAgICB7J25h bWUnOiB1J0Nocm9taXVtIExpbnV4IFJlbGVhc2UgKFRlc3RzKScsIH0sCi0gICAgICAgICAgICB7 J25hbWUnOiB1J0xlb3BhcmQgSW50ZWwgUmVsZWFzZSAoTlJXVCknLCB9LAotICAgICAgICAgICAg eyduYW1lJzogdSdTbm93TGVvcGFyZCBJbnRlbCBSZWxlYXNlIChOUldUKScsIH0sCi0gICAgICAg ICAgICB7J25hbWUnOiB1J05ldyBydW4td2Via2l0LXRlc3RzJywgfSwKLSAgICAgICAgICAgIHsn bmFtZSc6IHUnV2luQ2Fpcm8gRGVidWcgKEJ1aWxkKScsIH0sCi0gICAgICAgICAgICB7J25hbWUn OiB1J1dpbkNFIFJlbGVhc2UgKEJ1aWxkKScsIH0sCi0gICAgICAgICAgICB7J25hbWUnOiB1J0VG TCBMaW51eCBSZWxlYXNlIChCdWlsZCknLCB9LAotICAgICAgICBdCi0gICAgICAgIG5hbWVfcmVn ZXhwcyA9IFsKLSAgICAgICAgICAgICJTbm93TGVvcGFyZC4qQnVpbGQiLAotICAgICAgICAgICAg IlNub3dMZW9wYXJkLipcKFRlc3QiLAotICAgICAgICAgICAgIlNub3dMZW9wYXJkLipcKFdlYktp dDIgVGVzdCIsCi0gICAgICAgICAgICAiTGVvcGFyZC4qXCgoPzpCdWlsZHxUZXN0KSIsCi0gICAg ICAgICAgICAiV2luZG93cy4qQnVpbGQiLAotICAgICAgICAgICAgIldpbmRvd3MuKlwoVGVzdCIs Ci0gICAgICAgICAgICAiV2luQ0UiLAotICAgICAgICAgICAgIkVGTCIsCi0gICAgICAgICAgICAi R1RLLiozMiIsCi0gICAgICAgICAgICAiR1RLLio2NCIsCi0gICAgICAgICAgICAiUXQiLAotICAg ICAgICAgICAgIkNocm9taXVtLiooTWFjfExpbnV4fFdpbikuKlJlbGVhc2UkIiwKLSAgICAgICAg ICAgICJDaHJvbWl1bS4qKE1hY3xMaW51eHxXaW4pLipSZWxlYXNlLipcKFRlc3RzIiwKLSAgICAg ICAgXQotICAgICAgICBleHBlY3RlZF9idWlsZGVycyA9IFsKLSAgICAgICAgICAgIHsnbmFtZSc6 IHUnTGVvcGFyZCBJbnRlbCBSZWxlYXNlIChCdWlsZCknLCB9LAotICAgICAgICAgICAgeyduYW1l JzogdSdMZW9wYXJkIEludGVsIFJlbGVhc2UgKFRlc3RzKScsIH0sCi0gICAgICAgICAgICB7J25h bWUnOiB1J0xlb3BhcmQgSW50ZWwgRGVidWcgKEJ1aWxkKScsIH0sCi0gICAgICAgICAgICB7J25h bWUnOiB1J0xlb3BhcmQgSW50ZWwgRGVidWcgKFRlc3RzKScsIH0sCi0gICAgICAgICAgICB7J25h bWUnOiB1J1Nub3dMZW9wYXJkIEludGVsIFJlbGVhc2UgKEJ1aWxkKScsIH0sCi0gICAgICAgICAg ICB7J25hbWUnOiB1J1Nub3dMZW9wYXJkIEludGVsIFJlbGVhc2UgKFRlc3RzKScsIH0sCi0gICAg ICAgICAgICB7J25hbWUnOiB1J1Nub3dMZW9wYXJkIEludGVsIFJlbGVhc2UgKFdlYktpdDIgVGVz dHMpJywgfSwKLSAgICAgICAgICAgIHsnbmFtZSc6IHUnV2luZG93cyBSZWxlYXNlIChCdWlsZCkn LCB9LAotICAgICAgICAgICAgeyduYW1lJzogdSdXaW5kb3dzIDcgUmVsZWFzZSAoVGVzdHMpJywg fSwKLSAgICAgICAgICAgIHsnbmFtZSc6IHUnV2luZG93cyBEZWJ1ZyAoQnVpbGQpJywgfSwKLSAg ICAgICAgICAgIHsnbmFtZSc6IHUnV2luZG93cyBYUCBEZWJ1ZyAoVGVzdHMpJywgfSwKLSAgICAg ICAgICAgIHsnbmFtZSc6IHUnR1RLIExpbnV4IDMyLWJpdCBSZWxlYXNlJywgfSwKLSAgICAgICAg ICAgIHsnbmFtZSc6IHUnR1RLIExpbnV4IDY0LWJpdCBSZWxlYXNlJywgfSwKLSAgICAgICAgICAg IHsnbmFtZSc6IHUnR1RLIExpbnV4IDY0LWJpdCBEZWJ1ZycsIH0sCi0gICAgICAgICAgICB7J25h bWUnOiB1J1F0IExpbnV4IFJlbGVhc2UnLCB9LAotICAgICAgICAgICAgeyduYW1lJzogdSdRdCBM aW51eCBSZWxlYXNlIG1pbmltYWwnLCB9LAotICAgICAgICAgICAgeyduYW1lJzogdSdRdCBMaW51 eCBBUk12NyBSZWxlYXNlJywgfSwKLSAgICAgICAgICAgIHsnbmFtZSc6IHUnUXQgV2luZG93cyAz Mi1iaXQgUmVsZWFzZScsIH0sCi0gICAgICAgICAgICB7J25hbWUnOiB1J1F0IFdpbmRvd3MgMzIt Yml0IERlYnVnJywgfSwKLSAgICAgICAgICAgIHsnbmFtZSc6IHUnQ2hyb21pdW0gV2luIFJlbGVh c2UnLCB9LAotICAgICAgICAgICAgeyduYW1lJzogdSdDaHJvbWl1bSBXaW4gUmVsZWFzZSAoVGVz dHMpJywgfSwKLSAgICAgICAgICAgIHsnbmFtZSc6IHUnQ2hyb21pdW0gTWFjIFJlbGVhc2UnLCB9 LAotICAgICAgICAgICAgeyduYW1lJzogdSdDaHJvbWl1bSBNYWMgUmVsZWFzZSAoVGVzdHMpJywg fSwKLSAgICAgICAgICAgIHsnbmFtZSc6IHUnQ2hyb21pdW0gTGludXggUmVsZWFzZScsIH0sCi0g ICAgICAgICAgICB7J25hbWUnOiB1J0Nocm9taXVtIExpbnV4IFJlbGVhc2UgKFRlc3RzKScsIH0s Ci0gICAgICAgICAgICB7J25hbWUnOiB1J1dpbkNFIFJlbGVhc2UgKEJ1aWxkKScsIH0sCi0gICAg ICAgICAgICB7J25hbWUnOiB1J0VGTCBMaW51eCBSZWxlYXNlIChCdWlsZCknLCB9LAotICAgICAg ICBdCi0KLSAgICAgICAgIyBUaGlzIHRlc3Qgc2hvdWxkIHByb2JhYmx5IGJlIHVwZGF0ZWQgaWYg dGhlIGRlZmF1bHQgcmVnZXhwIGxpc3QgY2hhbmdlcwotICAgICAgICBzZWxmLmFzc2VydEVxdWFs cyhidWlsZGJvdC5jb3JlX2J1aWxkZXJfbmFtZXNfcmVnZXhwcywgbmFtZV9yZWdleHBzKQotCi0g ICAgICAgIGJ1aWxkZXJzID0gYnVpbGRib3QuX2J1aWxkZXJfc3RhdHVzZXNfd2l0aF9uYW1lc19t YXRjaGluZ19yZWdleHBzKGV4YW1wbGVfYnVpbGRlcnMsIG5hbWVfcmVnZXhwcykKLSAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMoYnVpbGRlcnMsIGV4cGVjdGVkX2J1aWxkZXJzKQotCiAgICAgZGVm IHRlc3RfYnVpbGRlcl93aXRoX25hbWUoc2VsZik6CiAgICAgICAgIGJ1aWxkYm90ID0gQnVpbGRC b3QoKQogCkBAIC00NDAsOCArMzMzLDEwIEBAIGNsYXNzIEJ1aWxkQm90VGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAKICAgICBkZWYgdGVzdF9sYXN0X2dyZWVuX3JldmlzaW9uKHNlbGYpOgogICAg ICAgICBidWlsZGJvdCA9IEJ1aWxkQm90KCkKLSAgICAgICAgZGVmIG1vY2tfYnVpbGRzX2Zyb21f YnVpbGRlcnMob25seV9jb3JlX2J1aWxkZXJzKToKKworICAgICAgICBkZWYgbW9ja19idWlsZHNf ZnJvbV9idWlsZGVycygpOgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2Zha2VfYnVpbGRzX2F0 X2luZGV4KDApCisKICAgICAgICAgYnVpbGRib3QuX2xhdGVzdF9idWlsZHNfZnJvbV9idWlsZGVy cyA9IG1vY2tfYnVpbGRzX2Zyb21fYnVpbGRlcnMKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChi dWlsZGJvdC5sYXN0X2dyZWVuX3JldmlzaW9uKCksIDEpCiAK