diff options
| author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2013-01-26 18:43:43 +0000 |
|---|---|---|
| committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2013-01-26 18:43:43 +0000 |
| commit | e229648ec495cc781bdd56b437eed612c584624d (patch) | |
| tree | 95fbbe92cb3d36e81b214e0074cb70a6553a75b1 | |
| parent | c9ba0c87bf3595762506825b30f0ebcb9da53129 (diff) | |
| download | gdb-e229648ec495cc781bdd56b437eed612c584624d.zip gdb-e229648ec495cc781bdd56b437eed612c584624d.tar.gz gdb-e229648ec495cc781bdd56b437eed612c584624d.tar.bz2 | |
gdb/testsuite/
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.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/restore.exp | 17 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/store.exp | 16 |
3 files changed, 14 insertions, 27 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2a04ca8..47ea814 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -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. diff --git a/gdb/testsuite/gdb.base/restore.exp b/gdb/testsuite/gdb.base/restore.exp index 772faca..dbe01dc 100644 --- a/gdb/testsuite/gdb.base/restore.exp +++ b/gdb/testsuite/gdb.base/restore.exp @@ -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 @@ proc restore_tests { } { } } - - -# 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 diff --git a/gdb/testsuite/gdb.base/store.exp b/gdb/testsuite/gdb.base/store.exp index fb6a6a6..292a319 100644 --- a/gdb/testsuite/gdb.base/store.exp +++ b/gdb/testsuite/gdb.base/store.exp @@ -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 @@ if [get_compiler_info] { 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 # |