S/390: Add missing gdb_prompt in s390-multiarch.exp

Correct the patterns in the gdb_test_multiple invocation.

testsuite/
2013-10-30  Andreas Arnez  <arnez@linux.vnet.ibm.com>

	* gdb.arch/s390-multiarch.exp (test_linux_v2): Add $gdb_prompt to
	the patterns in gdb_test_multiple.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 69656a9a81d803cffdfc6b8c0ff2637bdd6d810b..bdd775dc4c0be07614223f3e5adb39f0d1ab4243 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-30  Andreas Arnez  <arnez@linux.vnet.ibm.com>
+
+       * gdb.arch/s390-multiarch.exp (test_linux_v2): Add $gdb_prompt to
+       the patterns in gdb_test_multiple.
+
 2013-10-29  Nicolas Blanc  <nicolas.blanc@intel.com>
 
        * gdb.base/sym-file-lib.c: New file.

diff --git a/gdb/testsuite/gdb.arch/s390-multiarch.exp b/gdb/testsuite/gdb.arch/s390-multiarch.exp
index e31ad17d8c3c51f01560d22ac43c87eace2fde21..e36e36acc3de841459383d0d54c5d13e2f6b9fb5 100644 (file)
--- a/gdb/testsuite/gdb.arch/s390-multiarch.exp
+++ b/gdb/testsuite/gdb.arch/s390-multiarch.exp
@@ -62,13 +62,15 @@ proc compile_and_dump {variant ccopts binfile} {
 }
 
 proc test_linux_v2 {} {
+    global gdb_prompt
+
     set test "Linux v2"
     gdb_test_multiple "info reg system_call" "$test" {
-       -re "system_call\[ \t\]+0x\[0-9a-z\]+\t.*" {
+       -re "system_call\[ \t\]+0x\[0-9a-z\]+\t.*\r\n$gdb_prompt $" {
            pass "$test"
            return 1
        }
-       -re "Invalid register `system_call'.*" {
+       -re "Invalid register `system_call'.*\r\n$gdb_prompt $" {
            unsupported "$test (no system_call reg)"
            return 0
        }