* gdb.base/call-sc.exp (start_scalars_test): Fix regular

expression that checks the return type.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1ca1beb6b77d71ba096f4bf0edf22870c9505f70..2117015f9bdd7f19c761f48e5bea87e691cea01a 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-25  Mark Kettenis  <kettenis@gnu.org>
+
+       * gdb.base/call-sc.exp (start_scalars_test): Fix regular
+       expression that checks the return type.
+
 2004-04-23  Andrew Cagney  <cagney@redhat.com>
 
        * gdb.base/call-sc.exp: New test of scalar call/return values.

diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp
index 98d959176e3efd94d362655ba2cc510c53000909..3de8d67311f2a95c62892ee1e6eb2c4f508d0d47 100644 (file)
--- a/gdb/testsuite/gdb.base/call-sc.exp
+++ b/gdb/testsuite/gdb.base/call-sc.exp
@@ -115,7 +115,7 @@ proc start_scalars_test { type } {
     set test "ptype; ${testfile}"
     set foo_t "xxx"
     gdb_test_multiple "ptype ${type}" "${test}" {
-       -re "type = (\[^\\r\\n\]*).*$gdb_prompt $" {
+       -re "type = (\[^\r\n\]*)\r\n$gdb_prompt $" {
            set foo_t "$expect_out(1,string)"
            pass "$test (${foo_t})"
        }