com php-src: Fix tests: phpdbg_info.c phpdbg_prompt.c tests/commands/0002_set.test tests/commands/ 0102_print.test tests/commands/0104_cle an.test
tests/commands/0105_clear.test tests/ commands/0106_compile.test
| From: | Bob Weinand | Date: | Wed, 24 Sep 2014 23:29:08 +0000 |
| Subject: | com php-src: Fix tests: phpdbg_info.c phpdbg_prompt.c tests/commands/0002_set.test tests/commands/ 0102_print.test tests/commands/0104_cle an.test tests/commands/0105_clear.test tests/ commands/0106_compile.test |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82607@lists.php.net to get a copy of this message | ||
Commit: 5ba53cac060d26717b22e5e76debce1fca3fc776
Author: Bob Weinand <bobwei9@hotmail.com> Thu, 25 Sep 2014 01:29:08 +0200
Parents: 67787d7b6d1c413302f2d86aa1f9ba8d50491a3b
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5ba53cac060d26717b22e5e76debce1fca3fc776
Log:
Fix tests
Changed paths:
M phpdbg_info.c
M phpdbg_prompt.c
M tests/commands/0002_set.test
M tests/commands/0102_print.test
M tests/commands/0104_clean.test
M tests/commands/0105_clear.test
M tests/commands/0106_compile.test
Diff:
diff --git a/phpdbg_info.c b/phpdbg_info.c
index 9cc59c0..5204bc1 100644
--- a/phpdbg_info.c
+++ b/phpdbg_info.c
@@ -286,7 +286,6 @@ PHPDBG_INFO(classes) /* {{{ */
zend_hash_move_forward_ex(&classes, &position)) {
phpdbg_print_class_name(ce TSRMLS_CC);
- phpdbg_out("\n");
if ((*ce)->parent) {
phpdbg_xml("<parents>");
@@ -305,7 +304,6 @@ PHPDBG_INFO(classes) /* {{{ */
} else {
phpdbg_writeln("classsource", "", "|---- no source code");
}
- phpdbg_out("\n");
}
zend_hash_destroy(&classes);
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 46033b0..b03d23b 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -872,7 +872,7 @@ PHPDBG_COMMAND(clean) /* {{{ */
return SUCCESS;
}
- phpdbg_out("Cleaning Execution Environment");
+ phpdbg_out("Cleaning Execution Environment\n");
phpdbg_xml("<cleaninfo>");
phpdbg_writeln("clean", "classes=\"%d\"", "Classes %d",
zend_hash_num_elements(EG(class_table)));
@@ -889,7 +889,7 @@ PHPDBG_COMMAND(clean) /* {{{ */
PHPDBG_COMMAND(clear) /* {{{ */
{
- phpdbg_out("Clearing Breakpoints");
+ phpdbg_out("Clearing Breakpoints\n");
phpdbg_xml("<clearinfo>");
phpdbg_writeln("clear", "files=\"%d\"", "File
%d", zend_hash_num_elements(&PHPDBG_G(bp)[PHPDBG_BREAK_FILE]));
diff --git a/tests/commands/0002_set.test b/tests/commands/0002_set.test
index 468ac6d..6a14a15 100644
--- a/tests/commands/0002_set.test
+++ b/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/tests/commands/0102_print.test b/tests/commands/0102_print.test
index de4acb7..c174564 100644
--- a/tests/commands/0102_print.test
+++ b/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/tests/commands/0104_clean.test b/tests/commands/0104_clean.test
index c7a579b...d50903c 100644
--- a/tests/commands/0104_clean.test
+++ b/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/tests/commands/0105_clear.test b/tests/commands/0105_clear.test
index b547b0d..8ce1002 100644
--- a/tests/commands/0105_clear..test
+++ b/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/tests/commands/0106_compile.test b/tests/commands/0106_compile.test
index ce4e169..b4d8016 100644
--- a/tests/commands/0106_compile.test
+++ b/tests/commands/0106_compile.test
@@ -4,8 +4,7 @@
# expect: TEST::FORMAT
# options: -rr
#################################################
-#[Attempting compilation of %s]
-#[Success]
+#[Successful compilation of %s]
#Hello World
#[Script ended normally]
#################################################