87406 2012-05-24 11:10:08 -0700 REGRESSION(r117789): "webkit-patch rebaseline-expectations" copies contents in skia_test_expectations.txt into test_expectations.txt 2012-06-06 13:12:11 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 epoger dpranke loislo ojan rniwa oldest_to_newest 632962 0 epoger 2012-05-24 11:10:08 -0700 I updated my webkit tree to rev 118364 and ran the following commands: $ svn diff LayoutTests/platform/chromium/test_expectations.txt [no diffs are reported] $ Tools/Scripts/webkit-patch rebaseline-expectations Retrieving results for chromium-linux-x86 from Webkit Linux 32. Retrieving results for chromium-linux-x86_64 from Webkit Linux. Retrieving results for chromium-mac-leopard from Webkit Mac10.5. Retrieving results for chromium-mac-lion from Webkit Mac10.7. Retrieving results for chromium-mac-snowleopard from Webkit Mac10.6. Retrieving results for chromium-win-vista from Webkit Vista. Retrieving results for chromium-win-win7 from Webkit Win7. Retrieving results for chromium-win-xp from Webkit Win. [no tests had to be rebaselined] $ svn diff LayoutTests/platform/chromium/test_expectations.txt Index: LayoutTests/platform/chromium/test_expectations.txt =================================================================== --- LayoutTests/platform/chromium/test_expectations.txt (revision 118364) +++ LayoutTests/platform/chromium/test_expectations.txt (working copy) @@ -3804,3 +3804,707 @@ BUGWK87364 DEBUG : fast/dom/shadow/drop-event-for-input-in-shadow.html = TEXT PASS BUGWK87364 DEBUG : fast/dom/shadow/drop-event-in-shadow.html = TEXT PASS + +// TEMPORARY overrides of +// src/third_party/WebKit/LayoutTests/platform/chromium/test_expectations.txt +// that are associated with changes to the Skia code. +// [and so on... 8 copies of http://src.chromium.org/svn/trunk/src/skia/skia_test_expectations.txt and http://src.chromium.org/svn/trunk/src/webkit/tools/layout_tests/test_expectations.txt have been appended] 632978 1 epoger 2012-05-24 11:21:00 -0700 Just to be clear... I am very happy that the overrides expectations files are being observed by the tool. :-) I just don't want them to be permanently added to the base expectations file. I will try to fix this myself, but if anyone else wants to jump on it, go right ahead... 636690 2 dpranke 2012-05-29 18:33:17 -0700 given that I'm revamping how we handle multiple expectations files at the moment (in order to support cascading files), it's probably better for me to own this. 642702 3 rniwa 2012-06-06 12:41:36 -0700 This bug is affecting my workflow to the extent it's no longer acceptable. We need to either roll out r117789 or fix this bug today. 642704 4 rniwa 2012-06-06 12:42:23 -0700 *** Bug 88166 has been marked as a duplicate of this bug. *** 642710 5 dpranke 2012-06-06 12:49:40 -0700 I will be working on this this afternoon. Sorry for the delay; the transit of venus sidetracked me more than I expected ... 642729 6 146093 rniwa 2012-06-06 13:08:52 -0700 Created attachment 146093 Ignore overrides in rebaseline 642730 7 rniwa 2012-06-06 13:10:58 -0700 This this patch doesn't work then I'm going to roll out r117789. It's not acceptable to break one of the most mission critical tool in webkit like this for days. 642731 8 146093 dpranke 2012-06-06 13:11:13 -0700 Comment on attachment 146093 Ignore overrides in rebaseline looks fine for now while I can work out a better long-term fix 642732 9 rniwa 2012-06-06 13:12:11 -0700 Committed r119605: <http://trac.webkit.org/changeset/119605> 146093 2012-06-06 13:08:52 -0700 2012-06-06 13:11:13 -0700 Ignore overrides in rebaseline bug-87406-20120606131213.patch text/plain 5227 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDExOTYwNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDEyLTA2LTA2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFJFR1JFU1NJT04ocjExNzc4OSk6ICJ3ZWJraXQtcGF0Y2ggcmViYXNlbGluZS1l eHBlY3RhdGlvbnMiIGNvcGllcyBjb250ZW50cyBpbiBza2lhX3Rlc3RfZXhwZWN0YXRpb25zLnR4 dCBpbnRvIHRlc3RfZXhwZWN0YXRpb25zLnR4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODc0MDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVs cy90ZXN0X2V4cGVjdGF0aW9ucy5weToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnMuX19pbml0 X18pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5l LnB5OgorICAgICAgICAoUmViYXNlbGluZVRlc3QuX3VwZGF0ZV9leHBlY3RhdGlvbnNfZmlsZSk6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5p dHRlc3QucHk6CisgICAgICAgICh0ZXN0X3JlYmFzZWxpbmVfZG9lc19ub3RfaW5jbHVkZV9vdmVy cmlkZXMpOgorCiAyMDEyLTA2LTA2ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIHdlYmtpdHB5OiBwZXJmIHRlc3RzIHVuaXQgdGVzdHMgZmFpbCBvbiBjaHJv bWl1bSB3aW4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVs cy90ZXN0X2V4cGVjdGF0aW9ucy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkJKHJldmlzaW9uIDEx OTYwMCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0 X2V4cGVjdGF0aW9ucy5weQkod29ya2luZyBjb3B5KQpAQCAtNzIwLDcgKzcyMCw3IEBAIGNsYXNz IFRlc3RFeHBlY3RhdGlvbnMob2JqZWN0KToKICAgICAgICAgYXNzZXJ0KCcgJyBub3QgaW4gc3Ry aW5nKSAgIyBUaGlzIG9ubHkgaGFuZGxlcyBvbmUgZXhwZWN0YXRpb24gYXQgYSB0aW1lLgogICAg ICAgICByZXR1cm4gY2xzLkVYUEVDVEFUSU9OUy5nZXQoc3RyaW5nLmxvd2VyKCkpCiAKLSAgICBk ZWYgX19pbml0X18oc2VsZiwgcG9ydCwgdGVzdHM9Tm9uZSwgaXNfbGludF9tb2RlPUZhbHNlKToK KyAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydCwgdGVzdHM9Tm9uZSwgaXNfbGludF9tb2RlPUZh bHNlLCBpbmNsdWRlX292ZXJyaWRlcz1UcnVlKToKICAgICAgICAgc2VsZi5fZnVsbF90ZXN0X2xp c3QgPSB0ZXN0cwogICAgICAgICBzZWxmLl90ZXN0X2NvbmZpZyA9IHBvcnQudGVzdF9jb25maWd1 cmF0aW9uKCkKICAgICAgICAgc2VsZi5faXNfbGludF9tb2RlID0gaXNfbGludF9tb2RlCkBAIC03 MzMsNyArNzMzLDcgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9ucyhvYmplY3QpOgogICAgICAgICBz ZWxmLl9hZGRfZXhwZWN0YXRpb25zKHNlbGYuX2V4cGVjdGF0aW9ucywgaW5fb3ZlcnJpZGVzPUZh bHNlKQogCiAgICAgICAgIG92ZXJyaWRlcyA9IHBvcnQudGVzdF9leHBlY3RhdGlvbnNfb3ZlcnJp ZGVzKCkKLSAgICAgICAgaWYgb3ZlcnJpZGVzOgorICAgICAgICBpZiBvdmVycmlkZXMgYW5kIGlu Y2x1ZGVfb3ZlcnJpZGVzOgogICAgICAgICAgICAgb3ZlcnJpZGVzX2V4cGVjdGF0aW9ucyA9IHNl bGYuX3BhcnNlci5wYXJzZShvdmVycmlkZXMpCiAgICAgICAgICAgICBzZWxmLl9hZGRfZXhwZWN0 YXRpb25zKG92ZXJyaWRlc19leHBlY3RhdGlvbnMsIGluX292ZXJyaWRlcz1UcnVlKQogICAgICAg ICAgICAgc2VsZi5fZXhwZWN0YXRpb25zICs9IG92ZXJyaWRlc19leHBlY3RhdGlvbnMKSW5kZXg6 IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5l LnB5CShyZXZpc2lvbiAxMTk2MDApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29t bWFuZHMvcmViYXNlbGluZS5weQkod29ya2luZyBjb3B5KQpAQCAtMTQwLDcgKzE0MCw3IEBAIGNs YXNzIFJlYmFzZWxpbmVUZXN0KEFic3RyYWN0UmViYXNlbGluaW4KIAogICAgIGRlZiBfdXBkYXRl X2V4cGVjdGF0aW9uc19maWxlKHNlbGYsIGJ1aWxkZXJfbmFtZSwgdGVzdF9uYW1lKToKICAgICAg ICAgcG9ydCA9IHNlbGYuX3Rvb2wucG9ydF9mYWN0b3J5LmdldF9mcm9tX2J1aWxkZXJfbmFtZShi dWlsZGVyX25hbWUpCi0gICAgICAgIGV4cGVjdGF0aW9ucyA9IFRlc3RFeHBlY3RhdGlvbnMocG9y dCkKKyAgICAgICAgZXhwZWN0YXRpb25zID0gVGVzdEV4cGVjdGF0aW9ucyhwb3J0LCBpbmNsdWRl X292ZXJyaWRlcz1GYWxzZSkKIAogICAgICAgICBmb3IgdGVzdF9jb25maWd1cmF0aW9uIGluIHBv cnQuYWxsX3Rlc3RfY29uZmlndXJhdGlvbnMoKToKICAgICAgICAgICAgIGlmIHRlc3RfY29uZmln dXJhdGlvbi52ZXJzaW9uID09IHBvcnQudGVzdF9jb25maWd1cmF0aW9uKCkudmVyc2lvbjoKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lX3VuaXR0 ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5k cy9yZWJhc2VsaW5lX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAxMTk2MDApCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5weQkod29ya2lu ZyBjb3B5KQpAQCAtODQsNiArODQsMjUgQEAgUmV0cmlldmluZyBodHRwOi8vZXhhbXBsZS5jb20v Zi9idWlsZGVycwogICAgICAgICBuZXdfZXhwZWN0YXRpb25zID0gdG9vbC5maWxlc3lzdGVtLnJl YWRfdGV4dF9maWxlKGxpb25fcG9ydC5wYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoKSkK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChuZXdfZXhwZWN0YXRpb25zLCAiQlVHWCBMRU9QQVJE IFNOT1dMRU9QQVJEIDogdXNlcnNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwgPSBJTUFHRVxuQlVH WiBMSU5VWCA6IHVzZXJzY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sID0gSU1BR0VcbiIpCiAKKyAg ICBkZWYgdGVzdF9yZWJhc2VsaW5lX2RvZXNfbm90X2luY2x1ZGVfb3ZlcnJpZGVzKHNlbGYpOgor ICAgICAgICBjb21tYW5kID0gUmViYXNlbGluZVRlc3QoKQorICAgICAgICB0b29sID0gTW9ja1Rv b2woKQorICAgICAgICBjb21tYW5kLmJpbmRfdG9fdG9vbCh0b29sKQorCisgICAgICAgIGxpb25f cG9ydCA9IHRvb2wucG9ydF9mYWN0b3J5LmdldF9mcm9tX2J1aWxkZXJfbmFtZSgiV2Via2l0IE1h YzEwLjciKQorICAgICAgICB0b29sLmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKGxpb25fcG9y dC5wYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoKSwgIkJVR1ggTUFDIDogdXNlcnNjcmlw dHMvYW5vdGhlci10ZXN0Lmh0bWwgPSBJTUFHRVxuQlVHWiBMSU5VWCA6IHVzZXJzY3JpcHRzL2Fu b3RoZXItdGVzdC5odG1sID0gSU1BR0VcbiIpCisgICAgICAgIHRvb2wuZmlsZXN5c3RlbS53cml0 ZV90ZXh0X2ZpbGUobGlvbl9wb3J0LnBhdGhfZnJvbV9jaHJvbWl1bV9iYXNlKCdza2lhJywgJ3Nr aWFfdGVzdF9leHBlY3RhdGlvbnMudHh0JyksICJCVUdZIE1BQyA6IG90aGVyLXRlc3QuaHRtbCA9 IFRFWFRcbiIpCisgICAgICAgIHRvb2wuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUob3MucGF0 aC5qb2luKGxpb25fcG9ydC5sYXlvdXRfdGVzdHNfZGlyKCksICJ1c2Vyc2NyaXB0cy9hbm90aGVy LXRlc3QuaHRtbCIpLCAiRHVtbXkgdGVzdCBjb250ZW50cyIpCisKKyAgICAgICAgZXhwZWN0ZWRf bG9ncyA9ICIiIlJldHJpZXZpbmcgaHR0cDovL2V4YW1wbGUuY29tL2YvYnVpbGRlcnMvV2Via2l0 IE1hYzEwLjcvcmVzdWx0cy9sYXlvdXQtdGVzdC1yZXN1bHRzL3VzZXJzY3JpcHRzL2Fub3RoZXIt dGVzdC1hY3R1YWwucG5nLgorUmV0cmlldmluZyBodHRwOi8vZXhhbXBsZS5jb20vZi9idWlsZGVy cy9XZWJraXQgTWFjMTAuNy9yZXN1bHRzL2xheW91dC10ZXN0LXJlc3VsdHMvdXNlcnNjcmlwdHMv YW5vdGhlci10ZXN0LWFjdHVhbC53YXYuCitSZXRyaWV2aW5nIGh0dHA6Ly9leGFtcGxlLmNvbS9m L2J1aWxkZXJzL1dlYmtpdCBNYWMxMC43L3Jlc3VsdHMvbGF5b3V0LXRlc3QtcmVzdWx0cy91c2Vy c2NyaXB0cy9hbm90aGVyLXRlc3QtYWN0dWFsLnR4dC4KKyIiIgorICAgICAgICBPdXRwdXRDYXB0 dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgY29tbWFuZC5fcmViYXNlbGluZV90ZXN0X2FuZF91 cGRhdGVfZXhwZWN0YXRpb25zLCBbIldlYmtpdCBNYWMxMC43IiwgInVzZXJzY3JpcHRzL2Fub3Ro ZXItdGVzdC5odG1sIiwgTm9uZV0sIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfbG9ncykKKworICAg ICAgICBuZXdfZXhwZWN0YXRpb25zID0gdG9vbC5maWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKGxp b25fcG9ydC5wYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoKSkKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChuZXdfZXhwZWN0YXRpb25zLCAiQlVHWCBMRU9QQVJEIFNOT1dMRU9QQVJEIDog dXNlcnNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwgPSBJTUFHRVxuQlVHWiBMSU5VWCA6IHVzZXJz Y3JpcHRzL2Fub3RoZXItdGVzdC5odG1sID0gSU1BR0VcbiIpCisKICAgICBkZWYgdGVzdF9yZWJh c2VsaW5lX3Rlc3Qoc2VsZik6CiAgICAgICAgIGNvbW1hbmQgPSBSZWJhc2VsaW5lVGVzdCgpCiAg ICAgICAgIGNvbW1hbmQuYmluZF90b190b29sKE1vY2tUb29sKCkpCg==