Skip to content

Commit 30a028f

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 49087a6 commit 30a028f

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
@@ -3697,8 +3697,8 @@ public function checkSkip(string $php, string $code, string $checkFile, string $
36973697

36983698
save_text($checkFile, $code, $tempFile);
36993699
$result = trim(system_with_timeout("$php \"$checkFile\"", $env));
3700-
if (strpos($result, 'nocache') === 0) {
3701-
$result = '';
3700+
if (!strncasecmp('nocache', $result, 7)) {
3701+
$result = ltrim(substr($result, 7));
37023702
} else if ($this->enable) {
37033703
$this->skips[$key][$code] = $result;
37043704
}

0 commit comments

Comments
 (0)