diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-10-29 14:23:47 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-10-29 14:23:47 +0800 |
| commit | 6b671ca3ed28cf46a30e7fbfdfd688cda5878fff (patch) | |
| tree | abe734b6e00b8c6a5b9246e426af5fcbbd8dbb49 | |
| parent | 8e4ea7a188f1b7d4b4b0726296ff1f7506db43a1 (diff) | |
| parent | 66caa61188a7596f8af8da5d9f1217e5648f4076 (diff) | |
| download | php-git-6b671ca3ed28cf46a30e7fbfdfd688cda5878fff.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Skip if no jit is built
| -rw-r--r-- | ext/pcre/tests/check_jit_enabled.phpt | 5 | ||||
| -rw-r--r-- | ext/pcre/tests/preg_match_error3.phpt | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ext/pcre/tests/check_jit_enabled.phpt b/ext/pcre/tests/check_jit_enabled.phpt index 9cdab2b1d3..de6e263e70 100644 --- a/ext/pcre/tests/check_jit_enabled.phpt +++ b/ext/pcre/tests/check_jit_enabled.phpt @@ -1,5 +1,10 @@ --TEST-- Check for JIT enablement status +--SKIPIF-- +<?php +if (ini_get("pcre.jit") === FALSE) { + die("skip no jit built"); +} --FILE-- <?php diff --git a/ext/pcre/tests/preg_match_error3.phpt b/ext/pcre/tests/preg_match_error3.phpt index 7202b68b34..2e91e24466 100644 --- a/ext/pcre/tests/preg_match_error3.phpt +++ b/ext/pcre/tests/preg_match_error3.phpt @@ -1,5 +1,10 @@ --TEST-- Test preg_match() function : error conditions - jit stacklimit exhausted +--SKIPIF-- +<?php +if (ini_get("pcre.jit") === FALSE) { + die("skip no jit built"); +} --FILE-- <?php var_dump(preg_match('/^(foo)+$/', str_repeat('foo', 1024*8192))); |