Re: [PATCH] Share the "multi_line" helper among all Ada testcases

[Joel Brobecker <brobecker@adacore.com>]

[-- Attachment #1: Type: text/plain, Size: 1126 bytes --]

> > --- a/gdb/testsuite/gdb.ada/info_exc.exp
> > +++ b/gdb/testsuite/gdb.ada/info_exc.exp
> > @@ -34,9 +34,7 @@ gdb_test "info exceptions" \
> >                  "program_error: $hex" \
> >                  "storage_error: $hex" \
> >                  "tasking_error: $hex" \
> > -                ".*" \
> > -                "const.aint_global_gdb_e: $hex" \
> > -                ".*"]
> > +                "\(.*\r\n\)*const.aint_global_gdb_e: $hex\(.*\r\n\)*"]
> >
> >  gdb_test "info exceptions task" \
> >      [multi_line "All Ada exceptions matching regular expression
> > \"task\":" \

I missed that answer, and came up with something very similar,
which I checked in. Here it is:

gdb/testsuite/ChangeLog:

        * gdb.ada/info_exc.exp: Adjust "info exceptions" expected output.

Tested on x86_64-linux.

I thought about using join directly with the relaxed end-of-line
sequence to restore the original behavior, but then decided against
it, because this expected output is stricter, and I think that's
better. So I came up with the attached patch, which is another way
of doing what Pierre Marie had done.

-- 
Joel

[-- Attachment #2: 0001-gdb.ada-info_exc.exp-Adjust-expected-output-in-info-.patch --]
[-- Type: text/x-diff, Size: 2007 bytes --]

From 8b558f797a3a63aaa8de119ddf53c8afdd1dc6eb Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@adacore.com>
Date: Mon, 20 Jul 2015 15:09:44 -0700
Subject: [PATCH] gdb.ada/info_exc.exp: Adjust expected output in "info
 exception" test.

Since multi_line was moved to gdb.exp in a slightly stricter form,
The gdb.ada/info_exc.exp:info exceptions test has been failing.
This is because it now expects a new-line sequence at the end of
each argument given to multi_line, including ".*". But the intent
when writing the test was to signify "could-be-nothing-at-all".
As a result, the test fails on x86_64-linux with a runtime built as
recommended, because of that
extra new-line sequence.

gdb/testsuite/ChangeLog:

        * gdb.ada/info_exc.exp: Adjust "info exceptions" expected output.
---
 gdb/testsuite/ChangeLog            | 4 ++++
 gdb/testsuite/gdb.ada/info_exc.exp | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 520f606..17af4fc 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-20  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.ada/info_exc.exp: Adjust "info exceptions" expected output.
+
 2015-07-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.arch/i386-biarch-core.exp: Replace istarget
diff --git a/gdb/testsuite/gdb.ada/info_exc.exp b/gdb/testsuite/gdb.ada/info_exc.exp
index add83c5..d6ea5da 100644
--- a/gdb/testsuite/gdb.ada/info_exc.exp
+++ b/gdb/testsuite/gdb.ada/info_exc.exp
@@ -34,9 +34,7 @@ gdb_test "info exceptions" \
                 "program_error: $hex" \
                 "storage_error: $hex" \
                 "tasking_error: $hex" \
-                ".*" \
-                "const.aint_global_gdb_e: $hex" \
-                ".*"]
+                ".*\[\r\n\]*const.aint_global_gdb_e: $hex\[\r\n\]*.*" ]
 
 gdb_test "info exceptions task" \
     [multi_line "All Ada exceptions matching regular expression \"task\":" \
-- 
2.1.4