ChangeLog:

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

diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp
index 075c1e75aa8c746f4ed83d6103ad92c9ae5ff82e..d616735cf860aaf7434ab8cb4c8ff3132a6ae33b 100644 (file)
--- a/gdb/testsuite/gdb.base/volatile.exp
+++ b/gdb/testsuite/gdb.base/volatile.exp
@@ -1,21 +1,18 @@
-# Copyright 1997, 1998, 1999, 2003, 2004 Free Software Foundation, Inc.
+# Copyright 1997, 1998, 1999, 2003, 2004, 2007, 2008, 2009
+# 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 Satish Pai <pai@apollo.hp.com> 1997-07-07
 #    In the spirit of constvars.exp: added volatile, const-volatile stuff.
@@ -55,18 +52,9 @@ if [get_compiler_info ${binfile}] {
     return -1;
 }
 
-if {$hp_aCC_compiler || $hp_cc_compiler} {
-    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."
-}
-
-if  [get_compiler_info ${binfile}] {
-    return -1
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug ] != "" } {
+     untested volatile.exp
+     return -1
 }
 
 gdb_exit
@@ -84,6 +72,9 @@ if ![runto_main] then {
 
 get_debug_format
 
+# Many tests xfail with gcc 2 -gstabs+.
+# TODO: check out the hp side of this.
+
 proc local_compiler_xfail_check { } {
     if { [test_compiler_info gcc-2-*] } then {
        if { ![test_debug_format "HP"] \
@@ -91,6 +82,21 @@ proc local_compiler_xfail_check { } {
            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 $"
@@ -253,11 +259,7 @@ gdb_test "ptype vendor" "type = const volatile unsigned char \\* const volatile.
 
 # test function parameters
 local_compiler_xfail_check
-if { [test_compiler_info gcc-3-*] && [test_debug_format "stabs"] } then {
-    # For reasons unknown, GCC 3 with stabs mangles several cv-qualified
-    # arguments to this function.
-    setup_xfail "*-*-*"
-}
+local_compiler_xfail_check_2
 send_gdb "ptype qux2\n"
 gdb_expect {
     -re "type = int \\(volatile unsigned char, const volatile int, volatile short( int)?, volatile long( int)? \\*, float \\* volatile, const volatile signed char \\* const volatile\\).*$gdb_prompt $" {