From: Michael Snyder Date: Thu, 3 Jun 2010 23:54:18 +0000 (+0000) Subject: 2010-06-03 Michael Snyder X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=35ec993ff8a5cddce8476d353b35fe18b605e99d;p=binutils-gdb.git 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. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 9d827b07ea0..255b3f115c7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,37 @@ +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. + 2010-06-03 Joel Brobecker * lib/gdb.exp (gdb_test_no_output): Do not emit pass for diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index e4f648e191d..1619125f784 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 4c4e8976c96..0bcef3c9db9 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 89566149fb1..d37787c4ced 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 c456549e4d2..444ff5ef28e 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 e188bd56162..3313184372b 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 9bd470fac0f..c3d04f289a4 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 9ff62158f31..deddcd2829c 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 08ee68e34af..4c23ca835e7 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 8e93179d30b..0f01283c512 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 f22626c95f6..7b77c0d9404 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 274b577e165..7199a60bf67 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 5fa43e3f295..56d82e4db3f 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 1505be53ea7..a8ff3edb6b4 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" diff --git a/gdb/testsuite/gdb.cp/classes.exp b/gdb/testsuite/gdb.cp/classes.exp index 7591adaa350..49774e396e1 100644 --- a/gdb/testsuite/gdb.cp/classes.exp +++ b/gdb/testsuite/gdb.cp/classes.exp @@ -522,7 +522,7 @@ proc test_static_members {} { global hex gdb_test "print Foo::st" "\\$\[0-9\]+ = 100" - gdb_test "set foo.st = 200" "" "" + gdb_test_no_output "set foo.st = 200" "" gdb_test "print bar.st" "\\$\[0-9\]+ = 200" gdb_test "print &foo.st" "\\$\[0-9\]+ = \\(int ?\\*\\) $hex" gdb_test "print &Bar::st" "\\$\[0-9\]+ = \\(int ?\\*\\) $hex" @@ -561,8 +561,8 @@ proc do_tests {} { gdb_reinitialize_dir $srcdir/$subdir gdb_load $binfile - gdb_test "set language c++" "" "" - gdb_test "set width 0" "" "" + gdb_test_no_output "set language c++" "" + gdb_test_no_output "set width 0" "" if ![runto_main ] then { perror "couldn't run to breakpoint" diff --git a/gdb/testsuite/gdb.cp/overload.exp b/gdb/testsuite/gdb.cp/overload.exp index bcee0e8c5f7..f05cc231714 100644 --- a/gdb/testsuite/gdb.cp/overload.exp +++ b/gdb/testsuite/gdb.cp/overload.exp @@ -263,7 +263,7 @@ gdb_test "print foo_instance1.overload1arg((double)arg12)" \ # The void case is tricky because some compilers say "(void)" # and some compilers say "()". -gdb_test "set listsize 1" "" "" +gdb_test_no_output "set listsize 1" "" gdb_test_multiple "info func overloadfnarg" "list overloaded function with no args" { -re ".*overloadfnarg\\(void\\).*$gdb_prompt $" { # gcc 2 diff --git a/gdb/testsuite/gdb.cp/virtfunc.exp b/gdb/testsuite/gdb.cp/virtfunc.exp index 009e1ca03ab..6e61ec1e690 100644 --- a/gdb/testsuite/gdb.cp/virtfunc.exp +++ b/gdb/testsuite/gdb.cp/virtfunc.exp @@ -240,8 +240,8 @@ proc do_tests {} { gdb_reinitialize_dir $srcdir/$subdir gdb_load $binfile - gdb_test "set language c++" "" "" - gdb_test "set width 0" "" "" + gdb_test_no_output "set language c++" "" + gdb_test_no_output "set width 0" "" if ![runto_main] then { perror "couldn't run to breakpoint" diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp index 973ee5c726c..4ae42adcddd 100644 --- a/gdb/testsuite/gdb.python/py-value.exp +++ b/gdb/testsuite/gdb.python/py-value.exp @@ -123,9 +123,9 @@ proc test_value_numeric_ops {} { # First, obtain the pointers gdb_test "print (void *) 2" "" "" - gdb_test "python a = gdb.history (0)" "" "" + gdb_test_no_output "python a = gdb.history (0)" "" gdb_test "print (void *) 5" "" "" - gdb_test "python b = gdb.history (0)" "" "" + gdb_test_no_output "python b = gdb.history (0)" "" gdb_test "python print 'result = ' + str(a+5)" " = 0x7" "add pointer value with python integer" gdb_test "python print 'result = ' + str(b-2)" " = 0x3" "subtract python integer from pointer value" diff --git a/gdb/testsuite/gdb.reverse/watch-precsave.exp b/gdb/testsuite/gdb.reverse/watch-precsave.exp index 9676c986095..2f48e8ea6ce 100644 --- a/gdb/testsuite/gdb.reverse/watch-precsave.exp +++ b/gdb/testsuite/gdb.reverse/watch-precsave.exp @@ -56,7 +56,7 @@ gdb_test "record restore watch.precsave" \ "reload core file" # Only software watchpoints can be used in reverse -gdb_test "set can-use-hw-watchpoints 0" "" "" +gdb_test_no_output "set can-use-hw-watchpoints 0" "" gdb_test "break marker1" \ "Breakpoint $decimal at $hex: file .*$srcfile, line $decimal.*" \ diff --git a/gdb/testsuite/gdb.threads/attach-into-signal.exp b/gdb/testsuite/gdb.threads/attach-into-signal.exp index 3266c386779..167c08acee2 100644 --- a/gdb/testsuite/gdb.threads/attach-into-signal.exp +++ b/gdb/testsuite/gdb.threads/attach-into-signal.exp @@ -150,7 +150,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "set debug lin-lwp 1" "" "" +gdb_test_no_output "set debug lin-lwp 1" "" corefunc nonthreaded @@ -164,6 +164,6 @@ if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" execut gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "set debug lin-lwp 1" "" "" +gdb_test_no_output "set debug lin-lwp 1" "" corefunc threaded diff --git a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp index e327fcf9ed0..af9fdc1bcda 100644 --- a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp +++ b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp @@ -37,7 +37,7 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "set can-use-hw-watchpoints 1" "" "" +gdb_test_no_output "set can-use-hw-watchpoints 1" "" if ![runto_main] then { fail "Can't run to main" @@ -93,7 +93,7 @@ gdb_test "continue" \ "the other thread stopped on breakpoint" # Delete the new breakpoint, we don't need it anymore. -gdb_test "delete 5" "" "" +gdb_test_no_output "delete 5" "" # Check if the local watchpoint hasn't been deleted (is still listed). # This is simpler to check than expecting 'the program has left ...', diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb.threads/watchthreads.exp index 0ab78393048..1380d3a8028 100644 --- a/gdb/testsuite/gdb.threads/watchthreads.exp +++ b/gdb/testsuite/gdb.threads/watchthreads.exp @@ -44,7 +44,7 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "set can-use-hw-watchpoints 1" "" "" +gdb_test_no_output "set can-use-hw-watchpoints 1" "" # # Run to `main' where we begin our tests. diff --git a/gdb/testsuite/gdb.threads/watchthreads2.exp b/gdb/testsuite/gdb.threads/watchthreads2.exp index 07b091f27e4..18395e7d47f 100644 --- a/gdb/testsuite/gdb.threads/watchthreads2.exp +++ b/gdb/testsuite/gdb.threads/watchthreads2.exp @@ -44,7 +44,7 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "set can-use-hw-watchpoints 1" "" "" +gdb_test_no_output "set can-use-hw-watchpoints 1" "" # # Run to `main' where we begin our tests. diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp index 21fa2541317..ec874629fca 100644 --- a/gdb/testsuite/gdb.trace/deltrace.exp +++ b/gdb/testsuite/gdb.trace/deltrace.exp @@ -91,7 +91,7 @@ gdb_test "info tracepoints" \ \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ "3.2a: set three tracepoints" -#gdb_test "delete tracepoint $trcpt1" "" "" +#gdb_test_no_output "delete tracepoint $trcpt1" "" gdb_test_multiple "delete tracepoint $trcpt1" "3.2b: delete first tracepoint" { -re "No tracepoint number.*$gdb_prompt $" { fail "3.2b: delete first tracepoint" @@ -110,7 +110,7 @@ gdb_test "info tracepoints" \ \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ "3.2c: verify delete first tracepoint" -#gdb_test "delete tracepoint $trcpt2" "" "" +#gdb_test_no_output "delete tracepoint $trcpt2" "" gdb_test_multiple "delete tracepoint $trcpt2" "3.2d: delete second tracepoint" { -re "No tracepoint number.*$gdb_prompt $" { fail "3.2d: delete second tracepoint" @@ -128,7 +128,7 @@ gdb_test "info tracepoints" \ \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ "3.2e: verify delete second tracepoint" -#gdb_test "delete tracepoint $trcpt3" "" "" +#gdb_test_no_output "delete tracepoint $trcpt3" "" gdb_test_multiple "delete tracepoint $trcpt3" "3.2f: delete third tracepoint" { -re "No tracepoint number.*$gdb_prompt $" { fail "3.2f: delete third tracepoint" @@ -163,7 +163,7 @@ gdb_test "info tracepoints" \ \[0-9\]+\[\t \]+tracepoint keep y.* in gdb_recursion_test at .*$srcfile:\[0-9\]+" \ "3.3a: set three tracepoints" -#gdb_test "delete tracepoint $trcpt1 $trcpt2 $trcpt3" "" "" +#gdb_test_no_output "delete tracepoint $trcpt1 $trcpt2 $trcpt3" "" gdb_test_multiple "delete tracepoint $trcpt1 $trcpt2 $trcpt3" \ "3.3b: delete three tracepoints" { -re "No tracepoint number.*$gdb_prompt $" { diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp index 04e670f53ae..e4488501142 100644 --- a/gdb/testsuite/gdb.trace/tfind.exp +++ b/gdb/testsuite/gdb.trace/tfind.exp @@ -245,7 +245,7 @@ gdb_test "tfind tracepoint -1" "failed to find.*" \ "8.25: tfind tracepoint rejects nonexistant tracepoint (-1)" # 8.37 tfind tracepoint n where n no longer exists (but used to) -gdb_test "delete trace $tdp2" "" "" +gdb_test_no_output "delete trace $tdp2" "" gdb_tfind_test "8.37: tfind none" "none" "-1"; gdb_tfind_test "8.37: tfind deleted tracepoint" \ "tracepoint $tdp2" \ @@ -261,7 +261,7 @@ gdb_tfind_test "8.13: tracepoint $tdp1" "tracepoint $tdp1" \ "\$tracepoint" "$tdp1"; gdb_test "print \$trace_line" "$baseline" \ "8.13: tfind tracepoint $tdp1 (line $baseline)" -gdb_test "set \$save_frame = \$trace_frame" "" "" +gdb_test_no_output "set \$save_frame = \$trace_frame" "" gdb_tfind_test "8.13: tracepoint " "tracepoint" \ "\$tracepoint" "$tdp1"; gdb_test "printf \"x \%d x\\n\", \$trace_frame == \$save_frame" \ @@ -284,7 +284,7 @@ gdb_tfind_test "8.14: tfind 3" "3" "3" gdb_test "print \$trace_line" "$testline4" \ "8.14: tfind 3 (line $testline4)" -gdb_test "set \$test_pc = \$pc" "" "" +gdb_test_no_output "set \$test_pc = \$pc" "" gdb_tfind_test "8.14: tfind none" "none" "-1" gdb_tfind_test "8.14: tfind pc" "pc \$test_pc" "\$trace_frame != -1" "1"; gdb_test "print \$trace_line" "$testline4" \ @@ -298,7 +298,7 @@ gdb_test "printf \"x \%d x\\n\", \$pc == \$test_pc" \ gdb_tfind_test "8.15: tfind 3" "3" "3" gdb_test "print \$trace_line" "$testline4" \ "8.15: tfind 3 (line $testline4)" -gdb_test "set \$test_pc = \$pc" "" "" +gdb_test_no_output "set \$test_pc = \$pc" "" gdb_tfind_test "8.15: tfind pc" "pc" "\$pc == \$test_pc" "1" gdb_test "print \$trace_line" "$testline4" \ "8.15: tfind pc (line $testline4)"