diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2021-03-04 16:26:47 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-03-04 16:28:11 +0100 |
commit | 4d43cbe333690171753e9b8663df93d3762e02a8 (patch) | |
tree | b7e36301f1fe5a1c5085eaab6f1190201dc1624b | |
parent | 97de8cfc710c51bc19ed504d5caeec83db5a3f8d (diff) | |
download | php-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.
-rw-r--r-- | ext/mysqli/tests/mysqli_pam_sha256.phpt | 1 | ||||
-rw-r--r-- | ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt | 1 | ||||
-rw-r--r-- | ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt | 1 | ||||
-rw-r--r-- | ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt | 1 | ||||
-rwxr-xr-x | run-tests.php | 4 |
5 files changed, 7 insertions, 1 deletions
diff --git a/ext/mysqli/tests/mysqli_pam_sha256.phpt b/ext/mysqli/tests/mysqli_pam_sha256.phpt index 8866409efe..29df5c1fde 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256.phpt @@ -75,6 +75,7 @@ if (!$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'%%'", $db)) } $link->close(); +echo "nocache"; ?> --FILE-- <?php diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt index 86e27fbaff..90f9a255a6 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt @@ -88,6 +88,7 @@ if (!$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'%%'", $db)) } $link->close(); +echo "nocache"; ?> --INI-- mysqlnd.sha256_server_public_key="test_sha256_ini" diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt index 9b5639ff9a..1493c37737 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt @@ -85,6 +85,7 @@ if (!$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'%%'", $db)) } $link->close(); +echo "nocache"; ?> --FILE-- <?php diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt index b664179265..5c55821b8a 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt @@ -85,6 +85,7 @@ if (!$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'%%'", $db)) } $link->close(); +echo "nocache"; ?> --FILE-- <?php 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) { |