diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2021-03-04 16:32:58 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-03-04 16:34:10 +0100 |
commit | 0074a1d4e3a85d0d63118e7a30f4b7ed6da64695 (patch) | |
tree | 044d297f5cf8a25c38fae83e3650e150ded8491a | |
parent | 4d43cbe333690171753e9b8663df93d3762e02a8 (diff) | |
download | php-git-0074a1d4e3a85d0d63118e7a30f4b7ed6da64695.tar.gz |
Make the nocache tag actually work
If nocache is used, then we should return an empty string result,
so the test doesn't get marked as borked.
Also limit to an occurrence at the start, just like other skip
tags.
-rwxr-xr-x | run-tests.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/run-tests.php b/run-tests.php index a44a90bb7c..c04d2f4a97 100755 --- a/run-tests.php +++ b/run-tests.php @@ -3749,8 +3749,10 @@ class SkipCache save_text($checkFile, $code, $tempFile); $result = trim(system_with_timeout("$php \"$checkFile\"", $env)); - if (strpos($result, 'nocache') === false) { + if (strpos($result, 'nocache') !== 0) { $this->skips[$key][$code] = $result; + } else { + $result = ''; } $this->misses++; |