diff options
author | Stanislav Malyshev <stas@php.net> | 2014-01-26 14:26:01 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-01-26 14:26:01 -0800 |
commit | e52c332b382f5255b65654e9bc5be77090581dcc (patch) | |
tree | 1f484dc19db121670fb1c8956dd3e2e7e0779351 | |
parent | d78c40d25dccba9911930ac5e89843f0082ea3b4 (diff) | |
parent | 54c1e28a39b50de508715afa9df6a3b260253523 (diff) | |
download | php-git-e52c332b382f5255b65654e9bc5be77090581dcc.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
-rw-r--r-- | ext/readline/tests/libedit_info_001.phpt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/readline/tests/libedit_info_001.phpt b/ext/readline/tests/libedit_info_001.phpt index e30047738f..1d79f4ad0c 100644 --- a/ext/readline/tests/libedit_info_001.phpt +++ b/ext/readline/tests/libedit_info_001.phpt @@ -1,8 +1,9 @@ --TEST-- readline_info(): Basic test --SKIPIF-- -<?php if (!extension_loaded("readline")) die("skip"); ?> +<?php if (!extension_loaded("readline")) die("skip"); if (READLINE_LIB != "libedit") die("skip libedit only"); +?> --FILE-- <?php |