From 89e208dbfed1fcf441e60fd0af51094c34188da6 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed, 2 Nov 2011 08:43:40 +0000
Subject: [PATCH] gdb/testsuite/ 	* gdb.base/skip-solib.exp
 (executable_main): New variable. 	(binfile_main): Base it on that. 
 Use $executable_main in clean_restart calls.  Drop gdb_exit and 
 gdb_start calls.

---
 gdb/testsuite/ChangeLog               | 21 ++++++++++++++-------
 gdb/testsuite/gdb.base/skip-solib.exp | 10 ++++------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a47ba7eb8b..af1be7b1b1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.base/skip-solib.exp (executable_main): New variable.
+	(binfile_main): Base it on that.
+	Use $executable_main in clean_restart calls.  Drop gdb_exit and
+	gdb_start calls.
+
 2011-11-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Fix racy FAILs.
@@ -14,13 +21,13 @@
 2011-11-01  Justin Lebar <justin.lebar@gmail.com>
 
 	Add tests for skip command.
-	* testsuite/gdb.base/skip-solib-lib.c: New
-	* testsuite/gdb.base/skip-solib-main.c: New
-	* testsuite/gdb.base/skip-solib.exp: New
-	* testsuite/gdb.base/skip.c: New
-	* testsuite/gdb.base/skip.exp: New
-	* testsuite/gdb.base/skip1.c: New
-	* testsuite/gdb.base/Makefile.in: Adding new files.
+	* gdb.base/skip-solib-lib.c: New
+	* gdb.base/skip-solib-main.c: New
+	* gdb.base/skip-solib.exp: New
+	* gdb.base/skip.c: New
+	* gdb.base/skip.exp: New
+	* gdb.base/skip1.c: New
+	* gdb.base/Makefile.in: Adding new files.
 
 2011-10-31  Yao Qi  <yao@codesourcery.com>
 	    Pedro Alves  <pedro@codesourcery.com>
diff --git a/gdb/testsuite/gdb.base/skip-solib.exp b/gdb/testsuite/gdb.base/skip-solib.exp
index d6e25a4c04..20bf02c53a 100644
--- a/gdb/testsuite/gdb.base/skip-solib.exp
+++ b/gdb/testsuite/gdb.base/skip-solib.exp
@@ -26,7 +26,8 @@ if { ![isnative] || [is_remote host] || ![istarget *-linux*] || [skip_shlib_test
 
 set test "skip-solib"
 set srcfile_main "${test}-main.c"
-set binfile_main "${test}-test"
+set executable_main ${test}-test
+set binfile_main ${objdir}/${subdir}/${executable_main}
 set srcfile_lib "${test}-lib.c"
 set libname "lib${test}"
 set binfile_lib ${objdir}/${subdir}/${libname}.so
@@ -52,8 +53,7 @@ if {[gdb_compile "${binfile_main}.o" "${binfile_main}" executable \
     return -1
 }
 
-gdb_start
-clean_restart ${binfile_main}
+clean_restart ${executable_main}
 
 #
 # At this point, if we try to skip the file ${srcfile_lib} or the function
@@ -96,9 +96,7 @@ gdb_test "info skip" \
 #
 # Now restart gdb and testing ignoring of a function inside a solib.
 #
-gdb_exit
-gdb_start
-clean_restart ${binfile_main}
+clean_restart ${executable_main}
 
 gdb_test "skip function multiply" \
   "Function multiply will be skipped when stepping, pending shared library load." \