aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2010-04-19 03:13:07 +0000
committerJan Kratochvil <jan.kratochvil@redhat.com>2010-04-19 03:13:07 +0000
commit4d836c0979e67c98286635aacedee092b643ccbf (patch)
treec5947d1898032838a6e3916e47ce0aa48f5d92a1
parent645797a8303c37f87b1218a6ad0e6a7fb860371c (diff)
downloadgdb-4d836c0979e67c98286635aacedee092b643ccbf.zip
gdb-4d836c0979e67c98286635aacedee092b643ccbf.tar.gz
gdb-4d836c0979e67c98286635aacedee092b643ccbf.tar.bz2
gdb/testsuite/
* gdb.base/solib-display.exp: Replace gdb_exit, gdb_start, gdb_reinitialize_dir and gdb_load by clean_restart. Remove trailing gdb_exit and return. (executable): New variable. (binfile): Use it.
-rw-r--r--gdb/testsuite/ChangeLog8
-rw-r--r--gdb/testsuite/gdb.base/solib-display.exp14
2 files changed, 11 insertions, 11 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f955cb8..3f86fd5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-19 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * gdb.base/solib-display.exp: Replace gdb_exit, gdb_start,
+ gdb_reinitialize_dir and gdb_load by clean_restart. Remove trailing
+ gdb_exit and return.
+ (executable): New variable.
+ (binfile): Use it.
+
2010-04-19 Pedro Alves <pedro@codesourcery.com>
PR breakpoints/8554.
diff --git a/gdb/testsuite/gdb.base/solib-display.exp b/gdb/testsuite/gdb.base/solib-display.exp
index d03edf8..42a48d0 100644
--- a/gdb/testsuite/gdb.base/solib-display.exp
+++ b/gdb/testsuite/gdb.base/solib-display.exp
@@ -40,7 +40,8 @@ set lib_flags [list debug]
# Binary file.
set testfile "solib-display-main"
set srcfile ${srcdir}/${subdir}/${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set executable ${testfile}
+set binfile ${objdir}/${subdir}/${executable}
set bin_flags [list debug shlib=${binfile_lib}]
if [get_compiler_info ${binfile}] {
@@ -53,10 +54,7 @@ if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
return -1
}
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${executable}
if ![runto_main] then {
fail "Can't run to main"
@@ -107,9 +105,3 @@ gdb_test "" "6: a_static = 46\\r\\n4: main_global = 44\\r\\n.*"
gdb_test "break [gdb_get_line_number "break here" ${testfile}.c]" \
".*Breakpoint.* at .*"
gdb_test "continue" "6: a_static = 46\\r\\n5: a_local = 45\\r\\n4: main_global = 44\\r\\n.*"
-
-gdb_exit
-
-return 0
-
-