Fix zero_ext documentation

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / solib-disc.exp

diff --git a/gdb/testsuite/gdb.base/solib-disc.exp b/gdb/testsuite/gdb.base/solib-disc.exp
index 0b9930d1b2dd65a7f4eec619748939f4f84f5fb2..2d3e6f4f3d84af17df38eea80c27f68ba0e6eaaf 100644 (file)
--- a/gdb/testsuite/gdb.base/solib-disc.exp
+++ b/gdb/testsuite/gdb.base/solib-disc.exp
@@ -1,8 +1,8 @@
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007-2016 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 # Test connecting and disconnecting at shared library events.
 
@@ -20,6 +19,7 @@ if {[skip_shlib_tests]} {
     return 0
 }
 
+set gdbserver_reconnect_p 1
 if { [info proc gdb_reconnect] == "" } {
     return 0
 }
@@ -33,14 +33,16 @@ set libsrc "${srcdir}/${subdir}/${libfile}.c"
 set libname "${libfile}.so"
 set libobj "${objdir}/${subdir}/${libname}"
 set execsrc "${srcdir}/${subdir}/${srcfile}"
+set lib_dlopen [shlib_target_file ${libname}]
+set lib_syms [shlib_symbol_file ${libname}]
 
 remote_exec build "rm -f ${binfile}"
 
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1
 }
 
-set exec_opts [list debug shlib_load additional_flags=-DSHLIB_NAME\=\"${libname}\"]
+set exec_opts [list debug shlib_load additional_flags=-DSHLIB_NAME=\"${lib_dlopen}\"]
 
 if { [gdb_compile_shlib $libsrc $libobj {debug}] != ""
      || [gdb_compile $execsrc ${binfile} executable $exec_opts] != "" } {
@@ -58,9 +60,9 @@ if ![runto_main] then {
     return 0
 }
 
-gdb_test "set stop-on-solib-events 1" ""
+gdb_test_no_output "set stop-on-solib-events 1"
 
-gdb_test "continue" "Stopped due to shared library event" "continue to load"
+gdb_test "continue" "Stopped due to shared library event.*" "continue to load"
 
 set msg "save \$pc after load"
 set saved_pc ""
@@ -82,7 +84,7 @@ if { [gdb_reconnect] == 0 } {
 gdb_test "print/x \$pc" "\\\$$decimal = $saved_pc" "check \$pc after load"
 
 
-gdb_test "continue" "Stopped due to shared library event" "continue to unload"
+gdb_test "continue" "Stopped due to shared library event.*" "continue to unload"
 
 set msg "save \$pc after unload"
 set saved_pc ""