From 5ba53cac060d26717b22e5e76debce1fca3fc776 Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Thu, 25 Sep 2014 01:29:08 +0200 Subject: [PATCH] Fix tests --- phpdbg_info.c | 2 -- phpdbg_prompt.c | 4 ++-- tests/commands/0002_set.test | 2 +- tests/commands/0102_print.test | 5 ++--- tests/commands/0104_clean.test | 10 +++++----- tests/commands/0105_clear.test | 2 +- tests/commands/0106_compile.test | 3 +-- 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/phpdbg_info.c b/phpdbg_info.c index 9cc59c066d..5204bc1357 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(""); @@ -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 46033b0ed3..b03d23bc57 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(""); 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(""); 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 468ac6d9ea..6a14a15adc 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 de4acb7651..c174564e07 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 # L%d-%d test::testPrivateMethod() %s # L%d %s ZEND_RETURN C%d # L%d-%d test::testProtectedMethod() %s # L%d %s ZEND_RETURN C%d -#[User Method testMethod] +#[User Method testMethod (1 ops)] # L%d-%d test::testMethod() %s # L%d %s ZEND_RETURN C%d ################################################# diff --git a/tests/commands/0104_clean.test b/tests/commands/0104_clean.test index c7a579be17..d50903c479 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 b547b0d6ba..8ce1002491 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 ce4e16981b..b4d801670b 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] ################################################# -- 2.40.0