92781 2012-07-31 12:03:05 -0700 nrwt: clean up prepare_lists_and_print_output, run, set_up_run a bit 2012-07-31 12:43:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED NRWT P2 Normal --- 92702 89267 92784 1 dpranke dpranke abarth eric ojan rniwa tony oldest_to_newest 683349 0 dpranke 2012-07-31 12:03:05 -0700 nrwt: clean up prepare_lists_and_print_output, run, set_up_run a bit 683352 1 155602 dpranke 2012-07-31 12:03:52 -0700 Created attachment 155602 Patch 683378 2 155602 rniwa 2012-07-31 12:22:08 -0700 Comment on attachment 155602 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155602&action=review > Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:695 > + if not self._test_names: Shouldn't we checking this after subtracting tests_to_skip? 683392 3 dpranke 2012-07-31 12:43:05 -0700 Committed r124240: <http://trac.webkit.org/changeset/124240> 155602 2012-07-31 12:03:52 -0700 2012-07-31 12:22:08 -0700 Patch bug-92781-20120731120335.patch text/plain 6848 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGE0NmE4NjBkOTY5YWZkYWVmODU3ZmYyNWE2YjAzOTZk MWJiMWVlMC4uMmYyMmVhMjhhN2YyMDBkZjNlYjIyODY3MGM3MTA4MjBjNzc4MDVlNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDEyLTA3LTMxICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5yd3Q6IGNsZWFuIHVwIHByZXBhcmVfbGlzdHNfYW5kX3ByaW50X291dHB1dCwgcnVu LCBzZXRfdXBfcnVuIGEgYml0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05Mjc4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE1vcmUgcmVmYWN0b3JpbmcgLi4uIHJlbmFtZSBwcmVwYXJlX2xpc3RzX2FuZF9w cmludF9vdXRwdXQgdG8KKyAgICAgICAganVzdCBwcmVwYXJlX2xpc3RzIHNvIHRoYXQgaXQgb25s eSBoYXMgYSBzaW5nbGUgcHVycG9zZSwgYW5kCisgICAgICAgIGNsZWFuIHVwIHRoZSBzdXJyb3Vu ZGluZyBjb2RlIGEgYml0IGFzIHdlbGwuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5OgorICAgICAgICAoTWFuYWdlci5fY29s bGVjdF90ZXN0cyk6CisgICAgICAgIChNYW5hZ2VyLl9wcmVwYXJlX2xpc3RzKToKKyAgICAgICAg KE1hbmFnZXIuX3NldF91cF9ydW4pOgorICAgICAgICAoTWFuYWdlci5ydW4pOgorCiAyMDEyLTA3 LTMwICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIG5yd3Q6 IGNsZWFuIHVwIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdCB2cy4gc2VsZi5fdGVzdF9maWxlcywgb3Ro ZXIgbml0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv Y29udHJvbGxlcnMvbWFuYWdlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKaW5kZXggYWVjNjI3MzU5YzUzYjg4N2QyZmYxNTc5 YTQwYmMwOGJjM2M1OGU2ZS4uN2NjYTBmOTExNDdiNGM5ZmYyMDM3ZWYwZmQxZTRkZDEyMWM5NzRh ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJv bGxlcnMvbWFuYWdlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CkBAIC0zMzAsNyArMzMwLDcgQEAgY2xhc3MgTWFuYWdl cihvYmplY3QpOgogICAgICAgICBzZWxmLl9maW5kZXIgPSBMYXlvdXRUZXN0RmluZGVyKHNlbGYu X3BvcnQsIHNlbGYuX29wdGlvbnMpCiAKICAgICBkZWYgX2NvbGxlY3RfdGVzdHMoc2VsZiwgYXJn cyk6Ci0gICAgICAgIHNlbGYuX3BhdGhzLCBzZWxmLl90ZXN0X25hbWVzID0gc2VsZi5fZmluZGVy LmZpbmRfdGVzdHMoc2VsZi5fb3B0aW9ucywgYXJncykKKyAgICAgICAgcmV0dXJuIHNlbGYuX2Zp bmRlci5maW5kX3Rlc3RzKHNlbGYuX29wdGlvbnMsIGFyZ3MpCiAKICAgICBkZWYgX2lzX2h0dHBf dGVzdChzZWxmLCB0ZXN0KToKICAgICAgICAgcmV0dXJuIHNlbGYuSFRUUF9TVUJESVIgaW4gdGVz dCBvciBzZWxmLldFQlNPQ0tFVF9TVUJESVIgaW4gdGVzdApAQCAtMzQ0LDIxICszNDQsMTIgQEAg Y2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgIGRlZiBfaXNfcGVyZl90ZXN0KHNlbGYsIHRlc3Qp OgogICAgICAgICByZXR1cm4gc2VsZi5QRVJGX1NVQkRJUiA9PSB0ZXN0IG9yIChzZWxmLlBFUkZf U1VCRElSICsgc2VsZi5fcG9ydC5URVNUX1BBVEhfU0VQQVJBVE9SKSBpbiB0ZXN0CiAKLSAgICAj IEZJWE1FOiBUaGlzIG1ldGhvZCBpcyB3YXkgdG9vIGxvbmcgYW5kIG5lZWRzIHRvIGJlIGJyb2tl biBpbnRvIHBpZWNlcy4KLSAgICBkZWYgcHJlcGFyZV9saXN0c19hbmRfcHJpbnRfb3V0cHV0KHNl bGYpOgotICAgICAgICAiIiJDcmVhdGUgYXBwcm9wcmlhdGUgc3Vic2V0cyBvZiB0ZXN0IGxpc3Rz IGFuZCByZXR1cm5zIGEKLSAgICAgICAgUmVzdWx0U3VtbWFyeSBvYmplY3QuIEFsc28gcHJpbnRz IGV4cGVjdGVkIHRlc3QgY291bnRzLgotICAgICAgICAiIiIKLSAgICAgICAgbnVtX2FsbF90ZXN0 X2ZpbGVzID0gbGVuKHNlbGYuX3Rlc3RfbmFtZXMpCi0KKyAgICBkZWYgX3ByZXBhcmVfbGlzdHMo c2VsZik6CiAgICAgICAgIHRlc3RzX3RvX3NraXAgPSBzZWxmLl9maW5kZXIuc2tpcF90ZXN0cyhz ZWxmLl9wYXRocywgc2VsZi5fdGVzdF9uYW1lcywgc2VsZi5fZXhwZWN0YXRpb25zLCBzZWxmLl9o dHRwX3Rlc3RzKCkpCi0gICAgICAgIGlmIG5vdCBzZWxmLl90ZXN0X25hbWVzOgotICAgICAgICAg ICAgX2xvZy5jcml0aWNhbCgnTm8gdGVzdHMgdG8gcnVuLicpCi0gICAgICAgICAgICByZXR1cm4g Tm9uZQorICAgICAgICBzZWxmLl90ZXN0X25hbWVzID0gbGlzdChzZXQoc2VsZi5fdGVzdF9uYW1l cykgLSB0ZXN0c190b19za2lwKQogCiAgICAgICAgICMgQ3JlYXRlIGEgc29ydGVkIGxpc3Qgb2Yg dGVzdCBmaWxlcyBzbyB0aGUgc3Vic2V0IGNodW5rLAogICAgICAgICAjIGlmIHVzZWQsIGNvbnRh aW5zIGFscGhhYmV0aWNhbGx5IGNvbnNlY3V0aXZlIHRlc3RzLgotICAgICAgICBzZWxmLl90ZXN0 X25hbWVzID0gbGlzdChzZXQoc2VsZi5fdGVzdF9uYW1lcykgLSB0ZXN0c190b19za2lwKQogICAg ICAgICBpZiBzZWxmLl9vcHRpb25zLnJhbmRvbWl6ZV9vcmRlcjoKICAgICAgICAgICAgIHJhbmRv bS5zaHVmZmxlKHNlbGYuX3Rlc3RfbmFtZXMpCiAgICAgICAgIGVsc2U6CkBAIC0zNzgsMTIgKzM2 OSw3IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgICAgIHNlbGYuX3Rlc3RfbmFt ZXMgPSBzZWxmLl90ZXN0X25hbWVzICogc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zCiAKICAgICAg ICAgaXRlcmF0aW9ucyA9IHNlbGYuX29wdGlvbnMucmVwZWF0X2VhY2ggKiBzZWxmLl9vcHRpb25z Lml0ZXJhdGlvbnMKLSAgICAgICAgcmVzdWx0X3N1bW1hcnkgPSBSZXN1bHRTdW1tYXJ5KHNlbGYu X2V4cGVjdGF0aW9ucywgc2V0KHNlbGYuX3Rlc3RfbmFtZXMpLCBpdGVyYXRpb25zLCB0ZXN0c190 b19za2lwKQotCi0gICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfZm91bmQobnVtX2FsbF90ZXN0 X2ZpbGVzLCBsZW4oc2VsZi5fdGVzdF9uYW1lcyksIHNlbGYuX29wdGlvbnMucmVwZWF0X2VhY2gs IHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucykKLSAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9l eHBlY3RlZChyZXN1bHRfc3VtbWFyeSwgc2VsZi5fZXhwZWN0YXRpb25zLmdldF90ZXN0c193aXRo X3Jlc3VsdF90eXBlKQotCi0gICAgICAgIHJldHVybiByZXN1bHRfc3VtbWFyeQorICAgICAgICBy ZXR1cm4gUmVzdWx0U3VtbWFyeShzZWxmLl9leHBlY3RhdGlvbnMsIHNldChzZWxmLl90ZXN0X25h bWVzKSwgaXRlcmF0aW9ucywgdGVzdHNfdG9fc2tpcCkKIAogICAgIGRlZiBfZ2V0X2Rpcl9mb3Jf dGVzdF9maWxlKHNlbGYsIHRlc3RfZmlsZSk6CiAgICAgICAgICIiIlJldHVybnMgdGhlIGhpZ2hl c3QtbGV2ZWwgZGlyZWN0b3J5IGJ5IHdoaWNoIHRvIHNoYXJkIHRoZSBnaXZlbgpAQCAtNjYzLDEy ICs2NDksMTEgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICByZXR1cm4gYW55KHNl bGYuX3Rlc3RfcmVxdWlyZXNfbG9jayh0ZXN0X25hbWUpIGZvciB0ZXN0X25hbWUgaW4gc2VsZi5f dGVzdF9uYW1lcykgYW5kIHNlbGYuX29wdGlvbnMuaHR0cAogCiAgICAgZGVmIF9zZXRfdXBfcnVu KHNlbGYpOgotICAgICAgICAiIiJDb25maWd1cmVzIHRoZSBzeXN0ZW0gdG8gYmUgcmVhZHkgdG8g cnVuIHRlc3RzLgotCi0gICAgICAgIFJldHVybnMgYSBSZXN1bHRTdW1tYXJ5IG9iamVjdCBpZiB3 ZSBzaG91bGQgY29udGludWUgdG8gcnVuIHRlc3RzLAotICAgICAgICBvciBOb25lIGlmIHdlIHNo b3VsZCBhYm9ydC4KKyAgICAgICAgc2VsZi5fcHJpbnRlci53cml0ZV91cGRhdGUoIkNoZWNraW5n IGJ1aWxkIC4uLiIpCisgICAgICAgIGlmIG5vdCBzZWxmLl9wb3J0LmNoZWNrX2J1aWxkKHNlbGYu bmVlZHNfc2VydmVycygpKToKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoIkJ1aWxkIGNoZWNrIGZh aWxlZCIpCisgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAotICAgICAgICAiIiIKICAgICAgICAg IyBUaGlzIG11c3QgYmUgc3RhcnRlZCBiZWZvcmUgd2UgY2hlY2sgdGhlIHN5c3RlbSBkZXBlbmRl bmNpZXMsCiAgICAgICAgICMgc2luY2UgdGhlIGhlbHBlciBtYXkgZG8gdGhpbmdzIHRvIG1ha2Ug dGhlIHNldHVwIGNvcnJlY3QuCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMucGl4ZWxfdGVzdHM6 CkBAIC02ODAsNyArNjY1LDcgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAgICAg c2VsZi5fcHJpbnRlci53cml0ZV91cGRhdGUoIkNoZWNraW5nIHN5c3RlbSBkZXBlbmRlbmNpZXMg Li4uIikKICAgICAgICAgICAgIGlmIG5vdCBzZWxmLl9wb3J0LmNoZWNrX3N5c19kZXBzKHNlbGYu bmVlZHNfc2VydmVycygpKToKICAgICAgICAgICAgICAgICBzZWxmLl9wb3J0LnN0b3BfaGVscGVy KCkKLSAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQorICAgICAgICAgICAgICAgIHJldHVybiBG YWxzZQogCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMuY2xvYmJlcl9vbGRfcmVzdWx0czoKICAg ICAgICAgICAgIHNlbGYuX2Nsb2JiZXJfb2xkX3Jlc3VsdHMoKQpAQCAtNjg5LDM2ICs2NzQsMzMg QEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICBzZWxmLl9wb3J0Lmhvc3QuZmlsZXN5 c3RlbS5tYXliZV9tYWtlX2RpcmVjdG9yeShzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSkKIAogICAg ICAgICBzZWxmLl9wb3J0LnNldHVwX3Rlc3RfcnVuKCkKLQotICAgICAgICBzZWxmLl9wcmludGVy LndyaXRlX3VwZGF0ZSgiUHJlcGFyaW5nIHRlc3RzIC4uLiIpCi0gICAgICAgIHJlc3VsdF9zdW1t YXJ5ID0gc2VsZi5wcmVwYXJlX2xpc3RzX2FuZF9wcmludF9vdXRwdXQoKQotICAgICAgICBpZiBu b3QgcmVzdWx0X3N1bW1hcnk6Ci0gICAgICAgICAgICByZXR1cm4gTm9uZQotCi0gICAgICAgIHJl dHVybiByZXN1bHRfc3VtbWFyeQorICAgICAgICByZXR1cm4gVHJ1ZQogCiAgICAgZGVmIHJ1bihz ZWxmLCBhcmdzKToKICAgICAgICAgIiIiUnVuIGFsbCBvdXIgdGVzdHMgb24gYWxsIG91ciB0ZXN0 IGZpbGVzIGFuZCByZXR1cm4gdGhlIG51bWJlciBvZiB1bmV4cGVjdGVkIHJlc3VsdHMgKDAgPT0g c3VjY2VzcykuIiIiCiAgICAgICAgIHNlbGYuX3ByaW50ZXIud3JpdGVfdXBkYXRlKCJDb2xsZWN0 aW5nIHRlc3RzIC4uLiIpCiAgICAgICAgIHRyeToKLSAgICAgICAgICAgIHNlbGYuX2NvbGxlY3Rf dGVzdHMoYXJncykKLSAgICAgICAgZXhjZXB0IElPRXJyb3IgYXMgZToKLSAgICAgICAgICAgICMg VGhpcyBpcyByYWlzZWQgd2hlbiB0aGUgLS10ZXN0LWxpc3QgZG9lc24ndCBleGlzdC4KLSAgICAg ICAgICAgIHJldHVybiAtMQotCi0gICAgICAgIHNlbGYuX3ByaW50ZXIud3JpdGVfdXBkYXRlKCJD aGVja2luZyBidWlsZCAuLi4iKQotICAgICAgICBpZiBub3Qgc2VsZi5fcG9ydC5jaGVja19idWls ZChzZWxmLm5lZWRzX3NlcnZlcnMoKSk6Ci0gICAgICAgICAgICBfbG9nLmVycm9yKCJCdWlsZCBj aGVjayBmYWlsZWQiKQorICAgICAgICAgICAgc2VsZi5fcGF0aHMsIHNlbGYuX3Rlc3RfbmFtZXMg PSBzZWxmLl9jb2xsZWN0X3Rlc3RzKGFyZ3MpCisgICAgICAgIGV4Y2VwdCBJT0Vycm9yIGFzIGV4 Y2VwdGlvbjoKKyAgICAgICAgICAgICMgVGhpcyBpcyByYWlzZWQgaWYgLS10ZXN0LWxpc3QgZG9l c24ndCBleGlzdAogICAgICAgICAgICAgcmV0dXJuIC0xCiAKICAgICAgICAgc2VsZi5fcHJpbnRl ci53cml0ZV91cGRhdGUoIlBhcnNpbmcgZXhwZWN0YXRpb25zIC4uLiIpCiAgICAgICAgIHNlbGYu X2V4cGVjdGF0aW9ucyA9IHRlc3RfZXhwZWN0YXRpb25zLlRlc3RFeHBlY3RhdGlvbnMoc2VsZi5f cG9ydCwgc2VsZi5fdGVzdF9uYW1lcykKIAotICAgICAgICByZXN1bHRfc3VtbWFyeSA9IHNlbGYu X3NldF91cF9ydW4oKQotICAgICAgICBpZiBub3QgcmVzdWx0X3N1bW1hcnk6CisgICAgICAgIG51 bV9hbGxfdGVzdF9maWxlc19mb3VuZCA9IGxlbihzZWxmLl90ZXN0X25hbWVzKQorICAgICAgICBy ZXN1bHRfc3VtbWFyeSA9IHNlbGYuX3ByZXBhcmVfbGlzdHMoKQorCisgICAgICAgICMgQ2hlY2sg dG8gbWFrZSBzdXJlIHdlJ3JlIG5vdCBza2lwcGluZyBldmVyeSB0ZXN0LgorICAgICAgICBpZiBu b3Qgc2VsZi5fdGVzdF9uYW1lczoKKyAgICAgICAgICAgIF9sb2cuY3JpdGljYWwoJ05vIHRlc3Rz IHRvIHJ1bi4nKQogICAgICAgICAgICAgcmV0dXJuIC0xCiAKLSAgICAgICAgYXNzZXJ0KHNlbGYu X3Rlc3RfbmFtZXMpCisgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfZm91bmQobnVtX2FsbF90 ZXN0X2ZpbGVzX2ZvdW5kLCBsZW4oc2VsZi5fdGVzdF9uYW1lcyksIHNlbGYuX29wdGlvbnMucmVw ZWF0X2VhY2gsIHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucykKKyAgICAgICAgc2VsZi5fcHJpbnRl ci5wcmludF9leHBlY3RlZChyZXN1bHRfc3VtbWFyeSwgc2VsZi5fZXhwZWN0YXRpb25zLmdldF90 ZXN0c193aXRoX3Jlc3VsdF90eXBlKQorCisgICAgICAgIGlmIG5vdCBzZWxmLl9zZXRfdXBfcnVu KCk6CisgICAgICAgICAgICByZXR1cm4gLTEKIAogICAgICAgICBzdGFydF90aW1lID0gdGltZS50 aW1lKCkKIAo=