Bug 142110
| Summary: | run-webkit-tests leaves new and modified files in LayoutTests/imported/w3c/web-platform-tests | ||
|---|---|---|---|
| Product: | WebKit | Reporter: | Michael Saboff <msaboff> |
| Component: | Tools / Tests | Assignee: | Nobody <webkit-unassigned> |
| Status: | RESOLVED FIXED | ||
| Severity: | Critical | CC: | ap, youennf |
| Priority: | P2 | ||
| Version: | 528+ (Nightly build) | ||
| Hardware: | All | ||
| OS: | All | ||
Michael Saboff
After running run-webkit-tests, svn st shows me unknown and modified files under LayoutTests/imported/w3c/web-platform-tests
$ svn st LayoutTests/
? LayoutTests/imported/w3c/web-platform-tests/.resources.url
? LayoutTests/imported/w3c/web-platform-tests/__init__.py
M LayoutTests/imported/w3c/web-platform-tests/_certs/01.pem
M LayoutTests/imported/w3c/web-platform-tests/_certs/02.pem
M LayoutTests/imported/w3c/web-platform-tests/_certs/cacert.pem
M LayoutTests/imported/w3c/web-platform-tests/_certs/cakey.pem
? LayoutTests/imported/w3c/web-platform-tests/_certs/index.txt
M LayoutTests/imported/w3c/web-platform-tests/_certs/index.txt.old
M LayoutTests/imported/w3c/web-platform-tests/_certs/localhost.key
M LayoutTests/imported/w3c/web-platform-tests/_certs/localhost.pem
M LayoutTests/imported/w3c/web-platform-tests/_certs/serial
? LayoutTests/imported/w3c/web-platform-tests/config.json
? LayoutTests/imported/w3c/web-platform-tests/resources
? LayoutTests/imported/w3c/web-platform-tests/tools/.html5lib.url
? LayoutTests/imported/w3c/web-platform-tests/tools/.pywebsocket.url
? LayoutTests/imported/w3c/web-platform-tests/tools/.six.url
? LayoutTests/imported/w3c/web-platform-tests/tools/.wptserve.url
? LayoutTests/imported/w3c/web-platform-tests/tools/html5lib
? LayoutTests/imported/w3c/web-platform-tests/tools/pywebsocket
? LayoutTests/imported/w3c/web-platform-tests/tools/six
? LayoutTests/imported/w3c/web-platform-tests/tools/wptserve
An svn revert -r LayoutTests/imported/w3c/web-platform-tests takes care of the modified files, but the next run of run-webkit-tests will modify them again.
| Attachments | ||
|---|---|---|
| Add attachment proposed patch, testcase, etc. |
youenn fablet
Patch from bug 142083 should take care of the _certs files, at least for git. It is currently r?/cq?
For the other files, it is handled by .gitignore for git. I guess this should be ported to svn as well.
youenn fablet
(In reply to comment #1)
> Patch from bug 142083 should take care of the _certs files, at least for
> git. It is currently r?/cq?
> For the other files, it is handled by .gitignore for git. I guess this
> should be ported to svn as well.
I will try to have a look at it tomorrow. If someone wants to fix it before, please go ahead
Michael Saboff
For SVN, I believe that you use the svn prop edit svn:ignore <path> command which pulls up an editor where you can add file name patterns, one per line, that will be ignored.
Not sure what should be ignored. In my source tree, I ignored "*" in LayoutTests/imported/w3c/web-platform-tests, LayoutTests/imported/w3c/web-platform-tests/_certs and LayoutTests/imported/w3c/web-platform-tests/tools.
The output of svn diff LayoutTests/imported/w3c is:
Index: LayoutTests/imported/w3c/web-platform-tests
===================================================================
--- LayoutTests/imported/w3c/web-platform-tests (revision 180791)
+++ LayoutTests/imported/w3c/web-platform-tests (working copy)
Property changes on: LayoutTests/imported/w3c/web-platform-tests
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+*
Index: LayoutTests/imported/w3c/web-platform-tests/_certs
===================================================================
--- LayoutTests/imported/w3c/web-platform-tests/_certs (revision 180791)
+++ LayoutTests/imported/w3c/web-platform-tests/_certs (working copy)
Property changes on: LayoutTests/imported/w3c/web-platform-tests/_certs
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+*
Index: LayoutTests/imported/w3c/web-platform-tests/tools
===================================================================
--- LayoutTests/imported/w3c/web-platform-tests/tools (revision 180791)
+++ LayoutTests/imported/w3c/web-platform-tests/tools (working copy)
Property changes on: LayoutTests/imported/w3c/web-platform-tests/tools
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+*
Alexey Proskuryakov
Git and svn ignore list would take care of "?" files, but what about "M"? We probably shouldn't have any files checked in that are also generated, that's super confusing.
youenn fablet
(In reply to comment #4)
> Git and svn ignore list would take care of "?" files, but what about "M"? We
> probably shouldn't have any files checked in that are also generated, that's
> super confusing.
Patch from bug 142083 is about that.
These files were initially checked in so that the same certificates would be used for all runs/all bots. It seems not to work reliably so it is better to remove them now.
youenn fablet
(In reply to comment #3)
> For SVN, I believe that you use the svn prop edit svn:ignore <path> command
> which pulls up an editor where you can add file name patterns, one per line,
> that will be ignored.
>
> Not sure what should be ignored. In my source tree, I ignored "*" in
> LayoutTests/imported/w3c/web-platform-tests,
> LayoutTests/imported/w3c/web-platform-tests/_certs and
> LayoutTests/imported/w3c/web-platform-tests/tools.
LayoutTests/imported/w3c/web-platform-tests/.gitignore identifies all files that should also be ignored for SVN.
youenn fablet
https://trac.webkit.org/r180840 should take care of new files.
Can you check that this handles all files except _certs files?
If so, this bug could be closed, _certs files being handled in bug 142083.