82250 2012-03-26 15:51:20 -0700 Allow expectations on directories in virtual test suites 2012-03-26 16:54:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enne enne abarth dpranke enne ojan webkit.review.bot oldest_to_newest 588230 0 enne 2012-03-26 15:51:20 -0700 Allow expectations on directories in virtual test suites 588238 1 133915 enne 2012-03-26 15:56:53 -0700 Created attachment 133915 Patch 588280 2 133915 dpranke 2012-03-26 16:28:29 -0700 Comment on attachment 133915 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133915&action=review > Tools/Scripts/webkitpy/layout_tests/port/base.py:1099 > + return test_name.replace(suite.name, suite.base) Your change will allow lookup_virtual_test_base() to handle paths that don't actually map onto base paths that exist. I had to convince myself that that was okay, but I think I did. Given that, I don't think you even need to do the get() on line 1096. You can just replace line 1096 with your 1099. 588319 3 enne 2012-03-26 16:49:56 -0700 (In reply to comment #2) > (From update of attachment 133915 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133915&action=review > > > Tools/Scripts/webkitpy/layout_tests/port/base.py:1099 > > + return test_name.replace(suite.name, suite.base) > > Your change will allow lookup_virtual_test_base() to handle paths that don't actually map onto base paths that exist. I had to convince myself that that was okay, but I think I did. Yeah. It looks like the calling code checks that the base path exists after doing the mapping, so I convinced myself that it seemed reasonable too. > Given that, I don't think you even need to do the get() on line 1096. You can just replace line 1096 with your 1099. Will do that on landing, thanks. 588323 4 enne 2012-03-26 16:54:13 -0700 Committed r112176: <http://trac.webkit.org/changeset/112176> 133915 2012-03-26 15:56:53 -0700 2012-03-26 16:28:29 -0700 Patch bug-82250-20120326155652.patch text/plain 2899 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMTYwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGJlYzRhMzczZThhY2FjZDU2OGQ4ZGI1NTIyZTY4ZjY1 MTA4ODJmMS4uZDJlN2RkYzIzYTBkZmVlMjI5MjZlZjQ1N2YzNDM4MTAzN2ZmNGJkYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDEyLTAzLTI2ICBBZHJpZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CisKKyAg ICAgICAgQWxsb3cgZXhwZWN0YXRpb25zIG9uIGRpcmVjdG9yaWVzIGluIHZpcnR1YWwgdGVzdCBz dWl0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgy MjUwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbG9v a3VwX3ZpcnR1YWxfdGVzdF9iYXNlIHdhcyBvbmx5IHJldHVybmluZyB2YWxpZCByZXN1bHRzIGZv ciBmaWxlcworICAgICAgICBhbmQgbm90IGRpcmVjdG9yaWVzLiBGaXggYnkgZmFsbGluZyBiYWNr IHRvIHRoZSB2aXJ0dWFsIHRlc3Qgc3VpdGUKKyAgICAgICAgbWFwcGluZyBpZiBwb3NzaWJsZS4K KworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToK KyAgICAgICAgKFBvcnQubG9va3VwX3ZpcnR1YWxfdGVzdF9iYXNlKToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHk6CisgICAgICAgIChUZXN0UG9y dC5za2lwcGVkX3Rlc3RzKToKKyAgICAgICAgKFRlc3RQb3J0LnZpcnR1YWxfdGVzdF9zdWl0ZXMp OgorCiAyMDEyLTAzLTI2ICBSYXBoYWVsIEt1Ym8gZGEgQ29zdGEgIDxyYWt1Y29ARnJlZUJTRC5v cmc+CiAKICAgICAgICAgW2poYnVpbGRdIFVzZSAkTUFLRSBpZiBpdCBpcyBkZWZpbmVkIHRvIGJ1 aWxkIGpoYnVpbGQgaXRzZWxmLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IDA0MTEyNzVkYTY5NjNlYWNiNjE0NDdiNzQ3YjAzOWYy MjVmMTlmNDAuLmZjOWNiMDZmZWY0OWQ4NmU2NGYxMzVhNjdhYTNlNGIzN2NkNTRlYjYgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAg LTEwOTMsNyArMTA5MywxMCBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgZGVmIGxvb2t1cF92 aXJ0dWFsX3Rlc3RfYmFzZShzZWxmLCB0ZXN0X25hbWUpOgogICAgICAgICBmb3Igc3VpdGUgaW4g c2VsZi5wb3B1bGF0ZWRfdmlydHVhbF90ZXN0X3N1aXRlcygpOgogICAgICAgICAgICAgaWYgdGVz dF9uYW1lLnN0YXJ0c3dpdGgoc3VpdGUubmFtZSk6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHN1 aXRlLnRlc3RzLmdldCh0ZXN0X25hbWUpCisgICAgICAgICAgICAgICAgZmlsZW5hbWUgPSBzdWl0 ZS50ZXN0cy5nZXQodGVzdF9uYW1lKQorICAgICAgICAgICAgICAgIGlmIGZpbGVuYW1lOgorICAg ICAgICAgICAgICAgICAgICByZXR1cm4gZmlsZW5hbWUKKyAgICAgICAgICAgICAgICByZXR1cm4g dGVzdF9uYW1lLnJlcGxhY2Uoc3VpdGUubmFtZSwgc3VpdGUuYmFzZSkKICAgICAgICAgcmV0dXJu IE5vbmUKIAogICAgIGRlZiBsb29rdXBfdmlydHVhbF90ZXN0X2FyZ3Moc2VsZiwgdGVzdF9uYW1l KToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5w eQppbmRleCBmMDhjNTc0MjQzNWViOGM4ZThhMzkwODE3NDBhODVjMDZiOTE3MDQ0Li44YzUyNzAy ZjYwNDMzOGZlYTBhNGQ5NDFmNjZmYjZmZmExODQzOTkzIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CkBAIC00MDYsNyArNDA2LDggQEAg Y2xhc3MgVGVzdFBvcnQoUG9ydCk6CiAgICAgICAgICMgVGhpcyBhbGxvd3MgdXMgdG8gdGVzdCB0 aGUgaGFuZGxpbmcgU2tpcHBlZCBmaWxlcywgYm90aCB3aXRoIGEgdGVzdAogICAgICAgICAjIHRo YXQgYWN0dWFsbHkgcGFzc2VzLCBhbmQgYSB0ZXN0IHRoYXQgZG9lcyBmYWlsLgogICAgICAgICBy ZXR1cm4gc2V0KFsnZmFpbHVyZXMvZXhwZWN0ZWQvc2tpcF90ZXh0Lmh0bWwnLAotICAgICAgICAg ICAgICAgICAgICAnZmFpbHVyZXMvdW5leHBlY3RlZC9za2lwX3Bhc3MuaHRtbCddKQorICAgICAg ICAgICAgICAgICAgICAnZmFpbHVyZXMvdW5leHBlY3RlZC9za2lwX3Bhc3MuaHRtbCcsCisgICAg ICAgICAgICAgICAgICAgICd2aXJ0dWFsL3NraXBwZWQnXSkKIAogICAgIGRlZiBuYW1lKHNlbGYp OgogICAgICAgICByZXR1cm4gc2VsZi5fbmFtZQpAQCAtNDkxLDYgKzQ5Miw3IEBAIGNsYXNzIFRl c3RQb3J0KFBvcnQpOgogICAgIGRlZiB2aXJ0dWFsX3Rlc3Rfc3VpdGVzKHNlbGYpOgogICAgICAg ICByZXR1cm4gWwogICAgICAgICAgICAgVmlydHVhbFRlc3RTdWl0ZSgndmlydHVhbC9wYXNzZXMn LCAncGFzc2VzJywgWyctLXZpcnR1YWwtYXJnJ10pLAorICAgICAgICAgICAgVmlydHVhbFRlc3RT dWl0ZSgndmlydHVhbC9za2lwcGVkJywgJ2ZhaWx1cmVzL2V4cGVjdGVkJywgWyctLXZpcnR1YWwt YXJnMiddKSwKICAgICAgICAgXQogCiBjbGFzcyBUZXN0RHJpdmVyKERyaXZlcik6Cg==