Bug 87406 - REGRESSION(r117789): "webkit-patch rebaseline-expectations" copies contents in skia_test_expectations.txt into test_expectations.txt
Summary: REGRESSION(r117789): "webkit-patch rebaseline-expectations" copies contents i...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Dirk Pranke
URL:
Keywords:
: 88166 (view as bug list)
Depends on:
Blocks:
 
Reported: 2012-05-24 11:10 PDT by Elliot Poger
Modified: 2012-06-06 13:12 PDT (History)
3 users (show)

See Also:


Attachments
Ignore overrides in rebaseline (5.10 KB, patch)
2012-06-06 13:08 PDT, Ryosuke Niwa
dpranke: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Elliot Poger 2012-05-24 11:10:08 PDT
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]
Comment 1 Elliot Poger 2012-05-24 11:21:00 PDT
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...
Comment 2 Dirk Pranke 2012-05-29 18:33:17 PDT
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.
Comment 3 Ryosuke Niwa 2012-06-06 12:41:36 PDT
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.
Comment 4 Ryosuke Niwa 2012-06-06 12:42:23 PDT
*** Bug 88166 has been marked as a duplicate of this bug. ***
Comment 5 Dirk Pranke 2012-06-06 12:49:40 PDT
I will be working on this this afternoon. Sorry for the delay; the transit of venus sidetracked me more than I expected ...
Comment 6 Ryosuke Niwa 2012-06-06 13:08:52 PDT
Created attachment 146093 [details]
Ignore overrides in rebaseline
Comment 7 Ryosuke Niwa 2012-06-06 13:10:58 PDT
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.
Comment 8 Dirk Pranke 2012-06-06 13:11:13 PDT
Comment on attachment 146093 [details]
Ignore overrides in rebaseline

looks fine for now while I can work out a better long-term fix
Comment 9 Ryosuke Niwa 2012-06-06 13:12:11 PDT
Committed r119605: <http://trac.webkit.org/changeset/119605>