Commit 5bc467b
authored
fix(ci): update laravel assertions, skip bailout under valgrind, fix grep (#3769)
* fix(ci): update laravel test assertions and skip bailout test under valgrind
- Laravel Octane/Latest CommonScenariosTest: update two resource name
assertions introduced by 1111e80 (unnamed routes now use route URI
instead of 'unnamed_route' suffix): simple_view and error routes now
produce 'simple_view' and 'error' respectively.
- Laravel V4 CommonScenariosTest: update dynamic route resource name
assertion for the same reason — Laravel 4.2 has a uri() method so it
hits the new elseif branch; expected value is now
'dynamic_route/{param01}/static/{param02?}'.
- bailout_double_hook_clear.phpt: add --SKIPIF-- to skip under valgrind
(USE_ZEND_ALLOC=0). The test triggers a PHP fatal bailout inside a
posthook which bypasses normal span/hook cleanup, causing an expected
valgrind LEAKED TEST SUMMARY. The test still runs in the normal
(non-valgrind) pass. Pattern matches the guard added in 856068a for
background-sender tests.
* fix(ci): anchor LEAKED TEST SUMMARY grep to line start
The check `! grep -e 'LEAKED TEST SUMMARY'` was too broad: it matched
the phrase as a substring anywhere in valgrind-run-tests.out, including
inside the PHPINFO section where run-tests.php writes phpinfo() output.
Before this fix, the check was masked on PHP 7.0/7.1 because
`bailout_double_hook_clear.phpt` leaked under valgrind, causing
run-tests.php to exit 1, which short-circuited the && and skipped grep.
After adding the SKIPIF to that test, run-tests.php exits 0 and grep
runs, finding 6 embedded occurrences that were always there.
The actual section header written by run-tests.php is:
LEAKED TEST SUMMARY
at line start with no leading spaces. The false-positive lines look like:
" valgrind LEAKED TEST SUMMARY. The test still runs in the normal"
with leading spaces — clearly not the section header.
Anchoring with ^ matches only the real header.1 parent 5031f38 commit 5bc467b
File tree
4 files changed
+8
-4
lines changed- tests
- Integrations/Laravel
- Octane/Latest
- V4
- ext
4 files changed
+8
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
211 | 211 | | |
212 | 212 | | |
213 | 213 | | |
214 | | - | |
| 214 | + | |
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
169 | 169 | | |
170 | 170 | | |
171 | 171 | | |
172 | | - | |
| 172 | + | |
173 | 173 | | |
174 | 174 | | |
175 | 175 | | |
| |||
258 | 258 | | |
259 | 259 | | |
260 | 260 | | |
261 | | - | |
| 261 | + | |
262 | 262 | | |
263 | 263 | | |
264 | 264 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
186 | 186 | | |
187 | 187 | | |
188 | 188 | | |
189 | | - | |
| 189 | + | |
190 | 190 | | |
191 | 191 | | |
192 | 192 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
3 | 7 | | |
4 | 8 | | |
5 | 9 | | |
| |||
0 commit comments