aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorMichael Chastain <mec@google.com>2004-01-08 06:35:15 +0000
committerMichael Chastain <mec@google.com>2004-01-08 06:35:15 +0000
commit2789202a9c2e05785ac16b579a1cb2cbf2006a76 (patch)
tree7c1179383af2255a38c92081b3609f10457f6937 /gdb
parentb862f14c313e051861521525f3f3bfe225aadd92 (diff)
downloadgdb-2789202a9c2e05785ac16b579a1cb2cbf2006a76.zip
gdb-2789202a9c2e05785ac16b579a1cb2cbf2006a76.tar.gz
gdb-2789202a9c2e05785ac16b579a1cb2cbf2006a76.tar.bz2
2004-01-07 Michael Chastain <mec.gnu@mindspring.com>
* gdb.cp/cttiadd.c: Add a marker for gdb_get_line_number. * gdb.cp/ctti.exp: Use the marker instead of "next". With gcc, run further before bailing.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.cp/ctti.exp18
-rw-r--r--gdb/testsuite/gdb.cp/cttiadd.cc3
3 files changed, 15 insertions, 12 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 7f6043f..5ed0dc4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2004-01-07 Michael Chastain <mec.gnu@mindspring.com>
+ * gdb.cp/cttiadd.c: Add a marker for gdb_get_line_number.
+ * gdb.cp/ctti.exp: Use the marker instead of "next".
+ With gcc, run further before bailing.
+
+2004-01-07 Michael Chastain <mec.gnu@mindspring.com>
+
* gdb.cp/cttiadd.cc: Add copyright notice.
* gdb.cp/cttiadd1.cc: Likewise.
* gdb.cp/cttiadd2.cc: Likewise.
diff --git a/gdb/testsuite/gdb.cp/ctti.exp b/gdb/testsuite/gdb.cp/ctti.exp
index 80edce1..a5e75d8 100644
--- a/gdb/testsuite/gdb.cp/ctti.exp
+++ b/gdb/testsuite/gdb.cp/ctti.exp
@@ -76,22 +76,18 @@ if ![runto_main] then {
continue
}
-# TODO: this needs more work before actually deploying it.
-# So bail out here.
-
-if { [ test_compiler_info gcc-*] } then { continue }
-
-gdb_test "next" "$decimal.*i = 2;" "next 1"
-gdb_test "next" "$decimal.*f = 4.5;" "next 2"
-gdb_test "next" "$decimal.*c = add\\(c, c\\);" "next 3"
-gdb_test "next" "$decimal.*i = add\\(i, i\\);" "next 4"
-gdb_test "next" "$decimal.*f = add\\(f, f\\);" "next 5"
-gdb_test "next" "$decimal.*add1\\(\\);" "next 6"
+gdb_breakpoint [gdb_get_line_number "marker add1"]
+gdb_continue_to_breakpoint "marker add1"
gdb_test "print c" "\\$\[0-9\]+ = -62 .*"
gdb_test "print f" "\\$\[0-9\]+ = 9"
gdb_test "print i" "\\$\[0-9\]+ = 4"
+# TODO: this needs more work before actually deploying it.
+# So bail out here.
+
+if { [ test_compiler_info gcc-*] } then { continue }
+
gdb_test_multiple "print add<int>(2,2)" "print add<int>(2,2)" {
-re "\\$\[0-9\]+ = 4\r\n$gdb_prompt $" {
pass "print add<int>(2,2)"
diff --git a/gdb/testsuite/gdb.cp/cttiadd.cc b/gdb/testsuite/gdb.cp/cttiadd.cc
index e24a6d3..1958605 100644
--- a/gdb/testsuite/gdb.cp/cttiadd.cc
+++ b/gdb/testsuite/gdb.cp/cttiadd.cc
@@ -1,6 +1,6 @@
/* This testcase is part of GDB, the GNU debugger.
- Copyright 1998, 1999 Free Software Foundation, Inc.
+ Copyright 1998, 1999, 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
@@ -44,6 +44,7 @@ int main()
i = add(i, i);
f = add(f, f);
+ // marker add1
add1();
subr2();
subr3();