From: Ulrich Weigand <ulrich.weigand@de.ibm.com>
Date: Wed, 30 Oct 2013 18:03:39 +0000 (+0100)
Subject: S/390: Add missing gdb_prompt in s390-multiarch.exp
X-Git-Tag: hjl/linux/release/2.24.51.0.1~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=055e608a73df932538f0321a0f473eeea840773f;p=external%2Fbinutils.git

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 69656a9..bdd775d 100644
--- 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 e31ad17..e36e36a 100644
--- 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
 	}