Bug 28213 – Some HTMLs are modified by make-script-test-wrappers

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Shinichiro Hamaji]

We should do either re-generate them or add them into exclude list in make-script-test-wrappers.

I believe only fast/js/resources/const.js should be in the excluded list and other HTMLs should be re-generated.

[Shinichiro Hamaji]

Created attachment 34640 [details]
Patch v1


---
 6 files changed, 28 insertions(+), 3 deletions(-)

[Shinichiro Hamaji]

(In reply to comment #1)
> Created an attachment (id=34640) [details]

Note that this patch is intended to be applied after Bug 28212.

[Eric Seidel (no email)]

Comment on attachment 34640 [details]
Patch v1

LGTM.

[Eric Seidel (no email)]

Comment on attachment 34640 [details]
Patch v1

Rejecting patch 34640 from commit-queue.  This patch will require manual commit.

Patch https://bugs.webkit.org/attachment.cgi?id=34640 from bug 28213 failed to download and apply.

[Eric Seidel (no email)]

Applying 34640 from bug 28213.
patching file LayoutTests/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file LayoutTests/http/tests/wml/access-target-domain-deny.html
patching file LayoutTests/http/tests/wml/access-target-path-deny.html
patching file LayoutTests/http/tests/wml/access-target.html
patching file WebKitTools/ChangeLog
Hunk #1 succeeded at 2 with fuzz 3.
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: WebKitTools/Scripts/make-script-test-wrappers
|===================================================================
|--- WebKitTools/Scripts/make-script-test-wrappers
|+++ WebKitTools/Scripts/make-script-test-wrappers
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
patch -p0 "WebKitTools/Scripts/make-script-test-wrappers" returned 1.  Pass --force to ignore patch failures.
Logging in as [e-mail]...
Rejecting patch 34640 from commit-queue.  This patch will require manual commit.

[Eric Seidel (no email)]

Oh, this patch depends on bug 28212.  It can be re-added to the commit-queue once bug 28212 is landed.

[Eric Seidel (no email)]

Comment on attachment 34640 [details]
Patch v1

Re-adding cq+

[Eric Seidel (no email)]

Comment on attachment 34640 [details]
Patch v1

Rejecting patch 34640 from commit-queue.  This patch will require manual commit.

Failed to run "['git', 'svn', 'dcommit']"  exit_code: 1  cwd: None

[Eric Seidel (no email)]

One of these ChangeLog diffs is malformed.  That is what caused the the commit-queue to fail.

[Shinichiro Hamaji]

Created attachment 35013 [details]
Patch v2


---
 8 files changed, 37 insertions(+), 5 deletions(-)

[Shinichiro Hamaji]

(In reply to comment #9)
> One of these ChangeLog diffs is malformed.  That is what caused the the
> commit-queue to fail.

I've updated my patch. Now it seems that we need to modify Geolocation/* and add canvas-2d-imageData-create-nonfinite.js into the exclude list.

[Eric Seidel (no email)]

Comment on attachment 35013 [details]
Patch v2

Clearing flags on attachment: 35013

Committed r47419: <http://trac.webkit.org/changeset/47419>

[Eric Seidel (no email)]

All reviewed patches have been landed.  Closing bug.