diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-11-29 01:49:23 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-11-29 01:49:23 +0100 |
| commit | 7e4b77c921fa669138c01dfe334472ce1343621f (patch) | |
| tree | eaff9f0334252526057800ce0fe6452846e4289f | |
| parent | a76f8e297d60201631021cc20526968fd0de4ef0 (diff) | |
| parent | 108bf849674d772cbf9bfeb2e95072f40ab4c91d (diff) | |
| download | php-git-7e4b77c921fa669138c01dfe334472ce1343621f.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test with readline on mac
| -rw-r--r-- | sapi/cli/tests/bug64529.phpt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sapi/cli/tests/bug64529.phpt b/sapi/cli/tests/bug64529.phpt index d3755724e8..8452953baf 100644 --- a/sapi/cli/tests/bug64529.phpt +++ b/sapi/cli/tests/bug64529.phpt @@ -21,7 +21,7 @@ if (extension_loaded("readline")) { set php_executable [lindex \$argv 0] -spawn \$php_executable -n -a +spawn \$php_executable -n -d cli.prompt="" -a expect "php >" @@ -39,7 +39,7 @@ SCRIPT; set php_executable [lindex \$argv 0] -spawn \$php_executable -n -a +spawn \$php_executable -n -d cli.prompt="" -a expect "Interactive mode enabled" @@ -60,8 +60,8 @@ system($expect_executable . " " . $script . " " . $php_executable); @unlink($script); ?> --EXPECTF-- -spawn %sphp -n -a +spawn %sphp -n -d cli.prompt="" -a Interactive %s -%secho 'hello world'; -%sello worl%s +%Secho 'hello world'; +%Shello world |