Skip to content

Commit 3e32be4

Browse files
committed
Allow processing of SKIPIF output after a nocache tag
Previously, a nocache tag would result in the entire SKIPIF output being ignored. This allows the remaining SKIPIF output to still be processed by run_test().
1 parent 308ad7f commit 3e32be4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

run-tests.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3720,8 +3720,8 @@ 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 (strpos($result, 'nocache') === 0) {
3724-
$result = '';
3723+
if (!strncasecmp('nocache', $result, 7)) {
3724+
$result = ltrim(substr($result, 7));
37253725
} else if ($this->enable) {
37263726
$this->skips[$key][$code] = $result;
37273727
}

0 commit comments

Comments
 (0)