gdb/testsuite/

	* gdb.base/store.exp (check_set): Import gdb_prompt.
	(continue to wack_${t}): Make it to conditional gdb_test_multiple.
	(${prefix}; next ${t}): Hide its name, handle it conditionally now.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c6f5f6c..b98d6fa 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2012-07-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
+       * gdb.base/store.exp (check_set): Import gdb_prompt.
+       (continue to wack_${t}): Make it to conditional gdb_test_multiple.
+       (${prefix}; next ${t}): Hide its name, handle it conditionally now.
+
+2012-07-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
        PR 11914
        * gdb.python/py-prettyprint.c (eval_func, eval_sub): New.
        (main): Call eval_sub.

diff --git a/gdb/testsuite/gdb.base/store.exp b/gdb/testsuite/gdb.base/store.exp
index 851d134..913c705 100644 (file)
--- a/gdb/testsuite/gdb.base/store.exp
+++ b/gdb/testsuite/gdb.base/store.exp
@@ -48,12 +48,23 @@ if ![runto_main] then {
 #
 
 proc check_set { t l r new add } {
+    global gdb_prompt
+
     set prefix "var ${t} l"
     gdb_test "tbreak wack_${t}"
-    gdb_test "continue" "register ${t} l = u, r = v;" \
-       "continue to wack_${t}"
-    gdb_test "next" "l = add_${t} .l, r.;" \
-       "${prefix}; next ${t}"
+
+    set test "continue to wack_${t}"
+    gdb_test_multiple "continue" $test {
+       -re "register ${t} l = u, r = v;\r\n$gdb_prompt $" {
+           # See GCC PR debug/53948.
+           send_gdb "next\n"
+           exp_continue
+       }
+       -re "l = add_${t} .l, r.;\r\n$gdb_prompt $" {
+           pass $test
+       }
+    }
+
     gdb_test "print l" " = ${l}" \
        "${prefix}; print old l, expecting ${l}"
     gdb_test "print r" " = ${r}" \