com php-src: Skip readline tests which fail with libedit Add specific libedit test (output slightly differs): ext/readline/tests/libe
dit_callback_handler_install_001.phpt ext/rea dline/tests/libedit_callback_handler_remove_001 .phpt ext/readline/tests/libedit_info_001.phpt
ext/readline/tests/libedit_write_history_001.p hpt ext/readline/tests/readline_callback_handler_instal l_001.phpt ext/readline/tests/readline_callback
_handler_remove_001.phpt ext/r

Commit: e3192473b56c8ed112333053e28eb6d91d7c3b64 Author: Remi Collet <remi@php.net> Mon, 20 Jan 2014 09:38:34 +0100 Parents: 31d67bd35362c1ab570caccedfec3e24257b55c5 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e3192473b56c8ed112333053e28eb6d91d7c3b64 Log: Skip readline tests which fail with libedit Add specific libedit test (output slightly differs) Changed paths: A ext/readline/tests/libedit_callback_handler_install_001.phpt A ext/readline/tests/libedit_callback_handler_remove_001.phpt A ext/readline/tests/libedit_info_001.phpt A ext/readline/tests/libedit_write_history_001.phpt M ext/readline/tests/readline_callback_handler_install_001.phpt M ext/readline/tests/readline_callback_handler_remove_001.phpt M ext/readline/tests/readline_info_001.phpt M ext/readline/tests/readline_write_history_001.phpt Diff: diff --git a/ext/readline/tests/libedit_callback_handler_install_001.phpt b/ext/readline/tests/libedit_callback_handler_install_001.phpt new file mode 100644 index 0000000..b5d921e --- /dev/null +++ b/ext/readline/tests/libedit_callback_handler_install_001.phpt @@ -0,0 +1,26 @@ +--TEST-- +readline_callback_handler_install(): Basic test +--SKIPIF-- +<?php if (!extension_loaded("readline") || !function_exists('readline_callback_handler_install')) die("skip"); +if (READLINE_LIB != "libedit") die("skip libedit only"); +?> +--FILE-- +<?php + +function foo() { + readline_callback_handler_remove(); +} + +var_dump(readline_callback_handler_install('testing: ', 'foo')); +var_dump(readline_callback_handler_install('testing: ', 'foobar!')); +var_dump(readline_callback_handler_install('testing: ')); + +?> +--EXPECTF-- +bool(true) + +Warning: readline_callback_handler_install(): foobar! is not callable in %s on line %d +bool(false) + +Warning: readline_callback_handler_install() expects exactly 2 parameters, 1 given in %s on line %d +NULL diff --git a/ext/readline/tests/libedit_callback_handler_remove_001.phpt b/ext/readline/tests/libedit_callback_handler_remove_001.phpt new file mode 100644 index 0000000..b7eaa21 --- /dev/null +++ b/ext/readline/tests/libedit_callback_handler_remove_001.phpt @@ -0,0 +1,22 @@ +--TEST-- +readline_callback_handler_remove(): Basic test +--SKIPIF-- +<?php if (!extension_loaded("readline") || !function_exists('readline_callback_handler_remove')) die("skip"); +if (READLINE_LIB != "libedit") die("skip libedit only"); +?> +--FILE-- +<?php + +var_dump(readline_callback_handler_remove()); +var_dump(readline_callback_handler_install('testing: ', 'foo')); + +function foo() { } +var_dump(readline_callback_handler_install('testing: ', 'foo')); +var_dump(readline_callback_handler_remove()); + +?> +--EXPECTF-- +bool(false) +bool(true) +bool(true) +bool(true) diff --git a/ext/readline/tests/libedit_info_001.phpt b/ext/readline/tests/libedit_info_001.phpt new file mode 100644 index 0000000..e300477 --- /dev/null +++ b/ext/readline/tests/libedit_info_001.phpt @@ -0,0 +1,42 @@ +--TEST-- +readline_info(): Basic test +--SKIPIF-- +<?php if (!extension_loaded("readline")) die("skip"); ?> +if (READLINE_LIB != "libedit") die("skip libedit only"); +--FILE-- +<?php + +var_dump(readline_info()); +var_dump(readline_info(1)); +var_dump(readline_info(1,1)); +var_dump(readline_info('line_buffer')); +var_dump(readline_info('readline_name')); +var_dump(readline_info('readline_name', 1)); +var_dump(readline_info('readline_name')); +var_dump(readline_info('attempted_completion_over',1)); +var_dump(readline_info('attempted_completion_over')); + +?> +--EXPECTF-- +array(6) { + ["line_buffer"]=> + string(0) "" + ["point"]=> + int(0) + ["end"]=> + int(0) + ["library_version"]=> + string(%d) "%s" + ["readline_name"]=> + string(0) "" + ["attempted_completion_over"]=> + int(0) +} +NULL +NULL +string(0) "" +string(0) "" +string(0) "" +string(1) "1" +int(0) +int(1) diff --git a/ext/readline/tests/libedit_write_history_001.phpt b/ext/readline/tests/libedit_write_history_001.phpt new file mode 100644 index 0000000..e9b6dbe --- /dev/null +++ b/ext/readline/tests/libedit_write_history_001.phpt @@ -0,0 +1,29 @@ +--TEST-- +readline_write_history(): Basic test +--SKIPIF-- +<?php if (!extension_loaded("readline") || !function_exists('readline_add_history')) die("skip"); +if (READLINE_LIB != "libedit") die("skip libedit only"); +?> +--FILE-- +<?php + +$name = tempnam('/tmp', 'readline.tmp'); + +readline_add_history('foo'); +readline_add_history(''); +readline_add_history(1); +readline_add_history(NULL); +readline_write_history($name); + +var_dump(file_get_contents($name)); + +unlink($name); + +?> +--EXPECT-- +string(21) "_HiStOrY_V2_ +foo + +1 + +" diff --git a/ext/readline/tests/readline_callback_handler_install_001.phpt b/ext/readline/tests/readline_callback_handler_install_001.phpt index c88a4e8..cc054b0 100644 --- a/ext/readline/tests/readline_callback_handler_install_001.phpt +++ b/ext/readline/tests/readline_callback_handler_install_001.phpt @@ -1,7 +1,9 @@ --TEST-- readline_callback_handler_install(): Basic test --SKIPIF-- -<?php if (!extension_loaded("readline") || !function_exists('readline_callback_handler_install')) die("skip"); ?> +<?php if (!extension_loaded("readline") || !function_exists('readline_callback_handler_install')) die("skip"); +if (READLINE_LIB == "libedit") die("skip readline only"); +?> --FILE-- <?php diff --git a/ext/readline/tests/readline_callback_handler_remove_001.phpt b/ext/readline/tests/readline_callback_handler_remove_001.phpt index 83b592e..17ef220 100644 --- a/ext/readline/tests/readline_callback_handler_remove_001.phpt +++ b/ext/readline/tests/readline_callback_handler_remove_001.phpt @@ -1,7 +1,9 @@ --TEST-- readline_callback_handler_remove(): Basic test --SKIPIF-- -<?php if (!extension_loaded("readline") || !function_exists('readline_callback_handler_remove')) die("skip"); ?> +<?php if (!extension_loaded("readline") || !function_exists('readline_callback_handler_remove')) die("skip"); +if (READLINE_LIB == "libedit") die("skip readline only"); +?> --FILE-- <?php diff --git a/ext/readline/tests/readline_info_001.phpt b/ext/readline/tests/readline_info_001.phpt index ebab3bf..81b7806 100644 --- a/ext/readline/tests/readline_info_001.phpt +++ b/ext/readline/tests/readline_info_001.phpt @@ -1,7 +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 readline only"); +?> --FILE-- <?php diff --git a/ext/readline/tests/readline_write_history_001.phpt b/ext/readline/tests/readline_write_history_001.phpt index fc0ae32..95c34e3 100644 --- a/ext/readline/tests/readline_write_history_001.phpt +++ b/ext/readline/tests/readline_write_history_001.phpt @@ -1,7 +1,9 @@ --TEST-- readline_write_history(): Basic test --SKIPIF-- -<?php if (!extension_loaded("readline") || !function_exists('readline_add_history')) die("skip"); ?> +<?php if (!extension_loaded("readline") || !function_exists('readline_add_history')) die("skip"); +if (READLINE_LIB == "libedit") die("skip readline only"); +?> --FILE-- <?php