From 35ec993ff8a5cddce8476d353b35fe18b605e99d Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Thu, 3 Jun 2010 23:54:18 +0000 Subject: 2010-06-03 Michael Snyder * gdb.base/commands.exp: Replace gdb_test with gdb_test_no_output. * gdb.base/display.exp: Ditto. * gdb.base/find.exp: Ditto. * gdb.base/ifelse.exp: Ditto. * gdb.base/multi-forks.exp: Ditto. * gdb.base/recurse.exp: Ditto. * gdb.base/setshow.exp: Ditto. * gdb.base/value-double-free.exp: Ditto. * gdb.base/watch-vfork.exp: Ditto. * gdb.base/watch_thread_num.exp: Ditto. * gdb.base/watchpoint-solib.exp: Ditto. * gdb.base/watchpoint.exp: Ditto. * gdb.base/watchpoints.exp: Ditto. * gdb.cp/classes.exp: Replace gdb_test with gdb_test_no_output. * gdb.cp/overload.exp: Ditto. * gdb.cp/virtfunc.exp: Ditto. * gdb.python/py-value.exp: Replace gdb_test with gdb_test_no_output. * gdb.reverse/watch-precsave.exp: Replace gdb_test with gdb_test_no_output. * gdb.threads/attach-into-signal.exp: Replace gdb_test with gdb_test_no_output. * gdb.threads/local-watch-wrong-thread.exp: Ditto. * gdb.threads/watchthreads.exp: Ditto. * gdb.threads/watchthreads2.exp: Ditto. * gdb.trace/deltrace.exp: Replace gdb_test with gdb_test_no_output. * gdb.trace/tfind.exp: Ditto. --- gdb/testsuite/gdb.base/commands.exp | 2 +- gdb/testsuite/gdb.base/display.exp | 2 +- gdb/testsuite/gdb.base/find.exp | 20 ++++++++++---------- gdb/testsuite/gdb.base/ifelse.exp | 2 +- gdb/testsuite/gdb.base/multi-forks.exp | 2 +- gdb/testsuite/gdb.base/recurse.exp | 2 +- gdb/testsuite/gdb.base/setshow.exp | 2 +- gdb/testsuite/gdb.base/value-double-free.exp | 2 +- gdb/testsuite/gdb.base/watch-vfork.exp | 2 +- gdb/testsuite/gdb.base/watch_thread_num.exp | 2 +- gdb/testsuite/gdb.base/watchpoint-solib.exp | 2 +- gdb/testsuite/gdb.base/watchpoint.exp | 2 +- gdb/testsuite/gdb.base/watchpoints.exp | 4 ++-- 13 files changed, 23 insertions(+), 23 deletions(-) (limited to 'gdb/testsuite/gdb.base') diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index e4f648e..1619125 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -260,7 +260,7 @@ proc watchpoint_command_test {} { # Disable hardware watchpoints if necessary. if [target_info exists gdb,no_hardware_watchpoints] { - gdb_test "set can-use-hw-watchpoints 0" "" "" + gdb_test_no_output "set can-use-hw-watchpoints 0" "" } gdb_test_no_output "set args 6" "set args in watchpoint_command_test" diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp index 4c4e897..0bcef3c 100644 --- a/gdb/testsuite/gdb.base/display.exp +++ b/gdb/testsuite/gdb.base/display.exp @@ -75,7 +75,7 @@ if ![runto_main] then { # Disable hardware watchpoints if necessary. if [target_info exists gdb,no_hardware_watchpoints] { - gdb_test "set can-use-hw-watchpoints 0" "" "" + gdb_test_no_output "set can-use-hw-watchpoints 0" "" } set bp_location1 [gdb_get_line_number "set breakpoint 1 here"] diff --git a/gdb/testsuite/gdb.base/find.exp b/gdb/testsuite/gdb.base/find.exp index 8956614..d37787c 100644 --- a/gdb/testsuite/gdb.base/find.exp +++ b/gdb/testsuite/gdb.base/find.exp @@ -61,7 +61,7 @@ set two_patterns_found "${newline}2 patterns found\[.\]" # Test string pattern. -gdb_test "set *(int32_t*) &int8_search_buf\[10\] = 0x61616161" "" "" +gdb_test_no_output "set *(int32_t*) &int8_search_buf\[10\] = 0x61616161" "" gdb_test "find &int8_search_buf\[0\], +sizeof(int8_search_buf), 'a', 'a', 'a'" \ "${hex_number}.*${newline}${hex_number}.*${two_patterns_found}" \ @@ -121,7 +121,7 @@ gdb_test "find /b &int8_search_buf\[0\], &int8_search_buf\[0\]+sizeof(int8_searc # Test 16-bit pattern. -gdb_test "set int16_search_buf\[10\] = 0x1234" "" "" +gdb_test_no_output "set int16_search_buf\[10\] = 0x1234" "" gdb_test "find /h &int16_search_buf\[0\], +sizeof(int16_search_buf), 0x1234" \ "${hex_number}.*${one_pattern_found}" \ @@ -133,7 +133,7 @@ gdb_test "find &int16_search_buf\[0\], +sizeof(int16_search_buf), (int16_t) 0x12 # Test 32-bit pattern. -gdb_test "set int32_search_buf\[10\] = 0x12345678" "" "" +gdb_test_no_output "set int32_search_buf\[10\] = 0x12345678" "" gdb_test "find &int32_search_buf\[0\], +sizeof(int32_search_buf), (int32_t) 0x12345678" \ "${hex_number}.*${one_pattern_found}" \ @@ -145,7 +145,7 @@ gdb_test "find /w &int32_search_buf\[0\], +sizeof(int32_search_buf), 0x12345678" # Test 64-bit pattern. -gdb_test "set int64_search_buf\[10\] = 0xfedcba9876543210LL" "" "" +gdb_test_no_output "set int64_search_buf\[10\] = 0xfedcba9876543210LL" "" gdb_test "find &int64_search_buf\[0\], +sizeof(int64_search_buf), (int64_t) 0xfedcba9876543210LL" \ "${hex_number}.*${one_pattern_found}" \ @@ -157,9 +157,9 @@ gdb_test "find /g &int64_search_buf\[0\], +sizeof(int64_search_buf), 0xfedcba987 # Test mixed-sized patterns. -gdb_test "set *(int8_t*) &search_buf\[10\] = 0x62" "" "" -gdb_test "set *(int16_t*) &search_buf\[11\] = 0x6363" "" "" -gdb_test "set *(int32_t*) &search_buf\[13\] = 0x64646464" "" "" +gdb_test_no_output "set *(int8_t*) &search_buf\[10\] = 0x62" "" +gdb_test_no_output "set *(int16_t*) &search_buf\[11\] = 0x6363" "" +gdb_test_no_output "set *(int32_t*) &search_buf\[13\] = 0x64646464" "" gdb_test "find &search_buf\[0\], +100, (int8_t) 0x62, (int16_t) 0x6363, (int32_t) 0x64646464" \ "${hex_number}${one_pattern_found}" \ @@ -171,8 +171,8 @@ gdb_test "find &search_buf\[0\], +100, (int8_t) 0x62, (int16_t) 0x6363, (int32_t set CHUNK_SIZE 16000 ;# see findcmd.c -gdb_test "set *(int32_t*) &search_buf\[0*${CHUNK_SIZE}+100\] = 0x12345678" "" "" -gdb_test "set *(int32_t*) &search_buf\[1*${CHUNK_SIZE}+100\] = 0x12345678" "" "" +gdb_test_no_output "set *(int32_t*) &search_buf\[0*${CHUNK_SIZE}+100\] = 0x12345678" "" +gdb_test_no_output "set *(int32_t*) &search_buf\[1*${CHUNK_SIZE}+100\] = 0x12345678" "" gdb_test "find /w search_buf, +search_buf_size, 0x12345678" \ "${hex_number}${newline}${hex_number}${two_patterns_found}" \ @@ -181,7 +181,7 @@ gdb_test "find /w search_buf, +search_buf_size, 0x12345678" \ # For native targets, test a pattern straddling a chunk boundary. if [isnative] { - gdb_test "set *(int32_t*) &search_buf\[${CHUNK_SIZE}-1\] = 0xfdb97531" "" "" + gdb_test_no_output "set *(int32_t*) &search_buf\[${CHUNK_SIZE}-1\] = 0xfdb97531" "" gdb_test "find /w search_buf, +search_buf_size, 0xfdb97531" \ "${hex_number}${one_pattern_found}" \ "find pattern straddling chunk boundary" diff --git a/gdb/testsuite/gdb.base/ifelse.exp b/gdb/testsuite/gdb.base/ifelse.exp index c456549..444ff5e 100644 --- a/gdb/testsuite/gdb.base/ifelse.exp +++ b/gdb/testsuite/gdb.base/ifelse.exp @@ -84,7 +84,7 @@ gdb_test_multiple "if 0\nelse\nend" $message { } } -gdb_test "set confirm off" "" "" +gdb_test_no_output "set confirm off" "" # Test that a define with an empty else can be replaced. # If there is memory corruption then free will fail. diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp index e188bd5..3313184 100644 --- a/gdb/testsuite/gdb.base/multi-forks.exp +++ b/gdb/testsuite/gdb.base/multi-forks.exp @@ -129,7 +129,7 @@ gdb_test "print pids" "\\$.* = \\{0, 0, 0, 0\\}.*" "follow child, print pids" # Result should be that none of the 4 forks returns zero. runto_main -gdb_test "set follow-fork parent" "" "" +gdb_test_no_output "set follow-fork parent" "" continue_to_exit_bp_loc gdb_test "print pids\[0\]==0 || pids\[1\]==0 || pids\[2\]==0 || pids\[3\]==0" \ diff --git a/gdb/testsuite/gdb.base/recurse.exp b/gdb/testsuite/gdb.base/recurse.exp index 9bd470f..c3d04f2 100644 --- a/gdb/testsuite/gdb.base/recurse.exp +++ b/gdb/testsuite/gdb.base/recurse.exp @@ -40,7 +40,7 @@ proc recurse_tests {} { # Disable hardware watchpoints if necessary. if [target_info exists gdb,no_hardware_watchpoints] { - gdb_test "set can-use-hw-watchpoints 0" "" "" + gdb_test_no_output "set can-use-hw-watchpoints 0" "" } if [runto recurse] then { diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp index 9ff6215..deddcd2 100644 --- a/gdb/testsuite/gdb.base/setshow.exp +++ b/gdb/testsuite/gdb.base/setshow.exp @@ -154,7 +154,7 @@ gdb_test_no_output "set height 100" "set height 100" #test show height 100 gdb_test "show height" "Number of lines gdb thinks are in a page is 100..*" "show height" # back to infinite height to avoid pagers -gdb_test "set height 0" "" "" +gdb_test_no_output "set height 0" "" #test set history expansion on gdb_test_no_output "set history expansion on" "set history expansion on" #test show history expansion on diff --git a/gdb/testsuite/gdb.base/value-double-free.exp b/gdb/testsuite/gdb.base/value-double-free.exp index 08ee68e..4c23ca8 100644 --- a/gdb/testsuite/gdb.base/value-double-free.exp +++ b/gdb/testsuite/gdb.base/value-double-free.exp @@ -34,7 +34,7 @@ if ![runto_main] { # Disable hardware watchpoints if necessary. if [target_info exists gdb,no_hardware_watchpoints] { - gdb_test "set can-use-hw-watchpoints 0" "" "" + gdb_test_no_output "set can-use-hw-watchpoints 0" "" } gdb_test "watch var" "atchpoint \[0-9\]+: var" diff --git a/gdb/testsuite/gdb.base/watch-vfork.exp b/gdb/testsuite/gdb.base/watch-vfork.exp index 8e93179..0f01283 100644 --- a/gdb/testsuite/gdb.base/watch-vfork.exp +++ b/gdb/testsuite/gdb.base/watch-vfork.exp @@ -33,7 +33,7 @@ proc test_watchpoint_across_vfork { hw teststr } { } if { ! $hw } { - gdb_test "set can-use-hw-watchpoints 0" "" "" + gdb_test_no_output "set can-use-hw-watchpoints 0" "" } gdb_test "watch global" \ diff --git a/gdb/testsuite/gdb.base/watch_thread_num.exp b/gdb/testsuite/gdb.base/watch_thread_num.exp index f22626c..7b77c0d 100644 --- a/gdb/testsuite/gdb.base/watch_thread_num.exp +++ b/gdb/testsuite/gdb.base/watch_thread_num.exp @@ -49,7 +49,7 @@ if { ![runto main] } then { # Disable hardware watchpoints if necessary. if [target_info exists gdb,no_hardware_watchpoints] { - gdb_test "set can-use-hw-watchpoints 0" "" "" + gdb_test_no_output "set can-use-hw-watchpoints 0" "" } gdb_test "watch shared_var thread 0" "Unknown thread 0\." "Watchpoint on invalid thread" diff --git a/gdb/testsuite/gdb.base/watchpoint-solib.exp b/gdb/testsuite/gdb.base/watchpoint-solib.exp index 274b577..7199a60 100644 --- a/gdb/testsuite/gdb.base/watchpoint-solib.exp +++ b/gdb/testsuite/gdb.base/watchpoint-solib.exp @@ -66,7 +66,7 @@ runto_main # Disable hardware watchpoints if necessary. if [target_info exists gdb,no_hardware_watchpoints] { - gdb_test "set can-use-hw-watchpoints 0" "" "" + gdb_test_no_output "set can-use-hw-watchpoints 0" "" } # Test that if we set a watchpoint on a global variable diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index 5fa43e3..56d82e4 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -61,7 +61,7 @@ proc initialize {} { # Disable hardware watchpoints if necessary. if [target_info exists gdb,no_hardware_watchpoints] { - gdb_test "set can-use-hw-watchpoints 0" "" "" + gdb_test_no_output "set can-use-hw-watchpoints 0" "" } if [gdb_test "break marker1" "Breakpoint 1 at $hex: file .*$srcfile, line $decimal.*" "set breakpoint at marker1" ] { diff --git a/gdb/testsuite/gdb.base/watchpoints.exp b/gdb/testsuite/gdb.base/watchpoints.exp index 1505be5..a8ff3ed 100644 --- a/gdb/testsuite/gdb.base/watchpoints.exp +++ b/gdb/testsuite/gdb.base/watchpoints.exp @@ -44,7 +44,7 @@ gdb_load $binfile # Disable hardware watchpoints if necessary. if [target_info exists gdb,no_hardware_watchpoints] { - gdb_test "set can-use-hw-watchpoints 0" "" "" + gdb_test_no_output "set can-use-hw-watchpoints 0" "" } runto_main @@ -79,7 +79,7 @@ gdb_load $binfile # Check that the hit count is reported correctly gdb_test "info break" ".*watchpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+ival1\r\n\[ \t]+breakpoint already hit 3 times.*" "Watchpoint ival1 hit count is 3" # Disable ival1 watchpoint - gdb_test "disable 2" "" "" + gdb_test_no_output "disable 2" "" # Continue until the next change, from 1 to 2. gdb_test "cont" "Continuing.*\[Ww\]atchpoint.*ival3.*Old value = 1.*New value = 2.*ival3 = count; ival4 = count;.*" "watchpoint hit, third time" -- cgit v1.1