diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-10-24 19:29:50 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-24 19:29:50 +0200 |
| commit | 2bcac53bca8ea82d661f057b6d9ff3c7c84f05a7 (patch) | |
| tree | 681b32fe3d9d342c0461c2641b2d651f095b06f8 /sapi/phpdbg/tests | |
| parent | 53560ca06b333b71883269091f7d74c0a25e087b (diff) | |
| parent | c03ac47bafd0ea55055a2f3d4de0bc6bb4d98d8d (diff) | |
| download | php-git-2bcac53bca8ea82d661f057b6d9ff3c7c84f05a7.tar.gz | |
Made phpdbg compatible with new engine
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 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/run-tests.php | 2 |
6 files changed, 12 insertions, 13 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', diff --git a/sapi/phpdbg/tests/run-tests.php b/sapi/phpdbg/tests/run-tests.php index 1cc31d815e..4afb64561c 100644 --- a/sapi/phpdbg/tests/run-tests.php +++ b/sapi/phpdbg/tests/run-tests.php @@ -389,7 +389,7 @@ namespace phpdbg\testing { } break; default: { - $this->$chunks[0] = $chunks[1]; + $this->{$chunks[0]} = $chunks[1]; } } } else switch(substr($trim, 1, 1)) { |