diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-24 19:22:45 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-24 19:22:45 +0200 |
| commit | 9b4d9ac6c7fbc6a53aee6c9b199046556e5fef13 (patch) | |
| tree | d6e968764930a4cc3ac99b39cc235c1fec50f4f5 /sapi/phpdbg/tests | |
| parent | 411984c0e9402a4e7c2d2d0cf23069f9eef60860 (diff) | |
| parent | 36399428919ef518bcd744e120e48c00610a8b86 (diff) | |
| download | php-git-9b4d9ac6c7fbc6a53aee6c9b199046556e5fef13.tar.gz | |
Merge phpdbg into PHP-5.6
Diffstat (limited to 'sapi/phpdbg/tests')
| -rw-r--r-- | sapi/phpdbg/tests/commands/0002_set.test | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/commands/0102_print.test | 5 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/commands/0104_clean.test | 10 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/commands/0105_clear.test | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/commands/0106_compile.test | 4 |
5 files changed, 11 insertions, 12 deletions
diff --git a/sapi/phpdbg/tests/commands/0002_set.test b/sapi/phpdbg/tests/commands/0002_set.test index 468ac6d9ea..6a14a15adc 100644 --- a/sapi/phpdbg/tests/commands/0002_set.test +++ b/sapi/phpdbg/tests/commands/0002_set.test @@ -8,7 +8,7 @@ # setting error color # setting notice color # Failed to find breakpoint #0 -# oplog disabled +# [Oplog off] # opened oplog test.log # nothing ################################################# diff --git a/sapi/phpdbg/tests/commands/0102_print.test b/sapi/phpdbg/tests/commands/0102_print.test index de4acb7651..c174564e07 100644 --- a/sapi/phpdbg/tests/commands/0102_print.test +++ b/sapi/phpdbg/tests/commands/0102_print.test @@ -4,15 +4,14 @@ # expect: TEST::FORMAT # options: -rr ################################################# -#[User Class: test] -#Methods (3): +#[User Class: test (3 methods)] #L%d-%d test::testMethod() %s # L%d %s ZEND_RETURN C%d <unused> <unused> # L%d-%d test::testPrivateMethod() %s # L%d %s ZEND_RETURN C%d <unused> <unused> # L%d-%d test::testProtectedMethod() %s # L%d %s ZEND_RETURN C%d <unused> <unused> -#[User Method testMethod] +#[User Method testMethod (1 ops)] # L%d-%d test::testMethod() %s # L%d %s ZEND_RETURN C%d <unused> <unused> ################################################# diff --git a/sapi/phpdbg/tests/commands/0104_clean.test b/sapi/phpdbg/tests/commands/0104_clean.test index c7a579be17..d50903c479 100644 --- a/sapi/phpdbg/tests/commands/0104_clean.test +++ b/sapi/phpdbg/tests/commands/0104_clean.test @@ -4,11 +4,11 @@ # expect: TEST::FORMAT # options: -rr ################################################# -#[Cleaning Execution Environment] -#Classes %d -#Functions %d -#Constants %d -#Includes %d +#Cleaning Execution Environment +#Classes %d +#Functions %d +#Constants %d +#Includes %d #[Nothing to execute!] ################################################# clean diff --git a/sapi/phpdbg/tests/commands/0105_clear.test b/sapi/phpdbg/tests/commands/0105_clear.test index b547b0d6ba..8ce1002491 100644 --- a/sapi/phpdbg/tests/commands/0105_clear.test +++ b/sapi/phpdbg/tests/commands/0105_clear.test @@ -4,7 +4,7 @@ # expect: TEST::FORMAT # options: -rr ################################################# -#[Clearing Breakpoints] +#Clearing Breakpoints #File%w%d #Functions%w%d #Methods%w%d diff --git a/sapi/phpdbg/tests/commands/0106_compile.test b/sapi/phpdbg/tests/commands/0106_compile.test index 7193600ea3..b4d801670b 100644 --- a/sapi/phpdbg/tests/commands/0106_compile.test +++ b/sapi/phpdbg/tests/commands/0106_compile.test @@ -4,9 +4,9 @@ # expect: TEST::FORMAT # options: -rr ################################################# -#[Attempting compilation of %s] -#[Success] +#[Successful compilation of %s] #Hello World +#[Script ended normally] ################################################# <: define('OUT', |