Remove unused support for target-based exception catching.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / constvars.exp

diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp
index 35420e2839dec0bc74885e2938e1078a681d3860..244b463560242a9bec8f80c45a1ec3f2e011f4bd 100644 (file)
--- a/gdb/testsuite/gdb.base/constvars.exp
+++ b/gdb/testsuite/gdb.base/constvars.exp
@@ -1,21 +1,18 @@
-# Copyright 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007
+# 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 # written by Elena Zannoni (elz@apollo.hp.com)
 #
@@ -41,23 +38,17 @@ set testfile "constvars"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
-if [istarget "hppa*-*-*"] {
-    set lang "c++"
-} else {
-    set lang ""
-}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [concat debug $lang]] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-}
-
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
-
 if [get_compiler_info ${binfile}] {
     return -1;
 }
 
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug ] != "" } {
+    untested constvars.exp
+    return -1
+}
+
 gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
@@ -74,15 +65,31 @@ if ![runto_main] then {
 
 get_debug_format
 
-proc local_compiler_xfail_check { } {
-    global gcc_compiled;
+# Many tests xfail with gcc 2 -gstabs+.
+# TODO: check out the hp side of this.
 
-    if {$gcc_compiled} then {
+proc local_compiler_xfail_check { } {
+    if { [test_compiler_info gcc-2-*] } then {
        if { ![test_debug_format "HP"] \
                && ![test_debug_format "DWARF 2"] } then {
            setup_xfail "*-*-*" 
        }
     }
+
+    global hp_cc_compiler
+    if { $hp_cc_compiler } {
+       setup_xfail "hppa*-*-hpux*"
+    }
+}
+
+# A few tests still xfail with gcc 3 -gstabs+ and gcc 4 -gstabs+.
+
+proc local_compiler_xfail_check_2 { } {
+    if { [test_compiler_info gcc-3-*] || [test_compiler_info gcc-4-*] } {
+       if { [test_debug_format "stabs" ] } {
+           setup_xfail "*-*-*"
+       }
+    }
 }
 
 send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
@@ -121,6 +128,8 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
 # test function parameters
 
 local_compiler_xfail_check
+local_compiler_xfail_check_2
+
 send_gdb "ptype qux1\n"
 gdb_expect {
     -re "type = int \\(const char, const char, const char \\*, char \\* const\\).*$gdb_prompt $" {
@@ -140,12 +149,10 @@ proc do_constvar_tests {} {
     gdb_test "print lax" " = 20"
     gdb_test "ptype lax" "type = short.*"
     gdb_test "print lecherous" " = 30"
-    local_compiler_xfail_check
     gdb_test "ptype lecherous" "type = (unsigned short|short unsigned)( int)?"
     gdb_test "print lechery" " = 40"
     gdb_test "ptype lechery" "type = long.*"
     gdb_test "print lectern" " = 50"
-    local_compiler_xfail_check
     gdb_test "ptype lectern" "type = (unsigned long|long unsigned)( int)?"
     gdb_test "print leeway" " = 60"
     gdb_test "ptype leeway" "type = float"
@@ -272,6 +279,12 @@ proc do_constvar_tests {} {
     gdb_test "print *locust" " = 70"
     local_compiler_xfail_check
     gdb_test "ptype locust" "type = double \\* const"
+
+    local_compiler_xfail_check
+    local_compiler_xfail_check_2
+    gdb_test "ptype crass" "type = struct crass \{\[\r\n\]+\[\ \t\]+char \\* const ptr;\[\r\n\]+\}"
+    local_compiler_xfail_check
+    gdb_test "ptype crisp" "type = struct crisp \{\[\r\n\]+\[\ \t\]+char \\* const \\*ptr;\[\r\n\]+\}"
 }
 
 do_constvar_tests