summaryrefslogtreecommitdiff
path: root/sapi/phpdbg/tests
diff options
context:
space:
mode:
Diffstat (limited to 'sapi/phpdbg/tests')
-rw-r--r--sapi/phpdbg/tests/basic_run.phpt2
-rw-r--r--sapi/phpdbg/tests/delimiter.phpt2
-rw-r--r--sapi/phpdbg/tests/exceptions_003.phpt2
-rw-r--r--sapi/phpdbg/tests/info_002.phpt6
-rw-r--r--sapi/phpdbg/tests/run_001.phpt2
-rw-r--r--sapi/phpdbg/tests/stdin_001.phpt2
-rw-r--r--sapi/phpdbg/tests/stepping_001.phpt2
7 files changed, 9 insertions, 9 deletions
diff --git a/sapi/phpdbg/tests/basic_run.phpt b/sapi/phpdbg/tests/basic_run.phpt
index beb19b535a..130dc14110 100644
--- a/sapi/phpdbg/tests/basic_run.phpt
+++ b/sapi/phpdbg/tests/basic_run.phpt
@@ -3,6 +3,6 @@ Basic run
--PHPDBG--
r
q
---EXPECTF--
+--EXPECT--
prompt> [Nothing to execute!]
prompt>
diff --git a/sapi/phpdbg/tests/delimiter.phpt b/sapi/phpdbg/tests/delimiter.phpt
index da5f681783..bf9cb598aa 100644
--- a/sapi/phpdbg/tests/delimiter.phpt
+++ b/sapi/phpdbg/tests/delimiter.phpt
@@ -2,6 +2,6 @@
Test # delimiter parsing and execution
--PHPDBG--
ev 1 + 3 # ev 2 ** 3#q
---EXPECTF--
+--EXPECT--
prompt> 4
8
diff --git a/sapi/phpdbg/tests/exceptions_003.phpt b/sapi/phpdbg/tests/exceptions_003.phpt
index 9d4abc0739..16920870c3 100644
--- a/sapi/phpdbg/tests/exceptions_003.phpt
+++ b/sapi/phpdbg/tests/exceptions_003.phpt
@@ -26,7 +26,7 @@ prompt> [L7 %s ECHO<1> "ok\n"
00009: } catch (Error $e) {
prompt> ok
[L7 %s FAST_RET ~%d try-catch(0) %s]
-[L9 %s CATCH<-%d> "Error" $e 1 %s]
+[L9 %s CATCH<%d> "Error" $e %s]
>00005: x();
00006: } finally {
00007: print "ok\n";
diff --git a/sapi/phpdbg/tests/info_002.phpt b/sapi/phpdbg/tests/info_002.phpt
index faeca0e430..8b1aa0930c 100644
--- a/sapi/phpdbg/tests/info_002.phpt
+++ b/sapi/phpdbg/tests/info_002.phpt
@@ -13,11 +13,11 @@ prompt> [Breakpoint #0 at %s:10, hits: 1]
00011:
prompt> [User-defined constants (2)]
Address Refs Type Constant
-%s 1 integer A
+%s 1 int A
int (10)
-%s 1 integer B
+%s 1 int B
int (100)
-prompt>
+prompt>
--FILE--
<?php
diff --git a/sapi/phpdbg/tests/run_001.phpt b/sapi/phpdbg/tests/run_001.phpt
index 30aab1f17a..626ecb323b 100644
--- a/sapi/phpdbg/tests/run_001.phpt
+++ b/sapi/phpdbg/tests/run_001.phpt
@@ -21,7 +21,7 @@ array(5) {
string(1) "3"
}
[Script ended normally]
-prompt> int(5)
+prompt> int(4)
array(4) {
[0]=>
string(%d) "%s"
diff --git a/sapi/phpdbg/tests/stdin_001.phpt b/sapi/phpdbg/tests/stdin_001.phpt
index 2f93a2d956..977e445045 100644
--- a/sapi/phpdbg/tests/stdin_001.phpt
+++ b/sapi/phpdbg/tests/stdin_001.phpt
@@ -11,7 +11,7 @@ r
c
r
q
---EXPECTF--
+--EXPECT--
prompt> [Successful compilation of stdin input]
prompt> [Breakpoint #0 added at Standard input code:3]
prompt> [Breakpoint #0 at Standard input code:3, hits: 1]
diff --git a/sapi/phpdbg/tests/stepping_001.phpt b/sapi/phpdbg/tests/stepping_001.phpt
index e8e32db0be..90b2e5573a 100644
--- a/sapi/phpdbg/tests/stepping_001.phpt
+++ b/sapi/phpdbg/tests/stepping_001.phpt
@@ -25,7 +25,7 @@ prompt> [L0 %s HANDLE_EXCEPTION
00005: }
00006:
prompt> [L0 %s HANDLE_EXCEPTION %s]
-[L9 %s CATCH<-%d> "Exception" $e 1 %s]
+[L9 %s CATCH<%d> "Exception" $e %s]
>00008: foo();
00009: } catch (Exception $e) {
00010: echo "ok";