36396 2010-03-19 16:17:24 -0700 disable chromium's downstream expectations and baselines temporarily for testing 2010-03-19 17:41:37 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 dpranke dpranke dglazkov ojan oldest_to_newest 202080 0 dpranke 2010-03-19 16:17:24 -0700 We need to temporarily not look in the downstream chromium.org repo for test expectations or baselines to make sure the upstream version is working correctly. 202082 1 51202 dpranke 2010-03-19 16:18:58 -0700 Created attachment 51202 Patch 202084 2 51202 dglazkov 2010-03-19 16:20:18 -0700 Comment on attachment 51202 Patch beam me up, Scotty. 202087 3 ojan 2010-03-19 16:24:05 -0700 Why temporarily? We should just do this permanently. 202100 4 dpranke 2010-03-19 16:46:38 -0700 (In reply to comment #3) > Why temporarily? We should just do this permanently. Well, we do actually want to keep the overrides file around. We can probably delete the downstream baseline paths permanently, but I'll at least leave the paths commented out until the directories have actually been removed. 202103 5 ojan 2010-03-19 16:51:21 -0700 (In reply to comment #4) > (In reply to comment #3) > > Why temporarily? We should just do this permanently. > > Well, we do actually want to keep the overrides file around. We can probably > delete the downstream baseline paths permanently, but I'll at least leave the > paths commented out until the directories have actually been removed. The FIXME's imply that we won't remove the downstream directories. I don't see the point in leaving in commented out code. If we want to add them back, the old lines are still in our revision history. 202104 6 ojan 2010-03-19 16:52:08 -0700 Also, can't we just make the overrides file an empty text file, then we wouldn't need to comment out this code? 202116 7 dpranke 2010-03-19 17:15:53 -0700 Fair enough. I'll delete the lines for now.(In reply to comment #5) > (In reply to comment #4) > > (In reply to comment #3) > > > Why temporarily? We should just do this permanently. > > > > Well, we do actually want to keep the overrides file around. We can probably > > delete the downstream baseline paths permanently, but I'll at least leave the > > paths commented out until the directories have actually been removed. > > The FIXME's imply that we won't remove the downstream directories. > > I don't see the point in leaving in commented out code. If we want to add them > back, the old lines are still in our revision history. Fair enough. I'll delete the lines for now. 202118 8 dpranke 2010-03-19 17:18:04 -0700 (In reply to comment #6) > Also, can't we just make the overrides file an empty text file, then we > wouldn't need to comment out this code? No, since the file is in the chromium repo. Once we're content that the tests pass just looking at the webkit directories and the webkit expectations, we'll add the reference to the downstream file back in, and then when we do the next webkit roll, we'll empty out the file (and tell people what the process for updating it is). 202119 9 dpranke 2010-03-19 17:19:04 -0700 Note that, for the record, my confidence that we can tell people to simply put baselines upstream is pretty low. I bet people are going to want to be able to check in baselines downstream ... 202121 10 dpranke 2010-03-19 17:41:37 -0700 Committed r56287: <http://trac.webkit.org/changeset/56287> 51202 2010-03-19 16:18:58 -0700 2010-03-19 16:20:18 -0700 Patch bug-36396-20100319161857.patch text/plain 5449 dpranke SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDU2MjgyKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMtMTkgIERpcmsgUHJhbmtlICA8ZHBy YW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRGlzYWJsZSB0aGUgZG93bnN0cmVhbSBleHBlY3RhdGlvbnMgYW5kIGJhc2Vs aW5lcyBmb3IgQ2hyb21pdW0KKyAgICAgICAgdGVtcG9yYXJpbHkgd2hpbGUgdGVzdGluZyB0aGF0 IHdlJ3ZlIHVwc3RyZWFtZWQgZXZlcnl0aGluZyBjb3JyZWN0bHkuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5OgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHk6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHk6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93 aW4ucHk6CisKIDIwMTAtMDMtMTkgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgpJbmRleDogV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2No cm9taXVtLnB5CShyZXZpc2lvbiA1NjI4MSkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkJKHdvcmtpbmcgY29weSkKQEAgLTE2Niwx MiArMTY2LDE1IEBAIGNsYXNzIENocm9taXVtUG9ydChiYXNlLlBvcnQpOgogICAgICAgICByZXR1 cm4gZmlsZShleHBlY3RhdGlvbnNfZmlsZSwgInIiKS5yZWFkKCkKIAogICAgIGRlZiB0ZXN0X2V4 cGVjdGF0aW9uc19vdmVycmlkZXMoc2VsZik6Ci0gICAgICAgIG92ZXJyaWRlc19maWxlID0gc2Vs Zi5wYXRoX2Zyb21fY2hyb21pdW1fYmFzZSgnd2Via2l0JywgJ3Rvb2xzJywKLSAgICAgICAgICAg ICdsYXlvdXRfdGVzdHMnLCAndGVzdF9leHBlY3RhdGlvbnMudHh0JykKLSAgICAgICAgaWYgb3Mu cGF0aC5leGlzdHMob3ZlcnJpZGVzX2ZpbGUpOgotICAgICAgICAgICAgcmV0dXJuIGZpbGUoZXhw ZWN0YXRpb25zX2ZpbGUsICJyIikucmVhZCgpCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBy ZXR1cm4gTm9uZQorICAgICAgICAjIEZJWE1FOiB1bmNvbW1lbnQgdGhpcyB3aGVuIHdlJ3JlIGNv bnZpbmNlZCB0aGUgdXBzdHJlYW0gY29kZQorICAgICAgICAjIGlzIHdvcmtpbmcuCisgICAgICAg ICNvdmVycmlkZXNfZmlsZSA9IHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoJ3dlYmtpdCcs ICd0b29scycsCisgICAgICAgICMgICAgJ2xheW91dF90ZXN0cycsICd0ZXN0X2V4cGVjdGF0aW9u cy50eHQnKQorICAgICAgICAjaWYgb3MucGF0aC5leGlzdHMob3ZlcnJpZGVzX2ZpbGUpOgorICAg ICAgICAjICAgIHJldHVybiBmaWxlKGV4cGVjdGF0aW9uc19maWxlLCAiciIpLnJlYWQoKQorICAg ICAgICAjZWxzZToKKyAgICAgICAgIyAgICByZXR1cm4gTm9uZQorICAgICAgICByZXR1cm4gTm9u ZQogCiAgICAgZGVmIHRlc3RfcGxhdGZvcm1fbmFtZXMoc2VsZik6CiAgICAgICAgIHJldHVybiBz ZWxmLnRlc3RfYmFzZV9wbGF0Zm9ybV9uYW1lcygpICsgKCd3aW4teHAnLApJbmRleDogV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5CShyZXZpc2lvbiA1NjI4MSkKKysrIFdlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGludXgucHkJKHdv cmtpbmcgY29weSkKQEAgLTUzLDggKzUzLDEwIEBAIGNsYXNzIENocm9taXVtTGludXhQb3J0KGNo cm9taXVtLkNocm9taXUKICAgICBkZWYgYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6CiAgICAg ICAgICMgRklYTUU6IHJlbW92ZSB0aGUgZG93bnN0cmVhbSBwYXRocyBvbmNlIHdlJ3ZlIG1pZ3Jh dGVkIHRoZQogICAgICAgICAjIGJhc2VsaW5lcy4KLSAgICAgICAgcmV0dXJuIFtzZWxmLl9jaHJv bWl1bV9iYXNlbGluZV9wYXRoKCdjaHJvbWl1bS1saW51eCcpLAotICAgICAgICAgICAgICAgIHNl bGYuX2Nocm9taXVtX2Jhc2VsaW5lX3BhdGgoJ2Nocm9taXVtLXdpbicpLAorICAgICAgICAjIEZJ WE1FOiBhZGQgdGhlIGNocm9taXVtIGJhc2VsaW5lIGJhY2sgaW4gd2hlbiB3ZSdyZSBjb252aW5j ZWQgdGhlCisgICAgICAgICMgdXBzdHJlYW0gdmVyc2lvbnMgYXJlIHN0YWJsZS4KKyAgICAgICAg cmV0dXJuIFsjc2VsZi5fY2hyb21pdW1fYmFzZWxpbmVfcGF0aCgnY2hyb21pdW0tbGludXgnKSwK KyAgICAgICAgICAgICAgICAjc2VsZi5fY2hyb21pdW1fYmFzZWxpbmVfcGF0aCgnY2hyb21pdW0t d2luJyksCiAgICAgICAgICAgICAgICAgc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgoJ2Nocm9t aXVtLWxpbnV4JyksCiAgICAgICAgICAgICAgICAgc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgo J2Nocm9taXVtLXdpbicpLAogICAgICAgICAgICAgICAgIHNlbGYuX3dlYmtpdF9iYXNlbGluZV9w YXRoKCdjaHJvbWl1bScpLApJbmRleDogV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkJKHJldmlz aW9uIDU2MjgxKQorKysgV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jaHJvbWl1bV9tYWMucHkJKHdvcmtpbmcgY29weSkKQEAgLTUzLDcgKzUzLDkgQEAgY2xh c3MgQ2hyb21pdW1NYWNQb3J0KGNocm9taXVtLkNocm9taXVtUAogICAgIGRlZiBiYXNlbGluZV9z ZWFyY2hfcGF0aChzZWxmKToKICAgICAgICAgIyBGSVhNRTogcmVtb3ZlIHRoZSBkb3duc3RyZWFt IHBhdGhzIG9uY2Ugd2UndmUgbWlncmF0ZWQgdGhlCiAgICAgICAgICMgYmFzZWxpbmVzLgotICAg ICAgICByZXR1cm4gW3NlbGYuX2Nocm9taXVtX2Jhc2VsaW5lX3BhdGgoJ2Nocm9taXVtLW1hYycp LAorICAgICAgICAjIEZJWE1FOiBhZGQgdGhlIGNocm9taXVtIGJhc2VsaW5lIGJhY2sgaW4gd2hl biB3ZSdyZSBjb252aW5jZWQgdGhlCisgICAgICAgICMgdXBzdHJlYW0gdmVyc2lvbnMgYXJlIHN0 YWJsZS4KKyAgICAgICAgcmV0dXJuIFsjIHNlbGYuX2Nocm9taXVtX2Jhc2VsaW5lX3BhdGgoJ2No cm9taXVtLW1hYycpLAogICAgICAgICAgICAgICAgIHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRo KCdjaHJvbWl1bS1tYWMnKSwKICAgICAgICAgICAgICAgICBzZWxmLl93ZWJraXRfYmFzZWxpbmVf cGF0aCgnY2hyb21pdW0nKSwKICAgICAgICAgICAgICAgICBzZWxmLl93ZWJraXRfYmFzZWxpbmVf cGF0aCgnbWFjJyArIHNlbGYudmVyc2lvbigpKSwKSW5kZXg6IFdlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1f d2luLnB5CShyZXZpc2lvbiA1NjI4MSkKKysrIFdlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5CSh3b3JraW5nIGNvcHkpCkBAIC01NCwx MiArNTQsMTQgQEAgY2xhc3MgQ2hyb21pdW1XaW5Qb3J0KGNocm9taXVtLkNocm9taXVtUAogICAg IGRlZiBiYXNlbGluZV9zZWFyY2hfcGF0aChzZWxmKToKICAgICAgICAgIyBGSVhNRTogcmVtb3Zl IHRoZSBkb3duc3RyZWFtIHBhdGhzIG9uY2Ugd2UndmUgbWlncmF0ZWQgdGhlCiAgICAgICAgICMg YmFzZWxpbmVzLgorICAgICAgICAjIEZJWE1FOiBhZGQgdGhlIGNocm9taXVtIGJhc2VsaW5lIGJh Y2sgaW4gd2hlbiB3ZSdyZSBjb252aW5jZWQgdGhlCisgICAgICAgICMgdXBzdHJlYW0gdmVyc2lv bnMgYXJlIHN0YWJsZS4KICAgICAgICAgZGlycyA9IFtdCi0gICAgICAgIGlmIHNlbGYuX25hbWUg PT0gJ2Nocm9taXVtLXdpbi14cCc6Ci0gICAgICAgICAgICBkaXJzLmFwcGVuZChzZWxmLl9jaHJv bWl1bV9iYXNlbGluZV9wYXRoKCdjaHJvbWl1bS13aW4teHAnKSkKLSAgICAgICAgaWYgc2VsZi5f bmFtZSBpbiAoJ2Nocm9taXVtLXdpbi14cCcsICdjaHJvbWl1bS13aW4tdmlzdGEnKToKLSAgICAg ICAgICAgIGRpcnMuYXBwZW5kKHNlbGYuX2Nocm9taXVtX2Jhc2VsaW5lX3BhdGgoJ2Nocm9taXVt LXdpbi12aXN0YScpKQotICAgICAgICBkaXJzLmFwcGVuZChzZWxmLl9jaHJvbWl1bV9iYXNlbGlu ZV9wYXRoKCdjaHJvbWl1bS13aW4nKSkKKyAgICAgICAgI2lmIHNlbGYuX25hbWUgPT0gJ2Nocm9t aXVtLXdpbi14cCc6CisgICAgICAgICMgICAgZGlycy5hcHBlbmQoc2VsZi5fY2hyb21pdW1fYmFz ZWxpbmVfcGF0aCgnY2hyb21pdW0td2luLXhwJykpCisgICAgICAgICNpZiBzZWxmLl9uYW1lIGlu ICgnY2hyb21pdW0td2luLXhwJywgJ2Nocm9taXVtLXdpbi12aXN0YScpOgorICAgICAgICAjICAg IGRpcnMuYXBwZW5kKHNlbGYuX2Nocm9taXVtX2Jhc2VsaW5lX3BhdGgoJ2Nocm9taXVtLXdpbi12 aXN0YScpKQorICAgICAgICAjZGlycy5hcHBlbmQoc2VsZi5fY2hyb21pdW1fYmFzZWxpbmVfcGF0 aCgnY2hyb21pdW0td2luJykpCiAgICAgICAgIGlmIHNlbGYuX25hbWUgPT0gJ2Nocm9taXVtLXdp bi14cCc6CiAgICAgICAgICAgICBkaXJzLmFwcGVuZChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0 aCgnY2hyb21pdW0td2luLXhwJykpCiAgICAgICAgIGlmIHNlbGYuX25hbWUgaW4gKCdjaHJvbWl1 bS13aW4teHAnLCAnY2hyb21pdW0td2luLXZpc3RhJyk6Cg==