[gdb/testsuite] Fix gdb.fortran/call-no-debug.exp symbol search

[thirdparty/binutils-gdb.git] / gdb / testsuite / gdb.fortran / call-no-debug.exp

diff --git a/gdb/testsuite/gdb.fortran/call-no-debug.exp b/gdb/testsuite/gdb.fortran/call-no-debug.exp
index 82bf32c82c701213218cbf4efd23f00a673da657..a5e982533fde12933e25489d5cae0e37cf4f70ca 100644 (file)
--- a/gdb/testsuite/gdb.fortran/call-no-debug.exp
+++ b/gdb/testsuite/gdb.fortran/call-no-debug.exp
@@ -28,11 +28,6 @@ if {[prepare_for_testing_full "failed to prepare" \
     return -1
 }
 
-if ![fortran_runto_main] {
-    untested "could not run to main"
-    return -1
-}
-
 # Find a possibly mangled version of NAME, a function we want to call
 # that has no debug information available.  We hope that the mangled
 # version of NAME contains the pattern NAME, and so we use 'info
@@ -67,12 +62,22 @@ proc find_mangled_name { name } {
     return $symbol_name
 }
 
+# Sample before before starting the exec, in order to avoid picking up symbols
+# from shared libs.
+set some_func [find_mangled_name "some_func"]
+set string_func [find_mangled_name "string_func"]
+
+if ![fortran_runto_main] {
+    untested "could not run to main"
+    return -1
+}
+
 # Call the function SOME_FUNC, that takes a single integer and returns
 # an integer.  As the function has no debug information then we have
 # to pass the integer argument as '&1' so that GDB will send the
 # address of an integer '1' (as Fortran arguments are pass by
 # reference).
-set symbol_name [find_mangled_name "some_func"]
+set symbol_name $some_func
 if { $symbol_name == "" } {
     untested "couldn't find suitable name for 'some_func'"
 } else {
@@ -91,7 +96,7 @@ if { $symbol_name == "" } {
 # The compiled program is expecting the address of the string, so we
 # prefix that argument with '&', but the artificial length parameter
 # is pass by value, so there's no need for '&' in that case.
-set symbol_name [find_mangled_name "string_func"]
+set symbol_name $string_func
 if { $symbol_name == "" } {
     untested "couldn't find suitable name for 'string_func'"
 } else {