* gdb.base/completion.exp: Recognize the more detailed error

messages produced by the macro expander's lexical analyzer.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2705785..201f85e 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-17  Jim Blandy  <jimb@redhat.com>
+
+       * gdb.base/completion.exp: Recognize the more detailed error
+       messages produced by the macro expander's lexical analyzer.
+
 2002-05-14  Elena Zannoni  <ezannoni@redhat.com>
 
         * gdb.arch/altivec-abi.c: New file.

diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index f8f4568..332e169 100644 (file)
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -414,7 +414,7 @@ gdb_expect  {
         -re "^p 'a\\\x07$"\
             { send_gdb "\n"
               gdb_expect {
-                      -re "Invalid character constant\\..*$gdb_prompt $"\
+                      -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $"\
                                         { pass "complete 'p \'a'"}
                       -re ".*$gdb_prompt $" { fail "complete 'p \'a'"}
                       timeout           {fail "(timeout) complete 'p \'a'"}
@@ -433,7 +433,7 @@ gdb_expect {
            -re ".*argv.*$gdb_prompt p .a$" {
                send_gdb "\n"
                gdb_expect {
-                   -re "Invalid character constant\\..*$gdb_prompt $" {
+                   -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $" {
                        pass "complete (2) 'p \'a'"
                    }
                    -re ".*$gdb_prompt $" { fail "complete (2) 'p \'a'" }
@@ -446,7 +446,7 @@ gdb_expect {
                    -re "\\(gdb\\) p 'a$" {
                        send_gdb "\n"
                        gdb_expect {
-                           -re "Invalid character constant\\..*$gdb_prompt $" {
+                           -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $" {
                                pass "complete (2) 'p \'a'"
                            }
                            -re ".*$gdb_prompt $" {