2004-01-01 Michael Chastain <mec.gnu@mindspring.com>

	* gdb.cp/namespace.exp: Accept gcc abi 2.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 91284d2fba7c9e52a70b95864b056c834513fa20..ba22bd8fe79dba0f1121e21407cf9bd9c1a21eed 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-01  Michael Chastain  <mec.gnu@mindspring.com>
+
+       * gdb.cp/namespace.exp: Accept gcc abi 2.
+
 2004-01-01  Michael Chastain  <mec.gnu@mindspring.com>
 
        * gdb.cp/method.exp: Accept gcc abi 2.

diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp
index 228d791ad66ea098d2f9d059cc8854a9fc1c3622..1720f0fc0802d5c9d73c203c4a5add7982c0f6e5 100644 (file)
--- a/gdb/testsuite/gdb.cp/namespace.exp
+++ b/gdb/testsuite/gdb.cp/namespace.exp
@@ -1,4 +1,5 @@
-# Copyright 1997, 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright 1997, 1998, 2000, 2001, 2002, 2003, 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
@@ -119,6 +120,9 @@ gdb_expect {
    -re "type = class (AAA::|)inA \{\r\n\[ \]*public:\r\n\[ \]*int xx;\r\n\[ \]*\r\n\[ \]*.*int fum\\(int\\);\r\n\}\r\n$gdb_prompt $" {
        pass "ptype ina"
    }
+   -re "type = class (AAA::|)inA \{\r\n\[ \]*public:\r\n\[ \]*int xx;\r\n\[ \]*\r\n\[ \]*int fum\\(int\\);\r\n.*\}\r\n$gdb_prompt $" {
+       pass "ptype ina"
+   }
    -re ".*$gdb_prompt $" { fail "ptype ina" }
    timeout { fail "(timeout) ptype ina" }
 }