63854 2011-07-01 16:41:01 -0700 Refactor NRWT parsing logic in master.cfg to understand that run-webkit-tests might run NRWT 2011-07-01 16:45:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 abarth abarth aroben dpranke oldest_to_newest 431527 0 abarth 2011-07-01 16:41:01 -0700 Refactor NRWT parsing logic in master.cfg to understand that run-webkit-tests might run NRWT 431528 1 99537 abarth 2011-07-01 16:41:39 -0700 Created attachment 99537 Patch 431529 2 99537 dpranke 2011-07-01 16:44:35 -0700 Comment on attachment 99537 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=99537&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:263 > + if logText.find("Collecting tests ...") >= 0: Might be nice if NRWT had a slightly more obvious and reliable banner string to grep for ... maybe we should add a "Running new-run-webkit-tests" when we're printing the configuration or something. Not terribly important, though. 431532 3 abarth 2011-07-01 16:45:31 -0700 Committed r90298: <http://trac.webkit.org/changeset/90298> 99537 2011-07-01 16:41:39 -0700 2011-07-01 16:44:35 -0700 Patch bug-63854-20110701164138.patch text/plain 4274 abarth SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDkwMjk2KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTIgQEAKKzIwMTEtMDctMDEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKwor ICAgICAgICBSZWZhY3RvciBOUldUIHBhcnNpbmcgbG9naWMgaW4gbWFzdGVyLmNmZyB0byB1bmRl cnN0YW5kIHRoYXQgcnVuLXdlYmtpdC10ZXN0cyBtaWdodCBydW4gTlJXVAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjM4NTQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6CisKIDIwMTEtMDctMDEgIEVyaWMgU2Vp ZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3RzIHJl c3VsdHMgZG9lcyBub3QgdW5kZXJzdGFuZCB0aGF0IG1hYyB1c2VzIHRlc3RfZXhwZWN0YXRpb25z IGZpbGVzCkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNv bmZpZy9tYXN0ZXIuY2ZnCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcJKHJldmlzaW9uIDkwMjg5KQorKysgVG9v bHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwko d29ya2luZyBjb3B5KQpAQCAtMjE1LDEwICsyMTUsNyBAQCBjbGFzcyBSdW5XZWJLaXRUZXN0cyhz aGVsbC5UZXN0KToKICAgICAgICAgICAgIHNlbGYuc2V0Q29tbWFuZChzZWxmLmNvbW1hbmQgKyBy b290QXJndW1lbnQpCiAgICAgICAgIHJldHVybiBzaGVsbC5UZXN0LnN0YXJ0KHNlbGYpCiAKLSAg ICBkZWYgY29tbWFuZENvbXBsZXRlKHNlbGYsIGNtZCk6Ci0gICAgICAgIHNoZWxsLlRlc3QuY29t bWFuZENvbXBsZXRlKHNlbGYsIGNtZCkKLQotICAgICAgICBsb2dUZXh0ID0gY21kLmxvZ3NbJ3N0 ZGlvJ10uZ2V0VGV4dCgpCisgICAgZGVmIF9wYXJzZU9sZFJ1bldlYktpdFRlc3RzT3V0cHV0KHNl bGYpOgogICAgICAgICBpbmNvcnJlY3RMYXlvdXRMaW5lcyA9IFtdCiAgICAgICAgIGZvciBsaW5l IGluIGxvZ1RleHQuc3BsaXRsaW5lcygpOgogICAgICAgICAgICAgaWYgbGluZS5maW5kKCdoYWQg aW5jb3JyZWN0IGxheW91dCcpID49IDAgb3IgbGluZS5maW5kKCd3ZXJlIG5ldycpID49IDAgb3Ig bGluZS5maW5kKCd3YXMgbmV3JykgPj0gMDoKQEAgLTIzNCw2ICsyMzEsNDAgQEAgY2xhc3MgUnVu V2ViS2l0VGVzdHMoc2hlbGwuVGVzdCk6CiAKICAgICAgICAgc2VsZi5pbmNvcnJlY3RMYXlvdXRM aW5lcyA9IGluY29ycmVjdExheW91dExpbmVzCiAKKyAgICBkZWYgX3BhcnNlTmV3UnVuV2ViS2l0 VGVzdHNPdXRwdXQoc2VsZik6CisgICAgICAgIGluY29ycmVjdExheW91dExpbmVzID0gW10KKyAg ICAgICAgZXhwcmVzc2lvbnMgPSB7CisgICAgICAgICAgICAnZmFpbGVkJzogcmUuY29tcGlsZShy J1JlZ3Jlc3Npb25zOiBVbmV4cGVjdGVkLis6P1xzKlwoKFxkKylcKScpLAorICAgICAgICAgICAg J3dlcmUgZmxha3knOiByZS5jb21waWxlKHInVW5leHBlY3RlZCBmbGFraW5lc3MuKzo/XHMqXCgo XGQrKVwpJyksCisgICAgICAgICAgICAnbmV3IHBhc3Nlcyc6IHJlLmNvbXBpbGUocidFeHBlY3Rl ZCB0byAuKywgYnV0IHBhc3NlZDpccytcKChcZCspXCknKSwKKyAgICAgICAgfQorICAgICAgICB0 ZXN0RmFpbHVyZXMgPSB7fQorCisgICAgICAgIGZvciBsaW5lIGluIGxvZ1RleHQuc3BsaXRsaW5l cygpOgorICAgICAgICAgICAgaWYgbGluZS5maW5kKCdFeGl0aW5nIGVhcmx5JykgPj0gMDoKKyAg ICAgICAgICAgICAgICBpbmNvcnJlY3RMYXlvdXRMaW5lcy5hcHBlbmQobGluZSkKKyAgICAgICAg ICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgZm9yIG5hbWUgaW4gZXhwcmVzc2lvbnM6Cisg ICAgICAgICAgICAgICAgbWF0Y2ggPSBleHByZXNzaW9uc1tuYW1lXS5zZWFyY2gobGluZSkKKyAg ICAgICAgICAgICAgICBpZiBtYXRjaDoKKyAgICAgICAgICAgICAgICAgICAgdGVzdEZhaWx1cmVz W25hbWVdID0gdGVzdEZhaWx1cmVzLmdldChuYW1lLCAwKSArIGludChtYXRjaC5ncm91cCgxKSkK KworICAgICAgICAgICAgICAgICMgRklYTUU6IFBhcnNlIGZpbGUgbmFtZXMgYW5kIHB1dCB0aGVt IGluIHJlc3VsdHMKKworICAgICAgICBmb3IgbmFtZSBpbiB0ZXN0RmFpbHVyZXM6CisgICAgICAg ICAgICBpbmNvcnJlY3RMYXlvdXRMaW5lcy5hcHBlbmQoc3RyKHRlc3RGYWlsdXJlc1tuYW1lXSkg KyAnICcgKyBuYW1lKQorCisgICAgICAgIHNlbGYuaW5jb3JyZWN0TGF5b3V0TGluZXMgPSBpbmNv cnJlY3RMYXlvdXRMaW5lcworCisgICAgZGVmIGNvbW1hbmRDb21wbGV0ZShzZWxmLCBjbWQpOgor ICAgICAgICBzaGVsbC5UZXN0LmNvbW1hbmRDb21wbGV0ZShzZWxmLCBjbWQpCisKKyAgICAgICAg bG9nVGV4dCA9IGNtZC5sb2dzWydzdGRpbyddLmdldFRleHQoKQorICAgICAgICBpZiBsb2dUZXh0 LmZpbmQoIkNvbGxlY3RpbmcgdGVzdHMgLi4uIikgPj0gMDoKKyAgICAgICAgICAgIHNlbGYuX3Bh cnNlTmV3UnVuV2ViS2l0VGVzdHNPdXRwdXQobG9nVGV4dCkKKyAgICAgICAgZWxzZToKKyAgICAg ICAgICAgIHNlbGYuX3BhcnNlT2xkUnVuV2ViS2l0VGVzdHNPdXRwdXQobG9nVGV4dCkKKwogICAg IGRlZiBldmFsdWF0ZUNvbW1hbmQoc2VsZiwgY21kKToKICAgICAgICAgaWYgc2VsZi5pbmNvcnJl Y3RMYXlvdXRMaW5lczoKICAgICAgICAgICAgIGlmIGxlbihzZWxmLmluY29ycmVjdExheW91dExp bmVzKSA9PSAxOgpAQCAtMjcyLDI5ICszMDMsNyBAQCBjbGFzcyBOZXdSdW5XZWJLaXRUZXN0cyhS dW5XZWJLaXRUZXN0cyk6CiAgICAgICAgIHNoZWxsLlRlc3QuY29tbWFuZENvbXBsZXRlKHNlbGYs IGNtZCkKIAogICAgICAgICBsb2dUZXh0ID0gY21kLmxvZ3NbJ3N0ZGlvJ10uZ2V0VGV4dCgpCi0g ICAgICAgIGluY29ycmVjdExheW91dExpbmVzID0gW10KLSAgICAgICAgZXhwcmVzc2lvbnMgPSB7 Ci0gICAgICAgICAgICAnZmFpbGVkJzogcmUuY29tcGlsZShyJ1JlZ3Jlc3Npb25zOiBVbmV4cGVj dGVkLis6P1xzKlwoKFxkKylcKScpLAotICAgICAgICAgICAgJ3dlcmUgZmxha3knOiByZS5jb21w aWxlKHInVW5leHBlY3RlZCBmbGFraW5lc3MuKzo/XHMqXCgoXGQrKVwpJyksCi0gICAgICAgICAg ICAnbmV3IHBhc3Nlcyc6IHJlLmNvbXBpbGUocidFeHBlY3RlZCB0byAuKywgYnV0IHBhc3NlZDpc cytcKChcZCspXCknKSwKLSAgICAgICAgfQotICAgICAgICB0ZXN0RmFpbHVyZXMgPSB7fQotCi0g ICAgICAgIGZvciBsaW5lIGluIGxvZ1RleHQuc3BsaXRsaW5lcygpOgotICAgICAgICAgICAgaWYg bGluZS5maW5kKCdFeGl0aW5nIGVhcmx5JykgPj0gMDoKLSAgICAgICAgICAgICAgICBpbmNvcnJl Y3RMYXlvdXRMaW5lcy5hcHBlbmQobGluZSkKLSAgICAgICAgICAgICAgICBjb250aW51ZQotICAg ICAgICAgICAgZm9yIG5hbWUgaW4gZXhwcmVzc2lvbnM6Ci0gICAgICAgICAgICAgICAgbWF0Y2gg PSBleHByZXNzaW9uc1tuYW1lXS5zZWFyY2gobGluZSkKLSAgICAgICAgICAgICAgICBpZiBtYXRj aDoKLSAgICAgICAgICAgICAgICAgICAgdGVzdEZhaWx1cmVzW25hbWVdID0gdGVzdEZhaWx1cmVz LmdldChuYW1lLCAwKSArIGludChtYXRjaC5ncm91cCgxKSkKLQotICAgICAgICAgICAgICAgICMg RklYTUU6IFBhcnNlIGZpbGUgbmFtZXMgYW5kIHB1dCB0aGVtIGluIHJlc3VsdHMKLQotICAgICAg ICBmb3IgbmFtZSBpbiB0ZXN0RmFpbHVyZXM6Ci0gICAgICAgICAgICBpbmNvcnJlY3RMYXlvdXRM aW5lcy5hcHBlbmQoc3RyKHRlc3RGYWlsdXJlc1tuYW1lXSkgKyAnICcgKyBuYW1lKQotCi0gICAg ICAgIHNlbGYuaW5jb3JyZWN0TGF5b3V0TGluZXMgPSBpbmNvcnJlY3RMYXlvdXRMaW5lcworICAg ICAgICBzZWxmLl9wYXJzZU5ld1J1bldlYktpdFRlc3RzT3V0cHV0KGxvZ1RleHQpCiAKICAgICBk ZWYgZXZhbHVhdGVDb21tYW5kKHNlbGYsIGNtZCk6CiAgICAgICAgIGlmIGNtZC5yYyAhPSAwOgo=