This is the mail archive of the gdb-cvs@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] gdb.ada/info_exc.exp: Adjust expected output in "info exception" test.


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=8b558f797a3a63aaa8de119ddf53c8afdd1dc6eb

commit 8b558f797a3a63aaa8de119ddf53c8afdd1dc6eb
Author: Joel Brobecker <brobecker@adacore.com>
Date:   Mon Jul 20 15:09:44 2015 -0700

    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.

Diff:
---
 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\":" \


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]