Patch run tests from git work tree #18286
Conversation
Sort flags are the same as for $exts_to_test (flags: SORT_REGULAR) in main():730. There was also a slight chance to branch into get_summary() with (show_ext_summary: true) and count(NULL) use: Given the call of find_files() in main() on line 635, when there are no extensions to skip, then the global variable $exts_skipped is not converted to an array ($global[] = ...), that errors on count() then. Therefore, we cast the global variable $exts_skipped to array before sorting and counting.
The cve-2014-3538-mb.phpt test similar to cve-2014-3538.phpt removes the .data file in --CLEAN-- by unlink(). However, in 3d3f11e ("Fixed the UTF-8 and long path support in the streams on Windows.", 2016-06-20) the temporary fixture file has been committed. As the file is generated this is counter-productive. Furthermore, when running the tests under version control given a build from checkout, then the VCS marks the file as deleted. Fix is to remove the file from version control: $ git rm --cached ext/fileinfo/tests/cve-2014-3538私はガラスを食べられます.data To prevent similar mistakes, ignore those test .data files in git with the binary attribute macro to levitate the known issue in diff fetching tools.
|
|
||
| # Test data files | ||
| **/tests/**/*.data binary |
There was a problem hiding this comment.
Should probably not be in both .gitignore and .gitattributes.
There was a problem hiding this comment.
.gitattributes applies to committed files, where-as .gitignore prevents files from being committed. So either of those is redundant (or should be more specific, or should have exclusions).
There was a problem hiding this comment.
That's not true, .gitattributes are similar as .gitignores for the worktree as well.
And actually, that's the reason I put it there because the binary macro has -diff and diffing caused an issue resolving this. Therefore I added it.
Nevertheless, if there are still doubts about it, I can (happily!) split this PR and move it out. No need to rush the by-catch IMHO. Let me know and thanks for your feedback so far!
| @@ -3012,6 +3012,9 @@ function get_summary(bool $show_ext_summary): string | |||
| $summary = ''; | |||
|
|
|||
| if ($show_ext_summary) { | |||
| static $exts_skipped_sorted; | |||
I still had a leftover when looking into the dom nodelist iteration hickup @nielsdos fixed in #18004 : sorting the list of skipped extensions in the run-tests.php report. details in the commit message.
And then while rebasing today, a generate test .data file caught my eye and I added the fix. details in the commit message.
/cc @cmb69