[commit] testsuite: Code cleanup: prepare_for_testing

[Jan Kratochvil]

Hi,

checked in, just use prepare_for_testing, pre-req. for a next patch.


Jan


http://sourceware.org/ml/gdb-cvs/2013-01/msg00178.html

--- src/gdb/testsuite/ChangeLog	2013/01/25 17:59:28	1.3534
+++ src/gdb/testsuite/ChangeLog	2013/01/26 18:43:43	1.3535
@@ -1,3 +1,11 @@
+2013-01-26  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Code cleanup.
+	* gdb.base/restore.exp: Replace gdb_compile, gdb_exit, gdb_start,
+	gdb_reinitialize_dir and gdb_load by standard_testfile, set executable
+	and prepare_for_testing.
+	* gdb.base/store.exp: Likewise.
+
 2013-01-25  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.python/py-explore.exp: Expect the gdb prompt.
--- src/gdb/testsuite/gdb.base/restore.exp	2013/01/01 06:33:26	1.22
+++ src/gdb/testsuite/gdb.base/restore.exp	2013/01/26 18:43:43	1.23
@@ -21,12 +21,10 @@
 # This file was written by Jim Blandy <jimb@cygnus.com>, with
 # fragments borrowed from return.exp.
 
+standard_testfile
+set executable $testfile
 
-set testfile "restore"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested restore.exp
+if { [prepare_for_testing $testfile.exp $executable $srcfile] } {
     return -1
 }
 
@@ -97,15 +95,6 @@
     }
 }
 
-
-
-# Start with a fresh gdb.
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 set prev_timeout $timeout
 set timeout 30
 restore_tests
--- src/gdb/testsuite/gdb.base/store.exp	2013/01/01 06:33:26	1.22
+++ src/gdb/testsuite/gdb.base/store.exp	2013/01/26 18:43:43	1.23
@@ -15,15 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#
-# test running programs
-#
+standard_testfile
+set executable $testfile
 
-set testfile "store"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested store.exp
+if { [prepare_for_testing $testfile.exp $executable $srcfile] } {
     return -1
 }
 
@@ -31,11 +26,6 @@
     return -1;
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 #
 # set it up at a breakpoint so we can play with the variable values
 #