diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/m-static.exp | 20 |
2 files changed, 18 insertions, 7 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7ea4feb..bc3df7a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2004-01-06 Michael Chastain <mec.gnu@mindspring.com> + * gdb.cp/m-static.exp: Compile one source file at a time. + Delete unused call to get_compiler_info. + +2004-01-06 Michael Chastain <mec.gnu@mindspring.com> + * gdb.base/call-ar-st.exp: Delete explicit reference to ${binfile}.ci. * gdb.base/call-rt-st.exp: Likewise. * gdb.base/nodebug.exp: Likewise. diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp index d291135..56cd7bc 100644 --- a/gdb/testsuite/gdb.cp/m-static.exp +++ b/gdb/testsuite/gdb.cp/m-static.exp @@ -1,4 +1,4 @@ -# Copyright 2002 Free Software Foundation, Inc. +# Copyright 2002, 2004 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 @@ -33,16 +33,22 @@ set prms_id 0 set bug_id 0 set testfile "m-static" -set srcfile ${testfile}.cc -set srcfile1 ${testfile}1.cc -set binfile ${objdir}/${subdir}/${testfile} +set srcfile "${srcdir}/${subdir}/${testfile}.cc" +set srcfile1 "${srcdir}/${subdir}/${testfile}1.cc" +set objfile "${objdir}/${subdir}/${testfile}.o" +set objfile1 "${objdir}/${subdir}/${testfile}1.o" +set binfile "${objdir}/${subdir}/${testfile}" -if { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile1}" "${binfile}" executable {debug c++}] != "" } { +if { [gdb_compile "${srcfile}" "${objfile}" object {debug c++}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } -if [get_compiler_info ${binfile} "c++"] { - return -1 +if { [gdb_compile "${srcfile1}" "${objfile1}" object {debug c++}] != "" } { + gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." +} + +if { [gdb_compile "${objfile} ${objfile1}" "${binfile}" executable {debug c++}] != "" } { + gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } gdb_exit |