aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@adacore.com>2015-07-20 15:09:44 -0700
committerJoel Brobecker <brobecker@adacore.com>2015-07-20 15:18:24 -0700
commit8b558f797a3a63aaa8de119ddf53c8afdd1dc6eb (patch)
tree6bfe7d678e038a564c73adb355cb7f5a3ba0d9f6
parent0ef3814fe1b5579890a7758e6e52d12b8a96fdf2 (diff)
downloadgdb-8b558f797a3a63aaa8de119ddf53c8afdd1dc6eb.zip
gdb-8b558f797a3a63aaa8de119ddf53c8afdd1dc6eb.tar.gz
gdb-8b558f797a3a63aaa8de119ddf53c8afdd1dc6eb.tar.bz2
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.
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.ada/info_exc.exp4
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\":" \