Commit 44c5c7d
committed
Build/Test Tools: Fix tooling and PHPUnit test issues.
This fixes the PHPUnit test suite for the 6.4 branch by:
- Fixing issues with the `env:install` script when using newer PHP images.
- Temporarily disables failing tests with ImageMagick 7 is in use.
Backports [60735] and [60736] to the 6.4 branch.
See #63876, #63932.
git-svn-id: https://develop.svn.wordpress.org/branches/6.4@60749 602fd350-edb4-49c9-b593-d223f7449a821 parent 79a5f9e commit 44c5c7d
File tree
4 files changed
+25
-1
lines changed- tests/phpunit/tests
- image
- tools/local-env/scripts
4 files changed
+25
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
656 | 656 | | |
657 | 657 | | |
658 | 658 | | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
659 | 664 | | |
660 | 665 | | |
661 | 666 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
| 27 | + | |
26 | 28 | | |
27 | 29 | | |
28 | 30 | | |
| |||
78 | 80 | | |
79 | 81 | | |
80 | 82 | | |
| 83 | + | |
| 84 | + | |
81 | 85 | | |
82 | 86 | | |
83 | 87 | | |
| |||
99 | 103 | | |
100 | 104 | | |
101 | 105 | | |
| 106 | + | |
| 107 | + | |
102 | 108 | | |
103 | 109 | | |
104 | 110 | | |
| |||
112 | 118 | | |
113 | 119 | | |
114 | 120 | | |
| 121 | + | |
| 122 | + | |
115 | 123 | | |
116 | 124 | | |
117 | 125 | | |
| |||
125 | 133 | | |
126 | 134 | | |
127 | 135 | | |
| 136 | + | |
| 137 | + | |
128 | 138 | | |
129 | 139 | | |
130 | 140 | | |
| |||
138 | 148 | | |
139 | 149 | | |
140 | 150 | | |
| 151 | + | |
| 152 | + | |
141 | 153 | | |
142 | 154 | | |
143 | 155 | | |
| |||
164 | 176 | | |
165 | 177 | | |
166 | 178 | | |
| 179 | + | |
| 180 | + | |
167 | 181 | | |
168 | 182 | | |
169 | 183 | | |
| |||
188 | 202 | | |
189 | 203 | | |
190 | 204 | | |
| 205 | + | |
| 206 | + | |
191 | 207 | | |
192 | 208 | | |
193 | 209 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5284 | 5284 | | |
5285 | 5285 | | |
5286 | 5286 | | |
| 5287 | + | |
| 5288 | + | |
| 5289 | + | |
5287 | 5290 | | |
5288 | 5291 | | |
5289 | 5292 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
36 | 36 | | |
37 | 37 | | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| |||
0 commit comments