aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorJeff Law <law@redhat.com>2001-12-19 21:08:45 +0000
committerJeff Law <law@redhat.com>2001-12-19 21:08:45 +0000
commit2cd045cd85ef7e9873a80672ea3b0e9ff47f3c66 (patch)
treec9d6c442fecfa86b7c542f45e103c2ac100ce7cb /gdb
parent1cdb71fe7e3a2a6b0484c98d52e4b6f41081750d (diff)
downloadgdb-2cd045cd85ef7e9873a80672ea3b0e9ff47f3c66.zip
gdb-2cd045cd85ef7e9873a80672ea3b0e9ff47f3c66.tar.gz
gdb-2cd045cd85ef7e9873a80672ea3b0e9ff47f3c66.tar.bz2
* gdb.base/break.exp: Fix HP specific search string when testing
backtracing in a called function. * gdb.base/constvars.exp: Only set lang to C++ if we're compiling the test with HP's compilers. * gdb.base/volatile.exp: Similarly.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog9
-rw-r--r--gdb/testsuite/gdb.base/break.exp2
-rw-r--r--gdb/testsuite/gdb.base/constvars.exp8
-rw-r--r--gdb/testsuite/gdb.base/volatile.exp8
4 files changed, 24 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8e87b96..0160134 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+Wed Dec 19 14:10:57 2001 Jeffrey A Law (law@redhat.com)
+
+ * gdb.base/break.exp: Fix HP specific search string when testing
+ backtracing in a called function.
+
+ * gdb.base/constvars.exp: Only set lang to C++ if we're
+ compiling the test with HP's compilers.
+ * gdb.base/volatile.exp: Similarly.
+
2001-12-19 Jim Blandy <jimb@redhat.com>
* gdb.base/printcmds.exp: Expect the null character to be printed
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp
index 7671d1e..798e0c2 100644
--- a/gdb/testsuite/gdb.base/break.exp
+++ b/gdb/testsuite/gdb.base/break.exp
@@ -592,7 +592,7 @@ gdb_expect {
#
send_gdb "bt\n"
gdb_expect {
- -re "#0\[ \t\]*$hex in marker2.*:4\[49\]\r\n#1.*_sr4export.*$gdb_prompt $"\
+ -re "#0\[ \t\]*($hex in )?marker2.*:4\[49\]\r\n#1.*_sr4export.*$gdb_prompt $"\
{pass "backtrace while in called function"}
-re "#0\[ \t\]*($hex in )?marker2.*:4\[49\]\r\n#1.*function called from gdb.*$gdb_prompt $"\
{pass "backtrace while in called function"}
diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp
index 35420e2..bb062ef 100644
--- a/gdb/testsuite/gdb.base/constvars.exp
+++ b/gdb/testsuite/gdb.base/constvars.exp
@@ -41,7 +41,13 @@ set testfile "constvars"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
-if [istarget "hppa*-*-*"] {
+# 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 {$hp_aCC_compiler || $hp_cc_compiler} {
set lang "c++"
} else {
set lang ""
diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp
index 693cea0..efb271b 100644
--- a/gdb/testsuite/gdb.base/volatile.exp
+++ b/gdb/testsuite/gdb.base/volatile.exp
@@ -49,7 +49,13 @@ set testfile "constvars"
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${testfile}
-if [istarget "hppa*-*-*"] {
+# 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 {$hp_aCC_compiler || $hp_cc_compiler} {
set lang "c++"
} else {
set lang ""