summaryrefslogtreecommitdiff
path: root/run-tests.php
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2021-03-04 16:26:47 +0100
committerNikita Popov <nikita.ppv@gmail.com>2021-03-04 16:28:11 +0100
commit4d43cbe333690171753e9b8663df93d3762e02a8 (patch)
treeb7e36301f1fe5a1c5085eaab6f1190201dc1624b /run-tests.php
parent97de8cfc710c51bc19ed504d5caeec83db5a3f8d (diff)
downloadphp-git-4d43cbe333690171753e9b8663df93d3762e02a8.tar.gz
Add mechanism to skip the skipif cache
If the SKIPIF section return nocache, don't cache the result. This is used by tests that perform complex test set in conjunction with skip checks, and need to be evaluated every time.
Diffstat (limited to 'run-tests.php')
-rwxr-xr-xrun-tests.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/run-tests.php b/run-tests.php
index 7a66370c39..a44a90bb7c 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -3749,7 +3749,9 @@ class SkipCache
save_text($checkFile, $code, $tempFile);
$result = trim(system_with_timeout("$php \"$checkFile\"", $env));
- $this->skips[$key][$code] = $result;
+ if (strpos($result, 'nocache') === false) {
+ $this->skips[$key][$code] = $result;
+ }
$this->misses++;
if (!$this->keepFile) {