2003-12-05 Michael Chastain <mec.gnu@mindspring.com>
Partial fix for PR testsuite/1456. * gdb.base/scope.exp (test_at_main): Replace references to gcc_compiled with calls to test_compiler_info. (test_at_foo): Likewise. (test_at_bar): Likewise.
This commit is contained in:
Michael Chastain
parent
09d92015d3
commit
ba9b20a7b1
|
|
@ -1,3 +1,11 @@
|
|||
2003-12-05 Michael Chastain <mec.gnu@mindspring.com>
|
||||
|
||||
Partial fix for PR testsuite/1456.
|
||||
* gdb.base/scope.exp (test_at_main): Replace references to
|
||||
gcc_compiled with calls to test_compiler_info.
|
||||
(test_at_foo): Likewise.
|
||||
(test_at_bar): Likewise.
|
||||
|
||||
2003-12-04 Michael Chastain <mec.gnu@mindspring.com>
|
||||
|
||||
Partial fix for PR testsuite/1456.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002 Free
|
||||
# Software Foundation, Inc.
|
||||
# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003
|
||||
# Free Software Foundation, Inc.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -59,7 +59,6 @@ proc test_at_main {} {
|
|||
global det_file
|
||||
global srcdir
|
||||
global subdir
|
||||
global gcc_compiled
|
||||
global hp_cc_compiler
|
||||
|
||||
# skip past init. There may be a call to __main at the start of
|
||||
|
|
@ -97,13 +96,13 @@ proc test_at_main {} {
|
|||
|
||||
# No clue why the powerpc fails this test.
|
||||
setup_xfail "powerpc-*-*"
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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 ;
|
||||
}
|
||||
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
|
||||
setup_xfail "powerpc-*-*"
|
||||
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 ;
|
||||
|
|
@ -112,7 +111,7 @@ proc test_at_main {} {
|
|||
|
||||
# Print scope1.c::filelocal, which is 2
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
|
||||
if {$hp_cc_compiler} then { setup_xfail "hppa2.0w-*-*" 11747CLLbs}
|
||||
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 ;
|
||||
|
|
@ -121,7 +120,7 @@ proc test_at_main {} {
|
|||
|
||||
# Print scope1.c::filelocal_bss, which is 102
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
|
||||
if {$hp_cc_compiler} then { setup_xfail "hppa2.0w-*-*" 11747CLLbs}
|
||||
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 ;
|
||||
|
|
@ -130,7 +129,7 @@ proc test_at_main {} {
|
|||
|
||||
# Print scope1.c::filelocal_ro, which is 202
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
|
||||
if {$hp_cc_compiler} then { setup_xfail "hppa2.0w-*-*" 11747CLLbs}
|
||||
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 ;
|
||||
|
|
@ -144,7 +143,7 @@ proc test_at_main {} {
|
|||
}
|
||||
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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 ;
|
||||
}
|
||||
|
|
@ -157,7 +156,7 @@ proc test_at_main {} {
|
|||
}
|
||||
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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 ;
|
||||
}
|
||||
|
|
@ -170,7 +169,7 @@ proc test_at_main {} {
|
|||
}
|
||||
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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 ;
|
||||
}
|
||||
|
|
@ -184,7 +183,6 @@ proc test_at_foo {} {
|
|||
global det_file
|
||||
global srcdir
|
||||
global subdir
|
||||
global gcc_compiled
|
||||
|
||||
if [gdb_test "next" ".*bar \\(\\);" "" ] {
|
||||
gdb_suppress_tests ;
|
||||
|
|
@ -207,7 +205,7 @@ proc test_at_foo {} {
|
|||
|
||||
# Print scope0.c::filelocal_ro, which is 201
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
|
||||
setup_xfail "powerpc-*-*"
|
||||
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 ;
|
||||
|
|
@ -218,7 +216,7 @@ proc test_at_foo {} {
|
|||
|
||||
# Print scope1.c::filelocal, which is 2
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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 ;
|
||||
}
|
||||
|
|
@ -227,14 +225,14 @@ proc test_at_foo {} {
|
|||
gdb_test "print filelocal_bss" "\\\$$decimal = 102" \
|
||||
"print filelocal_bss at foo"
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
|
||||
gdb_test "print 'scope1.c'::filelocal_bss" "\\\$$decimal = 102" "print 'scope1.c'::filelocal_bss at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_bss"
|
||||
|
||||
|
||||
gdb_test "print filelocal_ro" "\\\$$decimal = 202" \
|
||||
"print filelocal_ro at foo"
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
|
||||
gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro"
|
||||
|
||||
|
||||
|
|
@ -245,7 +243,7 @@ proc test_at_foo {} {
|
|||
gdb_test "print foo::funclocal" "\\\$$decimal = 3" \
|
||||
"print foo::funclocal at foo"
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
|
||||
gdb_test "print 'scope1.c'::foo::funclocal" "\\\$$decimal = 3" "print 'scope1.c'::foo::funclocal at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal"
|
||||
|
||||
|
||||
|
|
@ -257,7 +255,7 @@ proc test_at_foo {} {
|
|||
gdb_test "print foo::funclocal_bss" "\\\$$decimal = 103" \
|
||||
"print foo::funclocal_bss at foo"
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
|
||||
gdb_test "print 'scope1.c'::foo::funclocal_bss" "\\\$$decimal = 103" "print 'scope1.c'::foo::funclocal_bss at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_bss"
|
||||
|
||||
|
||||
|
|
@ -269,7 +267,7 @@ proc test_at_foo {} {
|
|||
gdb_test "print foo::funclocal_ro" "\\\$$decimal = 203" \
|
||||
"print foo::funclocal_ro at foo"
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
|
||||
gdb_test "print 'scope1.c'::foo::funclocal_ro" "\\\$$decimal = 203" "print 'scope1.c'::foo::funclocal_ro at foo" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::foo::funclocal_ro"
|
||||
|
||||
|
||||
|
|
@ -278,7 +276,7 @@ proc test_at_foo {} {
|
|||
gdb_test "print bar::funclocal" "\\\$$decimal = 4" \
|
||||
"print bar::funclocal at foo"
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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;
|
||||
|
||||
|
|
@ -290,7 +288,6 @@ proc test_at_bar {} {
|
|||
global det_file
|
||||
global srcdir
|
||||
global subdir
|
||||
global gcc_compiled
|
||||
|
||||
if [gdb_test "next" ".*" "" ] {
|
||||
gdb_suppress_tests ;
|
||||
|
|
@ -313,7 +310,7 @@ proc test_at_bar {} {
|
|||
|
||||
# Print scope0.c::filelocal_ro, which is 201
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
|
||||
setup_xfail "powerpc-*-*"
|
||||
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 ;
|
||||
|
|
@ -327,7 +324,7 @@ proc test_at_bar {} {
|
|||
}
|
||||
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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 ;
|
||||
}
|
||||
|
|
@ -340,7 +337,7 @@ proc test_at_bar {} {
|
|||
}
|
||||
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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 ;
|
||||
}
|
||||
|
|
@ -353,7 +350,7 @@ proc test_at_bar {} {
|
|||
}
|
||||
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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 ;
|
||||
}
|
||||
|
|
@ -366,7 +363,7 @@ proc test_at_bar {} {
|
|||
}
|
||||
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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 ;
|
||||
}
|
||||
|
|
@ -379,7 +376,7 @@ proc test_at_bar {} {
|
|||
}
|
||||
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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 ;
|
||||
}
|
||||
|
|
@ -392,7 +389,7 @@ proc test_at_bar {} {
|
|||
}
|
||||
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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 ;
|
||||
}
|
||||
|
|
@ -410,7 +407,7 @@ proc test_at_bar {} {
|
|||
}
|
||||
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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 ;
|
||||
}
|
||||
|
|
@ -428,7 +425,7 @@ proc test_at_bar {} {
|
|||
}
|
||||
|
||||
|
||||
if {$gcc_compiled} then { setup_xfail "rs6000-*-*" }
|
||||
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 ;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue