From 894933089d664b0d6aafbd804428de7c104a5f61 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Wed, 2 Jun 2010 21:50:56 +0000 Subject: [PATCH] 2010-06-02 Michael Snyder * gdb.python/py-block.exp: Use gdb_test_no_output. * gdb.python/py-prettyprint.exp: Ditto. * gdb.python/py-template.exp: Ditto. * gdb.python/py-value.exp: Ditto. * gdb.reverse/watch-precsave.exp: Use gdb_test_no_output. * gdb.reverse/watch-reverse.exp: Ditto. * gdb.server/ext-attach.exp: Use gdb_test_no_output. * gdb.server/ext-run.exp: Ditto. --- gdb/testsuite/ChangeLog | 11 +++++++++++ gdb/testsuite/gdb.python/py-block.exp | 4 ++-- gdb/testsuite/gdb.python/py-prettyprint.exp | 4 ++-- gdb/testsuite/gdb.python/py-template.exp | 2 +- gdb/testsuite/gdb.python/py-value.exp | 2 +- gdb/testsuite/gdb.reverse/watch-precsave.exp | 2 +- gdb/testsuite/gdb.reverse/watch-reverse.exp | 4 ++-- gdb/testsuite/gdb.server/ext-attach.exp | 2 +- gdb/testsuite/gdb.server/ext-run.exp | 2 +- 9 files changed, 22 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 46df344..2a15f3e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,16 @@ 2010-06-02 Michael Snyder + * gdb.python/py-block.exp: Use gdb_test_no_output. + * gdb.python/py-prettyprint.exp: Ditto. + * gdb.python/py-template.exp: Ditto. + * gdb.python/py-value.exp: Ditto. + + * gdb.reverse/watch-precsave.exp: Use gdb_test_no_output. + * gdb.reverse/watch-reverse.exp: Ditto. + + * gdb.server/ext-attach.exp: Use gdb_test_no_output. + * gdb.server/ext-run.exp: Ditto. + * gdb.dwarf2/dw2-basic.exp: Use gdb_test_no_output. * gdb.dwarf2/dw2-compressed.exp: Ditto. * gdb.dwarf2/dw2-intercu.exp: Ditto. diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp index c1ea250..9826e61 100644 --- a/gdb/testsuite/gdb.python/py-block.exp +++ b/gdb/testsuite/gdb.python/py-block.exp @@ -66,9 +66,9 @@ gdb_test "python print block.start" "${decimal}" "Check start not None" gdb_test "python print block.end" "${decimal}" "Check end not None" # Move up superblock(s) until we reach function block_func. -gdb_test "python block = block.superblock" "" "Get superblock" +gdb_test_no_output "python block = block.superblock" "Get superblock" gdb_test "python print block.function" "None" "Second anonymous block" -gdb_test "python block = block.superblock" "" "Get superblock" +gdb_test_no_output "python block = block.superblock" "Get superblock 2" gdb_test "python print block.function" "block_func" # Switch frames, then test for main block. diff --git a/gdb/testsuite/gdb.python/py-prettyprint.exp b/gdb/testsuite/gdb.python/py-prettyprint.exp index 2c14c59..1fbf0ca 100644 --- a/gdb/testsuite/gdb.python/py-prettyprint.exp +++ b/gdb/testsuite/gdb.python/py-prettyprint.exp @@ -63,7 +63,7 @@ proc run_lang_tests {lang} { return } - gdb_test "set print pretty on" "" + gdb_test_no_output "set print pretty on" gdb_test "b [gdb_get_line_number {break to inspect} ${testfile}.c ]" \ ".*Breakpoint.*" @@ -71,7 +71,7 @@ proc run_lang_tests {lang} { set remote_python_file [remote_download host ${srcdir}/${subdir}/${testfile}.py] - gdb_test "python execfile ('${remote_python_file}')" "" + gdb_test_no_output "python execfile ('${remote_python_file}')" gdb_test "print ss" " = a=< a=<1> b=<$hex>> b=< a=<2> b=<$hex>>" gdb_test "print ssa\[1\]" " = a=< a=<5> b=<$hex>> b=< a=<6> b=<$hex>>" diff --git a/gdb/testsuite/gdb.python/py-template.exp b/gdb/testsuite/gdb.python/py-template.exp index 9089de6..af59353 100644 --- a/gdb/testsuite/gdb.python/py-template.exp +++ b/gdb/testsuite/gdb.python/py-template.exp @@ -53,7 +53,7 @@ proc test_template_arg {type} { } # There is no executable code in main(), so we are where we want to be gdb_test "print foo" "" - gdb_test "python foo = gdb.history(0)" "" + gdb_test_no_output "python foo = gdb.history(0)" # Replace '*' with '\*' in regex. regsub -all {\*} $type {\*} t diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp index 67a2ff9..973ee5c 100644 --- a/gdb/testsuite/gdb.python/py-value.exp +++ b/gdb/testsuite/gdb.python/py-value.exp @@ -116,7 +116,7 @@ proc test_value_numeric_ops {} { # Conversion test. gdb_test "print evalue" " = TWO" - gdb_test "python evalue = gdb.history (0)" "" + gdb_test_no_output "python evalue = gdb.history (0)" gdb_test "python print int (evalue)" "2" # Test pointer arithmethic diff --git a/gdb/testsuite/gdb.reverse/watch-precsave.exp b/gdb/testsuite/gdb.reverse/watch-precsave.exp index 6c7c7f6..9676c98 100644 --- a/gdb/testsuite/gdb.reverse/watch-precsave.exp +++ b/gdb/testsuite/gdb.reverse/watch-precsave.exp @@ -139,7 +139,7 @@ gdb_test "continue" \ ".*\[Ww\]atchpoint.*ival3.*Old value = 0.*New value = -1.*ival3 = count; ival4 = count;.*" \ "watchpoint hit in reverse, fifth time" -gdb_test "set can-use-hw-watchpoints 1" "" "enable hw watchpoints" +gdb_test_no_output "set can-use-hw-watchpoints 1" "enable hw watchpoints" ### ### diff --git a/gdb/testsuite/gdb.reverse/watch-reverse.exp b/gdb/testsuite/gdb.reverse/watch-reverse.exp index dacb27a..beb919e 100644 --- a/gdb/testsuite/gdb.reverse/watch-reverse.exp +++ b/gdb/testsuite/gdb.reverse/watch-reverse.exp @@ -38,7 +38,7 @@ if [target_info exists gdb,use_precord] { } # Test software watchpoints -gdb_test "set can-use-hw-watchpoints 0" "" "disable hw watchpoints" +gdb_test_no_output "set can-use-hw-watchpoints 0" "disable hw watchpoints" gdb_test "break marker1" \ "Breakpoint $decimal at $hex: file .*$srcfile, line $decimal.*" \ @@ -121,7 +121,7 @@ gdb_test "continue" \ ".*\[Ww\]atchpoint.*ival3.*Old value = 0.*New value = -1.*ival3 = count; ival4 = count;.*" \ "watchpoint hit in reverse, fifth time" -gdb_test "set can-use-hw-watchpoints 1" "" "enable hw watchpoints" +gdb_test_no_output "set can-use-hw-watchpoints 1" "enable hw watchpoints" ### ### diff --git a/gdb/testsuite/gdb.server/ext-attach.exp b/gdb/testsuite/gdb.server/ext-attach.exp index 196c56b..2fc4e44 100644 --- a/gdb/testsuite/gdb.server/ext-attach.exp +++ b/gdb/testsuite/gdb.server/ext-attach.exp @@ -45,7 +45,7 @@ gdb_reinitialize_dir $srcdir/$subdir set target_exec [gdbserver_download_current_prog] gdbserver_start_extended -gdb_test "set remote exec-file $target_exec" "" "set remote exec-file" +gdb_test_no_output "set remote exec-file $target_exec" "set remote exec-file" # Start the program running and then wait for a bit, to be sure # that it can be attached to. diff --git a/gdb/testsuite/gdb.server/ext-run.exp b/gdb/testsuite/gdb.server/ext-run.exp index 9b140d6..5cc3501 100644 --- a/gdb/testsuite/gdb.server/ext-run.exp +++ b/gdb/testsuite/gdb.server/ext-run.exp @@ -43,7 +43,7 @@ gdb_reinitialize_dir $srcdir/$subdir set target_exec [gdbserver_download_current_prog] gdbserver_start_extended -gdb_test "set remote exec-file $target_exec" "" "set remote exec-file" +gdb_test_no_output "set remote exec-file $target_exec" "set remote exec-file" gdb_breakpoint main gdb_test "run" "Breakpoint.* main .*" "continue to main" -- 2.7.4