From 0efbbabc9c1075209244805e34b46db646d95bf3 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 26 Jun 2012 19:23:20 +0000
Subject: 	* gdb.threads/watchpoint-fork.exp (test): Use 
 standard_output_file.  Don't declare objdir. 	*
 gdb.threads/attach-into-signal.exp: Use standard_testfile, 
 standard_output_file. 	* gdb.threads/attach-stopped.exp: Use
 standard_testfile. 	* gdb.threads/bp_in_thread.exp: Use standard_testfile,
 	clean_restart.  Remove incdir. 	* gdb.threads/corethreads.exp: Use
 standard_testfile. 	* gdb.threads/execl.exp: Use standard_testfile, 
 standard_output_file, clean_restart. 	* gdb.threads/fork-child-threads.exp:
 Use standard_testfile, 	clean_restart. 	*
 gdb.threads/fork-thread-pending.exp: Use standard_testfile, 	clean_restart.
 	* gdb.threads/gcore-thread.exp: Use standard_testfile.  Remove 
 incdir. 	* gdb.threads/hand-call-in-threads.exp: Use standard_testfile,
 	clean_restart.  Remove incdir. 	* gdb.threads/ia64-sigill.exp: Use
 standard_testfile. 	* gdb.threads/interrupted-hand-call.exp: Use
 standard_testfile, 	clean_restart.  Remove incdir. 	*
 gdb.threads/killed.exp: Use standard_testfile, clean_restart. 	Remove incdir.
 	* gdb.threads/leader-exit.exp: Use standard_testfile. 	*
 gdb.threads/linux-dp.exp: Use standard_testfile, clean_restart. 	*
 gdb.threads/local-watch-wrong-thread.exp: Use standard_testfile, 
 clean_restart. 	* gdb.threads/manythreads.exp: Use standard_testfile, 
 clean_restart.  Remove incdir. 	* gdb.threads/multi-create.exp: Use
 standard_testfile, 	clean_restart. 	*
 gdb.threads/no-unwaited-for-left.exp: Use standard_testfile. 	*
 gdb.threads/non-ldr-exc-1.exp: Use standard_testfile. 	*
 gdb.threads/non-ldr-exc-2.exp: Use standard_testfile. 	*
 gdb.threads/non-ldr-exc-3.exp: Use standard_testfile. 	*
 gdb.threads/non-ldr-exc-4.exp: Use standard_testfile. 	*
 gdb.threads/pending-step.exp: Use standard_testfile, 	clean_restart.  Remove
 incdir. 	* gdb.threads/print-threads.exp: Use standard_testfile, 
 clean_restart.  Remove incdir. 	* gdb.threads/pthread_cond_wait.exp:
 Use standard_testfile, 	clean_restart.  Remove incdir. 	*
 gdb.threads/pthreads.exp: Use standard_testfile, clean_restart. 	Remove
 incdir. 	* gdb.threads/schedlock.exp: Use standard_testfile.  Remove 
 incdir. 	* gdb.threads/sigthread.exp: Use standard_testfile, 
 clean_restart. 	* gdb.threads/staticthreads.exp: Use
 standard_testfile, 	clean_restart.  Remove incdir. 	*
 gdb.threads/switch-threads.exp: Use standard_testfile, 	clean_restart.
  Remove incdir. 	* gdb.threads/thread-execl.exp: Use standard_testfile,
 	clean_restart.  Remove incdir. 	* gdb.threads/thread-find.exp: Use
 standard_testfile, 	clean_restart. 	* gdb.threads/thread-specific.exp: Use
 standard_testfile, 	clean_restart.  Remove incdir. 	*
 gdb.threads/thread-unwindonsignal.exp: Use standard_testfile, 	clean_restart.
  Remove incdir. 	* gdb.threads/thread_check.exp: Use standard_testfile,
 	clean_restart.  Remove incdir. 	* gdb.threads/thread_events.exp: Use
 standard_testfile.  Remove 	incdir. 	* gdb.threads/threadapply.exp:
 Use standard_testfile, 	clean_restart.  Remove incdir. 	*
 gdb.threads/threxit-hop-specific.exp: Use standard_testfile, 	clean_restart.
  Remove incdir. 	* gdb.threads/tls-nodebug.exp: Use standard_testfile, 
 clean_restart. 	* gdb.threads/tls-shared.exp: Use standard_testfile, 
 clean_restart, standard_output_file. 	* gdb.threads/tls-var.exp: Use
 standard_testfile, 	standard_output_file. 	* gdb.threads/tls.exp: Use
 standard_testfile, clean_restart. 	Remove incdir. 	*
 gdb.threads/watchthreads-reorder.exp: Use standard_testfile. 	*
 gdb.threads/watchthreads.exp: Use standard_testfile.  Remove 	incdir. 
 * gdb.threads/watchthreads2.exp: Use standard_testfile, 	clean_restart.
  Remove incdir.

---
 gdb/testsuite/gdb.threads/pending-step.exp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'gdb/testsuite/gdb.threads/pending-step.exp')

diff --git a/gdb/testsuite/gdb.threads/pending-step.exp b/gdb/testsuite/gdb.threads/pending-step.exp
index eb052cd..b5987dd 100644
--- a/gdb/testsuite/gdb.threads/pending-step.exp
+++ b/gdb/testsuite/gdb.threads/pending-step.exp
@@ -48,20 +48,13 @@
 #    continued in step 5).  Neither does this SIGTRAP correspond to a
 #    breakpoint hit.  GDB reports to the user a spurious SIGTRAP.
 
-set testfile "pending-step"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 
-if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } {
     return -1
 }
 
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${binfile}
 
 if ![runto_main] then {
     fail "Can't run to main"
-- 
cgit v1.1