Skip to content

Commit 3237f95

Browse files
committed
Consume leading nocache tags in SKIPIF output
This avoids a potential BC break for existing tests that may print "nocache" multiple times.
1 parent 3e32be4 commit 3237f95

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

run-tests.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3720,9 +3720,14 @@ public function checkSkip(string $php, string $code, string $checkFile, string $
37203720

37213721
save_text($checkFile, $code, $tempFile);
37223722
$result = trim(system_with_timeout("$php \"$checkFile\"", $env));
3723-
if (!strncasecmp('nocache', $result, 7)) {
3723+
$cacheResult = $this->enable;
3724+
3725+
while (!strncasecmp('nocache', $result, 7)) {
37243726
$result = ltrim(substr($result, 7));
3725-
} else if ($this->enable) {
3727+
$cacheResult = false;
3728+
}
3729+
3730+
if ($cacheResult) {
37263731
$this->skips[$key][$code] = $result;
37273732
}
37283733
$this->misses++;

0 commit comments

Comments
 (0)