Allow making GDB not automatically connect to the native target.

[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 1417610f4ce45f1a2be7689d5363547585c4c081..e5205549c7d80ea537c26d99f3b5faa2981ac5ea 100644 (file)
--- a/gdb/testsuite/gdb.base/solib-disc.exp
+++ b/gdb/testsuite/gdb.base/solib-disc.exp
@@ -1,4 +1,4 @@
-# Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright 2007-2014 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
@@ -19,6 +19,7 @@ if {[skip_shlib_tests]} {
     return 0
 }
 
+set gdbserver_reconnect_p 1
 if { [info proc gdb_reconnect] == "" } {
     return 0
 }
@@ -32,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] != "" } {
@@ -57,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 ""
@@ -81,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 ""