bfd/

[thirdparty/binutils-gdb.git] / gdb / testsuite / gdb.base / so-impl-ld.exp

diff --git a/gdb/testsuite/gdb.base/so-impl-ld.exp b/gdb/testsuite/gdb.base/so-impl-ld.exp
index 7bf2e16145f44b3ab674c0184208351108f64210..1d11716c183aa2b02489c7ec6f1698ca7876938c 100644 (file)
--- a/gdb/testsuite/gdb.base/so-impl-ld.exp
+++ b/gdb/testsuite/gdb.base/so-impl-ld.exp
@@ -1,30 +1,26 @@
-# Copyright 1997, 1998, 1999, 2000, 2001, 2003, 2005
+# Copyright 1997, 1998, 1999, 2000, 2001, 2003, 2005, 2007, 2008, 2009, 2010
 # 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,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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/>.
 
 if $tracelevel then {
        strace $tracelevel
        }
 
-set prms_id 0
-set bug_id 0
 
-# are we on a target board
-if ![isnative] then {
-    return
+if {[skip_shlib_tests]} {
+    return 0
 }
 
 set testfile "so-impl-ld"
@@ -61,6 +57,7 @@ gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
+gdb_load_shlibs $lib_sl
 
 # This program implicitly loads SOM shared libraries.
 #
@@ -68,59 +65,30 @@ if ![runto_main] then { fail "implicit solibs tests suppressed" }
 
 # Verify that we can step over the first shlib call.
 #
-send_gdb "next\n"
-gdb_expect {
-  -re "21\[ \t\]*result = solib_main .result.*$gdb_prompt $"\
-          {pass "step over solib call"}
-  -re "$gdb_prompt $"\
-          {fail "step over solib call"}
-  timeout {fail "(timeout) step over solib call"}
-}
+gdb_test "next" "21\[ \t\]*result = solib_main .result.;" \
+    "step over solib call"
 
 # Verify that we can step into the second shlib call.
 #
-send_gdb "step\n"
-gdb_expect {
-  -re "solib_main .arg=10000. at.*${libfile}.c:17.*$gdb_prompt $"\
-          {pass "step into solib call"}
-  -re "$gdb_prompt $"\
-          {fail "step into solib call"}
-  timeout {fail "(timeout) step into solib call"}
-}
+gdb_test "step" "solib_main .arg=10000. at.*${libfile}.c:17.*" \
+    "step into solib call"
 
 # Verify that we can step within the shlib call.
 #
-send_gdb "next\n"
-gdb_expect {
-  -re "18\[ \t\]*\}.*$gdb_prompt $"\
-          {pass "step in solib call"}
-  -re "$gdb_prompt $"\
-          {fail "step in solib call"}
-  timeout {fail "(timeout) step in solib call"}
-}
+gdb_test "next" "18\[ \t\]*\}" "step in solib call"
 
 # Verify that we can step out of the shlib call, and back out into
 # the caller.
 #
-send_gdb "next\n"
-gdb_expect {
+gdb_test_multiple "next" "step out of solib call" {
     -re "0x\[0-9a-f\]*\[ \t\]*9\[ \t\]*.*$gdb_prompt $" {
-       # we haven't left the callee yet, so do another next
-       send_gdb "next\n"
-       gdb_expect {
-           -re "main .. at.*so-impl-ld.c:22.*$gdb_prompt $"\
-               {pass "step out of solib call"}
-           -re "$gdb_prompt $"\
-               {fail "step out of solib call"}
-           timeout {fail "(timeout) step out of solib call"}
-       }
+       gdb_test "next" \
+           "main .. at.*so-impl-ld.c:22.*" \
+           "step out of solib call"
+    }
+    -re "main .. at.*so-impl-ld.c:22.*$gdb_prompt $" {
+       pass "step out of solib call"
     }
-
-    -re "main .. at.*so-impl-ld.c:22.*$gdb_prompt $"\
-       {pass "step out of solib call"}
-    -re "$gdb_prompt $"\
-       {fail "step out of solib call"}
-    timeout {fail "(timeout) step out of solib call"}
 }
 
 gdb_exit