From 0ac85db529d1077551b92c6da66044eff672c315 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 22 Jan 2021 15:42:35 -0500 Subject: gdb/testsuite: eliminate gdb_suppress_tests mechanism There is a lot of support code for the test suppression mechanism. But as far as I know, it is not useful. The gdb_suppress_tests proc is in fact disabled with this comment that has been there since forever: return; # fnf - disable pending review of results where # testsuite ran better without this I suggest to just remove everything related to test suppression, that removes some unnecessary complexity from the support code and the tests. gdb/testsuite/ChangeLog: * lib/gdb.exp (gdb_test_multiple): Remove things related to test suppression. (default_gdb_exit): Likewise. (default_gdb_spawn): Likewise. (send_gdb): Likewise. (gdb_expect): Likewise. (gdb_expect_list): Likewise. (default_gdb_init): Likewise. (gdb_suppress_entire_file): Remove. (gdb_suppress_tests): Remove. (gdb_stop_suppressing_tests): Remove. (gdb_clear_suppressed): Remove. * lib/mi-support.exp (mi_uncatched_gdb_exit): Remove things related to test suppression. (default_mi_gdb_start): Likewise. (mi_gdb_reinitialize_dir): Likewise. (mi_gdb_test): Likewise. (mi_run_cmd_full): Likewise. (mi_runto_helper): Likewise. (mi_execute_to): Likewise. * lib/prompt.exp (default_prompt_gdb_start): Likewise. * gdb.base/bitfields.exp: Likewise. * gdb.base/bitfields2.exp: Likewise. * gdb.base/break.exp: Likewise. * gdb.base/call-sc.exp: Likewise. * gdb.base/callfuncs.exp: Likewise. * gdb.base/dfp-test.exp: Likewise. * gdb.base/endian.exp: Likewise. * gdb.base/exprs.exp: Likewise. * gdb.base/funcargs.exp: Likewise. * gdb.base/hbreak2.exp: Likewise. * gdb.base/recurse.exp: Likewise. * gdb.base/scope.exp: Likewise. * gdb.base/sepdebug.exp: Likewise. * gdb.base/structs.exp: Likewise. * gdb.base/until.exp: Likewise. * gdb.cp/misc.exp: Likewise. Change-Id: Ie6d3025091691ba72010faa28b85ebd417b738f7 --- gdb/testsuite/gdb.base/scope.exp | 284 ++++++++------------------------------- 1 file changed, 56 insertions(+), 228 deletions(-) (limited to 'gdb/testsuite/gdb.base/scope.exp') diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp index 6f290e4..edf9811 100644 --- a/gdb/testsuite/gdb.base/scope.exp +++ b/gdb/testsuite/gdb.base/scope.exp @@ -48,107 +48,51 @@ proc test_at_main {} { gdb_test "next" "$decimal.*foo \\(\\);" "next over init0() in main" # Print scope0.c::filelocal, which is 1 - - if [gdb_test "print filelocal" "\\\$$decimal = 1"] { - gdb_suppress_tests - } - - - if [gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at main" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal"] { - gdb_suppress_tests - } - + gdb_test "print filelocal" "\\\$$decimal = 1" + gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at main" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal" # Print scope0.c::filelocal_bss, which is 101 - - if [gdb_test "print filelocal_bss" "\\\$$decimal = 101"] { - gdb_suppress_tests - } - - - if [gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_main" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss"] { - gdb_suppress_tests - } - + gdb_test "print filelocal_bss" "\\\$$decimal = 101" + gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_main" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss" # Print scope0.c::filelocal_ro, which is 201 # No clue why the rs6000 fails this test. if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print filelocal_ro" "\\\$$decimal = 201" "print filelocal_ro in test_at_main" ] { - gdb_suppress_tests - } - + gdb_test "print filelocal_ro" "\\\$$decimal = 201" "print filelocal_ro in test_at_main" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro"] { - gdb_suppress_tests - } - + gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro" # Print scope1.c::filelocal, which is 2 - if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal"] { - gdb_suppress_tests - } - + gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal" # Print scope1.c::filelocal_bss, which is 102 - if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_bss"] { - gdb_suppress_tests - } - + gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_bss" # Print scope1.c::filelocal_ro, which is 202 - if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro"] { - gdb_suppress_tests - } - + gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro" # Print scope1.c::foo::funclocal, which is 3 - - if [gdb_test "print foo::funclocal" "\\\$$decimal = 3"] { - gdb_suppress_tests - } - + gdb_test "print foo::funclocal" "\\\$$decimal = 3" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal"] { - gdb_suppress_tests - } - + gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal" # Print scope1.c::foo::funclocal_ro, which is 203 - - if [gdb_test "print foo::funclocal_ro" "\\\$$decimal = 203"] { - gdb_suppress_tests - } - + gdb_test "print foo::funclocal_ro" "\\\$$decimal = 203" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_ro"] { - gdb_suppress_tests - } - + gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_ro" # Print scope1.c::bar::funclocal, which is 4 - - if [gdb_test "print bar::funclocal" "\\\$$decimal = 4"] { - gdb_suppress_tests - } - + gdb_test "print bar::funclocal" "\\\$$decimal = 4" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal"] { - gdb_suppress_tests - } - gdb_stop_suppressing_tests - + gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal" } proc test_at_foo {} { @@ -158,42 +102,24 @@ proc test_at_foo {} { global srcdir global subdir - if [gdb_test "next" ".*bar \\(\\);" "" ] { - gdb_suppress_tests - } - + gdb_test "next" ".*bar \\(\\);" # Print scope0.c::filelocal, which is 1 - - if [gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at foo" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal"] { - gdb_suppress_tests - } - + gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at foo" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal" # Print scope0.c::filelocal_bss, which is 101 - - if [gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_foo" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss"] { - gdb_suppress_tests - } - + gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_foo" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss" # Print scope0.c::filelocal_ro, which is 201 - if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro"] { - gdb_suppress_tests - } + gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro" - gdb_test "print filelocal" "\\\$$decimal = 2" "print filelocal at foo" - # Print scope1.c::filelocal, which is 2 + gdb_test "print filelocal" "\\\$$decimal = 2" "print filelocal at foo" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal"] { - gdb_suppress_tests - } - + gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal" gdb_test "print filelocal_bss" "\\\$$decimal = 102" \ "print filelocal_bss at foo" @@ -251,7 +177,6 @@ proc test_at_foo {} { if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal" - gdb_stop_suppressing_tests } @@ -262,147 +187,67 @@ proc test_at_bar {} { global srcdir global subdir - if [gdb_test "next" ".*" "" ] { - gdb_suppress_tests - } - + gdb_test "next" # Print scope0.c::filelocal, which is 1 + gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at bar" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal" - if [gdb_test "print 'scope0.c'::filelocal" "\\\$$decimal = 1" "print 'scope0.c'::filelocal at bar" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal"] { - gdb_suppress_tests - } - - - # Print scope0.c::filelocal_bss, which is 101 - - if [gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_bar" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss"] { - gdb_suppress_tests - } - - - # Print scope0.c::filelocal_ro, which is 201 + # Print scope0.c::filelocal_bss, which is 101 + gdb_test "print 'scope0.c'::filelocal_bss" "\\\$$decimal = 101" "print 'scope0.c'::filelocal_bss in test_at_bar" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_bss" + # Print scope0.c::filelocal_ro, which is 201 if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro at bar" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro"] { - gdb_suppress_tests - } - + gdb_test "print 'scope0.c'::filelocal_ro" "\\\$$decimal = 201" "print 'scope0.c'::filelocal_ro at bar" "No symbol \"scope0.c\" in current context.*" "print '$srcdir/$subdir/scope0.c'::filelocal_ro" # Print scope1.c::filelocal, which is 2 - - if [gdb_test "print filelocal" "\\\$$decimal = 2" "print filelocal at bar" ] { - gdb_suppress_tests - } - + gdb_test "print filelocal" "\\\$$decimal = 2" "print filelocal at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal"] { - gdb_suppress_tests - } - + gdb_test "print 'scope1.c'::filelocal" "\\\$$decimal = 2" "print 'scope1.c'::filelocal at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal" # Print scope1.c::filelocal_bss, which is 102 - - if [gdb_test "print filelocal_bss" "\\\$$decimal = 102" "print filelocal_bss at bar" ] { - gdb_suppress_tests - } - + gdb_test "print filelocal_bss" "\\\$$decimal = 102" "print filelocal_bss at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_bss"] { - gdb_suppress_tests - } - + gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_bss" # Print scope1.c::filelocal_ro, which is 202 - - if [gdb_test "print filelocal_ro" "\\\$$decimal = 202" "print filelocal_ro in test_at_bar" ] { - gdb_suppress_tests - } - + gdb_test "print filelocal_ro" "\\\$$decimal = 202" "print filelocal_ro in test_at_bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro"] { - gdb_suppress_tests - } - + gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro" # Print scope1.c::foo::funclocal, which is 3 - - if [gdb_test "print foo::funclocal" "\\\$$decimal = 3" "print foo::funclocal at bar" ] { - gdb_suppress_tests - } - + gdb_test "print foo::funclocal" "\\\$$decimal = 3" "print foo::funclocal at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal"] { - gdb_suppress_tests - } - + gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal" # Print scope1.c::foo::funclocal_bss, which is 103 - - if [gdb_test "print foo::funclocal_bss" "\\\$$decimal = 103" "print foo::funclocal_bss at bar" ] { - gdb_suppress_tests - } - + gdb_test "print foo::funclocal_bss" "\\\$$decimal = 103" "print foo::funclocal_bss at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::foo::funclocal_bss" "\\\$$decimal = 103" "print 'scope1.c'::foo::funclocal_bss at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_bss"] { - gdb_suppress_tests - } - + gdb_test "print 'scope1.c'::foo::funclocal_bss" "\\\$$decimal = 103" "print 'scope1.c'::foo::funclocal_bss at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_bss" # Print scope1.c::foo::funclocal_ro, which is 203 - - if [gdb_test "print foo::funclocal_ro" "\\\$$decimal = 203" "print foo::funclocal_ro at bar" ] { - gdb_suppress_tests - } - + gdb_test "print foo::funclocal_ro" "\\\$$decimal = 203" "print foo::funclocal_ro at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_ro"] { - gdb_suppress_tests - } - + gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_ro" # Print scope1.c::bar::funclocal, which is 4 - - if [gdb_test "print funclocal" "\\\$$decimal = 4" "print funclocal at bar" ] { - gdb_suppress_tests - } - - - if [gdb_test "print bar::funclocal" "\\\$$decimal = 4" "print bar::funclocal at bar" ] { - gdb_suppress_tests - } - + gdb_test "print funclocal" "\\\$$decimal = 4" "print funclocal at bar" + gdb_test "print bar::funclocal" "\\\$$decimal = 4" "print bar::funclocal at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal"] { - gdb_suppress_tests - } - + gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal" # Print scope1.c::bar::funclocal_bss, which is 104 - - if [gdb_test "print funclocal_bss" "\\\$$decimal = 104" "print funclocal_bss at bar" ] { - gdb_suppress_tests - } - - - if [gdb_test "print bar::funclocal_bss" "\\\$$decimal = 104" "print bar::funclocal_bss at bar" ] { - gdb_suppress_tests - } - + gdb_test "print funclocal_bss" "\\\$$decimal = 104" "print funclocal_bss at bar" + gdb_test "print bar::funclocal_bss" "\\\$$decimal = 104" "print bar::funclocal_bss at bar" if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" } - if [gdb_test "print 'scope1.c'::bar::funclocal_bss" "\\\$$decimal = 104" "print 'scope1.c'::bar::funclocal_bss at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal_bss"] { - gdb_suppress_tests - } - gdb_stop_suppressing_tests - + gdb_test "print 'scope1.c'::bar::funclocal_bss" "\\\$$decimal = 104" "print 'scope1.c'::bar::funclocal_bss at bar" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal_bss" } # This test has little to do with local scopes, but it is in scope.exp anyway. @@ -418,20 +263,12 @@ proc test_at_autovars {} { gdb_breakpoint marker1 - if [gdb_test "cont" "Break.* marker1 \\(\\) at .*:$decimal.*" "continue to marker1"] { - gdb_suppress_tests - } - - if [gdb_test "up" ".*autovars.*" "up from marker1 in scope.exp" ] { - gdb_suppress_tests - } + gdb_test "cont" "Break.* marker1 \\(\\) at .*:$decimal.*" "continue to marker1" + gdb_test "up" ".*autovars.*" "up from marker1 in scope.exp" set count 0 while {$count < 100} { - if [gdb_test "print i$count" ".* = $count" "" ] { - gdb_suppress_tests - } - + gdb_test "print i$count" ".* = $count" "" set count [expr $count+1] } clear_xfail "*-*-*" @@ -451,12 +288,8 @@ proc test_at_localscopes {} { gdb_breakpoint marker3 gdb_breakpoint marker4 - if [gdb_test "cont" "Break.* marker2 \\(\\) at .*:$decimal.*" "continue to marker2"] { - gdb_suppress_tests - } - if [gdb_test "up" ".*localscopes.*" "up from marker2 in scopes.exp" ] { - gdb_suppress_tests - } + gdb_test "cont" "Break.* marker2 \\(\\) at .*:$decimal.*" "continue to marker2" + gdb_test "up" ".*localscopes.*" "up from marker2 in scopes.exp" # Should be at first (outermost) scope. Check values. @@ -467,11 +300,9 @@ proc test_at_localscopes {} { gdb_test "print localval3" "No symbol \"localval3\" in current context." \ "print localval3, outer scope" - if [gdb_test "cont" "Break.* marker3 \\(\\) at .*:$decimal.*" \ - "continue to marker3 in scope.exp"] then { gdb_suppress_tests } - if [gdb_test "up" ".*localscopes.*" "up from marker3 in scope.exp"] { - gdb_suppress_tests - } + gdb_test "cont" "Break.* marker3 \\(\\) at .*:$decimal.*" \ + "continue to marker3 in scope.exp" + gdb_test "up" ".*localscopes.*" "up from marker3 in scope.exp" # Should be at next (first nested) scope. Check values. @@ -484,17 +315,14 @@ proc test_at_localscopes {} { # This test will only fail if the file was compiled by gcc, but # there's no way to check that. - if [gdb_test "cont" "Break.* marker4.*at .*:$decimal.*" \ - "continue to marker4 in scope.exp"] then { gdb_suppress_tests } - if [gdb_test "up" ".*localscopes.*" "up from marker4 in scope.exp"] { - gdb_suppress_tests - } + gdb_test "cont" "Break.* marker4.*at .*:$decimal.*" \ + "continue to marker4 in scope.exp" + gdb_test "up" ".*localscopes.*" "up from marker4 in scope.exp" gdb_test "print localval" " = 30" "print localval, innermost scope" gdb_test "print localval1" " = 11" "print localval1, innermost scope" gdb_test "print localval2" " = 12" "print localval2, innermost scope" gdb_test "print localval3" " = 13" "print localval3, innermost scope" - gdb_stop_suppressing_tests } # Note, we don't pass a binfile to clean_restart because we need to -- cgit v1.1