60063 2011-05-03 14:18:17 -0700 Update rebaseline queue server to handle hierarchical test results 2011-05-03 17:23:32 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mihaip mihaip ojan oldest_to_newest 397385 0 mihaip 2011-05-03 14:18:17 -0700 Update rebaseline queue server to handle hierarchical test results 397387 1 92130 mihaip 2011-05-03 14:19:22 -0700 Created attachment 92130 Patch 397523 2 92130 ojan 2011-05-03 16:34:36 -0700 Comment on attachment 92130 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92130&action=review Whoops. Sorry. I thought I found all the places that read in the results. > Tools/RebaselineQueueServer/templates/builder-queue-edit.html:59 > + console.dir(results); Did you mean to leave this in? > Tools/RebaselineQueueServer/templates/builder-queue-edit.html:72 > + if (actual != expected && > + expected.split(' ').indexOf(actual) == -1 && > + actual != 'SKIP' && > + actual.indexOf('PASS') == -1 && > + (expected.indexOf('FAIL') == -1 || actual.indexOf('TIMEOUT') != -1)) { > + results.name = test; nit: i prefer the old code if you changed the continue to an early return. But your call. 397563 3 mihaip 2011-05-03 17:20:53 -0700 (In reply to comment #2) > Did you mean to leave this in? Nope, removed. > nit: i prefer the old code if you changed the continue to an early return. But your call. Yeah, that's better. Switched back. 397566 4 mihaip 2011-05-03 17:23:32 -0700 Committed r85692: <http://trac.webkit.org/changeset/85692> 92130 2011-05-03 14:19:22 -0700 2011-05-03 16:34:36 -0700 Patch bug-60063-20110503141921.patch text/plain 3659 mihaip U3VidmVyc2lvbiBSZXZpc2lvbjogODU2MTQKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNDAwYmE2ZmVmYmQ0MzY4ZDczZjNhZTNiN2M2ZjA4ZWNl ZmUzMmU5Li45ZjJmYWQ3N2Q0NWM2NzA4MjYwNjY4MDhiNGIyYjI1MDEwNjhjODdmIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTEtMDUtMDMgIE1paGFpIFBhcnBhcml0YSAgPG1paGFpcEBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIHJl YmFzZWxpbmUgcXVldWUgc2VydmVyIHRvIGhhbmRsZSBoaWVyYXJjaGljYWwgdGVzdCByZXN1bHRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDA2Mwor ICAgICAgICAKKyAgICAgICAgVXBkYXRlIHRlc3QgcmVzdWx0IHBhcnNpbmcgZG9uZSBieSB0aGUg cmViYXNlbGluZSBxdWV1ZSBzZXJ2ZXIgdG8gaGFuZGxlCisgICAgICAgIHRoZSBoaWVyYXJjaGlj YWwgdGVzdCByZXN1bHQgb3V0cHV0IHRoYXQgaXMgZ2VuZXJhdGVkIGFzIG9mIHI4NTI1NC4KKwor ICAgICAgICAqIFJlYmFzZWxpbmVRdWV1ZVNlcnZlci90ZW1wbGF0ZXMvYnVpbGRlci1xdWV1ZS1l ZGl0Lmh0bWw6CisKIDIwMTEtMDUtMDIgIE9qYW4gVmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgpkaWZmIC0tZ2l0IGEvVG9vbHMvUmVi YXNlbGluZVF1ZXVlU2VydmVyL3RlbXBsYXRlcy9idWlsZGVyLXF1ZXVlLWVkaXQuaHRtbCBiL1Rv b2xzL1JlYmFzZWxpbmVRdWV1ZVNlcnZlci90ZW1wbGF0ZXMvYnVpbGRlci1xdWV1ZS1lZGl0Lmh0 bWwKaW5kZXggMjFhMGYwMjAwNjk2ZDczZmU3MzZkOWYxOTE0NzEzOWM0OTdkZmJmNy4uOGIxMjc1 YTNkYzUxZDY2MThjYjhlMzQ4NGIzOGQ0ODA1ODQ5MThjOCAxMDA2NDQKLS0tIGEvVG9vbHMvUmVi YXNlbGluZVF1ZXVlU2VydmVyL3RlbXBsYXRlcy9idWlsZGVyLXF1ZXVlLWVkaXQuaHRtbAorKysg Yi9Ub29scy9SZWJhc2VsaW5lUXVldWVTZXJ2ZXIvdGVtcGxhdGVzL2J1aWxkZXItcXVldWUtZWRp dC5odG1sCkBAIC00NCw3ICs0NCw3IEBAIHZhciBxdWV1ZWRUZXN0TmFtZXMgPSB7eyBxdWV1ZWRf dGVzdF9uYW1lc3xzYWZlIH19OwogCiBmdW5jdGlvbiBpbml0KCkKIHsKLSAgdmFyIGJ1aWxkZXJN YXN0ZXIgPSBCVUlMREVSX1RPX01BU1RFUltidWlsZGVyTmFtZV07CisgIHZhciBidWlsZGVyTWFz dGVyID0gQlVJTERFUl9UT19NQVNURVJbYnVpbGRlck5hbWVdIHx8IENIUk9NSVVNX0dQVV9CVUlM REVSX01BU1RFUjsKICAgdmFyIHJlc3VsdHNVcmwgPSBURVNUX1JFU1VMVFNfU0VSVkVSICsgJ3Rl c3RmaWxlP2J1aWxkZXI9JyArIGJ1aWxkZXJOYW1lICsKICAgICAgICcmbWFzdGVyPScgKyBidWls ZGVyTWFzdGVyLm5hbWUgKwogICAgICAgJyZ0ZXN0dHlwZT1sYXlvdXQtdGVzdHMmbmFtZT1mdWxs X3Jlc3VsdHMuanNvbic7CkBAIC01NiwzMCArNTYsNDMgQEAgZnVuY3Rpb24gaW5pdCgpCiAKIGZ1 bmN0aW9uIEFERF9SRVNVTFRTKHJlc3VsdHMpCiB7CisgICAgY29uc29sZS5kaXIocmVzdWx0cyk7 CiAgICAgdmFyIGJ1aWxkZXJHcm91cE5hbWUgPSBCVUlMREVSX1RPX0dST1VQW2J1aWxkZXJOYW1l XTsKIAotICAgIHZhciB0ZXN0cyA9IHJlc3VsdHMudGVzdHM7CiAgICAgdmFyIGZhaWxpbmdUZXN0 cyA9IFtdOwogICAgIHZhciBxdWV1ZWRUZXN0cyA9IFtdOwotICAgIGZvciAodmFyIHRlc3QgaW4g dGVzdHMpIHsKLSAgICAgICAgdmFyIHRlc3RSZXN1bHRzID0gdGVzdHNbdGVzdF07Ci0gICAgICAg IGlmICh0ZXN0UmVzdWx0cy5hY3R1YWwgPT0gdGVzdFJlc3VsdHMuZXhwZWN0ZWQgfHwKLSAgICAg ICAgICAgIHRlc3RSZXN1bHRzLmV4cGVjdGVkLnNwbGl0KCcgJykuaW5kZXhPZih0ZXN0UmVzdWx0 cy5hY3R1YWwpICE9IC0xIHx8Ci0gICAgICAgICAgICB0ZXN0UmVzdWx0cy5hY3R1YWwgPT0gJ1NL SVAnIHx8Ci0gICAgICAgICAgICB0ZXN0UmVzdWx0cy5hY3R1YWwuaW5kZXhPZignUEFTUycpICE9 IC0xIHx8Ci0gICAgICAgICAgICAodGVzdFJlc3VsdHMuYWN0dWFsICE9ICdQQVNTJyAmJiB0ZXN0 UmVzdWx0cy5leHBlY3RlZC5pbmRleE9mKCdGQUlMJykgIT0gLTEpKSB7Ci0gICAgICAgICAgICBj b250aW51ZTsKKyAgICBmdW5jdGlvbiBwcm9jZXNzVGVzdFJlc3VsdCh0ZXN0LCByZXN1bHRzKSB7 CisgICAgICAgIHZhciBhY3R1YWwgPSByZXN1bHRzLmFjdHVhbDsKKyAgICAgICAgdmFyIGV4cGVj dGVkID0gcmVzdWx0cy5leHBlY3RlZDsKKyAgICAgICAgaWYgKGFjdHVhbCAhPSBleHBlY3RlZCAm JgorICAgICAgICAgICAgZXhwZWN0ZWQuc3BsaXQoJyAnKS5pbmRleE9mKGFjdHVhbCkgPT0gLTEg JiYKKyAgICAgICAgICAgIGFjdHVhbCAhPSAnU0tJUCcgJiYKKyAgICAgICAgICAgIGFjdHVhbC5p bmRleE9mKCdQQVNTJykgPT0gLTEgJiYKKyAgICAgICAgICAgIChleHBlY3RlZC5pbmRleE9mKCdG QUlMJykgPT0gLTEgfHwgYWN0dWFsLmluZGV4T2YoJ1RJTUVPVVQnKSAhPSAtMSkpIHsKKyAgICAg ICAgICByZXN1bHRzLm5hbWUgPSB0ZXN0OworCisgICAgICAgICAgaWYgKHF1ZXVlZFRlc3ROYW1l cy5pbmRleE9mKHRlc3QpICE9IC0xKSB7CisgICAgICAgICAgICAgIHF1ZXVlZFRlc3RzLnB1c2go cmVzdWx0cyk7CisgICAgICAgICAgICAgIHF1ZXVlZFRlc3ROYW1lcy5zcGxpY2UocXVldWVkVGVz dE5hbWVzLmluZGV4T2YodGVzdCksIDEpOworICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICAgIGZhaWxpbmdUZXN0cy5wdXNoKHJlc3VsdHMpOworICAgICAgICAgIH0KICAgICAgICAgfQor ICAgIH0KIAotICAgICAgICB0ZXN0UmVzdWx0cy5uYW1lID0gdGVzdDsKLQotICAgICAgICBpZiAo cXVldWVkVGVzdE5hbWVzLmluZGV4T2YodGVzdCkgIT0gLTEpIHsKLSAgICAgICAgICAgIHF1ZXVl ZFRlc3RzLnB1c2godGVzdFJlc3VsdHMpOwotICAgICAgICAgICAgcXVldWVkVGVzdE5hbWVzLnNw bGljZShxdWV1ZWRUZXN0TmFtZXMuaW5kZXhPZih0ZXN0KSwgMSk7CisgICAgZnVuY3Rpb24gZ2F0 aGVyVGVzdHMocGF0aCwgdGVzdFRyZWUpIHsKKyAgICAgICAgaWYgKCdhY3R1YWwnIGluIHRlc3RU cmVlKSB7CisgICAgICAgICAgICBwcm9jZXNzVGVzdFJlc3VsdChwYXRoLCB0ZXN0VHJlZSk7CiAg ICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBmYWlsaW5nVGVzdHMucHVzaCh0ZXN0UmVzdWx0 cyk7CisgICAgICAgICAgICBpZiAocGF0aCkgeworICAgICAgICAgICAgICBwYXRoICs9ICcvJzsK KyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGZvciAodmFyIGtleSBpbiB0ZXN0VHJlZSkgewor ICAgICAgICAgICAgICAgIGdhdGhlclRlc3RzKHBhdGggKyBrZXksIHRlc3RUcmVlW2tleV0pOwor ICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQorICAgIGdhdGhlclRlc3RzKCcnLCByZXN1 bHRzLnRlc3RzKTsKIAogICAgIC8vIElmIHdlIGhhdmUgcmVtYWluaW5nIHF1ZXVlZCB0ZXN0cyB0 aGF0IGFyZSBjdXJyZW50bHkgbm90IGZhaWxpbmcsCiAgICAgLy8gc3ludGhlc2l6ZSByZXN1bHRz IGZvciB0aGVtLgo=