From 053248ffab1d240041c9a2374e1c477665689dfb Mon Sep 17 00:00:00 2001 From: Michael Chastain Date: Wed, 7 Jan 2004 22:44:54 +0000 Subject: [PATCH] 2004-01-07 Michael Chastain * gdb.base/constvars.exp: Do not force lang=c++ if using HP compilers. Delete duplicate call to get_compiler_info. (local_compiler_xfail_check): setup_xfail if $hp_cc_compiler. * gdb.base/volatile.exp: Likewise. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.base/constvars.exp | 22 +++++++--------------- gdb/testsuite/gdb.base/volatile.exp | 17 ++++++----------- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 32b69851639..98dc2830fb6 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2004-01-07 Michael Chastain + + * gdb.base/constvars.exp: Do not force lang=c++ if using HP + compilers. Delete duplicate call to get_compiler_info. + (local_compiler_xfail_check): setup_xfail if $hp_cc_compiler. + * gdb.base/volatile.exp: Likewise. + 2004-01-07 Mark Kettenis * gdb.base/gdb1476.exp: Only run the tests if we can't read the diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp index 9008624a936..68732867d50 100644 --- a/gdb/testsuite/gdb.base/constvars.exp +++ b/gdb/testsuite/gdb.base/constvars.exp @@ -1,4 +1,4 @@ -# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -48,23 +48,10 @@ 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]] != "" } { +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug ] != "" } { 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; -} - gdb_exit gdb_start gdb_reinitialize_dir $srcdir/$subdir @@ -88,6 +75,11 @@ proc local_compiler_xfail_check { } { setup_xfail "*-*-*" } } + + global hp_cc_compiler + if { $hp_cc_compiler } { + setup_xfail "hppa*-*-hpux*" + } } send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $" diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp index 075c1e75aa8..c12e3d88eae 100644 --- a/gdb/testsuite/gdb.base/volatile.exp +++ b/gdb/testsuite/gdb.base/volatile.exp @@ -55,20 +55,10 @@ 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]] != "" } { +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug ] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } -if [get_compiler_info ${binfile}] { - return -1 -} - gdb_exit gdb_start gdb_reinitialize_dir $srcdir/$subdir @@ -91,6 +81,11 @@ proc local_compiler_xfail_check { } { setup_xfail "*-*-*" } } + + global hp_cc_compiler + if { $hp_cc_compiler } { + setup_xfail "hppa*-*-hpux*" + } } send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $" -- 2.30.2