From fda326dd1d341f03a75a36c8331b8cc8d1f637fa Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Mon, 7 Mar 2011 16:03:04 +0000
Subject: gdb 	* infrun.c (print_exited_reason): Include inferior id and pid
 in 	message. gdb/testsuite 	* lib/opencl.exp (skip_opencl_tests): Update
 for exit message 	change. 	* lib/mi-support.exp (mi_gdb_test):
 Update for exit message 	change. 	* lib/gdb.exp
 (gdb_test_multiple): Update comment.  Update for 	exit message change. 
 (skip_altivec_tests): Update for exit message change. 	(skip_vsx_tests):
 Likewise. 	(gdb_continue_to_end): Likewise.  Add 'command' argument. 
 * lib/cell.exp (skip_cell_tests): Update for exit message change. 	*
 gdb.threads/tls.exp: Update for exit message change. 	*
 gdb.threads/thread-unwindonsignal.exp: Use 	gdb_continue_to_end. 	*
 gdb.threads/step.exp (step_it): Update for exit message change. 
 (continue_all): Likewise. 	* gdb.threads/print-threads.exp
 (test_all_threads): Update for 	exit message change. 	*
 gdb.threads/interrupted-hand-call.exp: Use 	gdb_continue_to_end. 	*
 gdb.threads/execl.exp: Use gdb_continue_to_end. 	*
 gdb.python/py-prettyprint.exp (run_lang_tests): Use 	gdb_continue_to_end. 
 * gdb.hp/gdb.objdbg/objdbg02.exp: Use gdb_continue_to_end. 	*
 gdb.hp/gdb.objdbg/objdbg01.exp: Use gdb_continue_to_end. 	*
 gdb.hp/gdb.defects/solib-d.exp: Update for exit message change. 	*
 gdb.cp/method.exp: Update for exit message change. 	*
 gdb.cp/mb-templates.exp: Update for exit message change. 	*
 gdb.cp/mb-inline.exp: Use gdb_continue_to_end. 	* gdb.cp/annota3.exp:
 Update for exit message change. 	* gdb.cp/annota2.exp: Update for exit
 message change. 	* gdb.cell/fork.exp: Use gdb_continue_to_end. 	*
 gdb.base/term.exp: Update for exit message change. 	*
 gdb.base/step-test.exp (test_i): Update for exit message change. 	*
 gdb.base/sigstep.exp (advance): Update for exit message change. 
 (advancei): Likewise. 	* gdb.base/siginfo.exp: Update for exit message
 change. 	* gdb.base/shlib-call.exp: Use gdb_continue_to_end. 	*
 gdb.base/reread.exp: Use gdb_continue_to_end. 	* gdb.base/langs.exp: Use
 gdb_continue_to_end. 	* gdb.base/interrupt.exp: Update for exit message
 change. 	* gdb.base/gdb1555.exp: Update for exit message change. 
 * gdb.base/exe-lock.exp: Use gdb_continue_to_end. 	*
 gdb.base/ending-run.exp: Update for exit message change. 	*
 gdb.base/chng-syms.exp: Update for exit message change. 	*
 gdb.base/checkpoint.exp: Update for exit message change. 	*
 gdb.base/catch-syscall.exp (check_for_program_end): Use 
 gdb_continue_to_end. 	(test_catch_syscall_with_wrong_args): Likewise. 
 * gdb.base/call-signal-resume.exp: Use gdb_continue_to_end. 	*
 gdb.base/break-interp.exp (test_ld): Update for exit message 	change. 
 * gdb.base/bang.exp: Update for exit message change. 	* gdb.base/attach.exp
 (do_attach_tests): Use gdb_continue_to_end. 	(do_call_attach_tests):
 Likewise. 	* gdb.base/a2-run.exp: Update for exit message change. 	*
 gdb.arch/ppc-dfp.exp: Update for exit message change. 	* gdb.ada/tasks.exp:
 Use gdb_continue_to_end. 	* gdb.ada/catch_ex.exp: Use
 gdb_continue_to_end.

---
 gdb/testsuite/lib/opencl.exp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'gdb/testsuite/lib/opencl.exp')

diff --git a/gdb/testsuite/lib/opencl.exp b/gdb/testsuite/lib/opencl.exp
index c1b5291..dfd6a57 100644
--- a/gdb/testsuite/lib/opencl.exp
+++ b/gdb/testsuite/lib/opencl.exp
@@ -31,6 +31,7 @@ proc gdb_compile_opencl_hostapp {clsource executable options} {
 # it does not.
 proc skip_opencl_tests {} {
     global skip_opencl_tests_saved srcdir objdir subdir gdb_prompt
+    global inferior_exited_re
 
     # Use the cached value, if it exists.  Cache value per "board" to handle
     # runs with multiple options (e.g. unix/{-m32,-64}) correctly.
@@ -59,11 +60,11 @@ proc skip_opencl_tests {} {
     clean_restart "$executable"
     gdb_run_cmd
     gdb_expect 30 {
-        -re ".*Program exited normally.*${gdb_prompt} $" {
+        -re ".*$inferior_exited_re normally.*${gdb_prompt} $" {
             verbose -log "\n$me: OpenCL support detected"
             set skip_opencl_tests_saved($board) 0
         }
-        -re ".*Program exited with code.*${gdb_prompt} $" {
+        -re ".*$inferior_exited_re code.*${gdb_prompt} $" {
             verbose -log "\n$me: OpenCL support not detected"
             set skip_opencl_tests_saved($board) 1
         }
-- 
cgit v1.1