GDB 7.6.50

gdb/testsuite/gdb.reverse/solib-reverse.exp

Index: gdb/testsuite/gdb.reverse/solib-reverse.exp
diff --git a/gdb/testsuite/gdb.reverse/solib-reverse.exp b/gdb/testsuite/gdb.reverse/solib-reverse.exp
index d878a7f6220c2dcbc096c539e34227105e6742a8..898ec2e528f50a78661177c648f2f37e7a7af283 100644
--- a/gdb/testsuite/gdb.reverse/solib-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/solib-reverse.exp
@@ -1,4 +1,4 @@
-# Copyright 2009-2012 Free Software Foundation, Inc.
+# Copyright 2009-2013 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,22 +19,35 @@
 if ![supports_reverse] {
     return
 }
+if {[skip_shlib_tests]} {
+    return
+}
 
 standard_testfile
-set libfile  "shr2"
-set libsrc   ${libfile}.c
-set library  [standard_output_file ${libfile}.sl]
+set lib1file "shr1"
+set lib1src  ${lib1file}.c
+set library1 [standard_output_file ${lib1file}.sl]
+set lib2file "shr2"
+set lib2src  ${lib2file}.c
+set library2 [standard_output_file ${lib2file}.sl]
 
 if [get_compiler_info] {
     return -1
 }
 
-if { [gdb_compile_shlib ${srcdir}/${subdir}/${libsrc} ${library} "debug"] != "" } {
-    untested "Could not compile shared library."
+# Compile the first without debug info so that
+# stepping and reverse stepping doesn't end up inside them.
+if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib1src} ${library1} ""] != "" } {
+    untested "Could not compile shared library1."
+    return -1
+}
+
+if { [gdb_compile_shlib ${srcdir}/${subdir}/${lib2src} ${library2} "debug"] != "" } {
+    untested "Could not compile shared library2."
     return -1
 }
 
-set exec_opts [list debug shlib=${library}]
+set exec_opts [list debug shlib=${library1} shlib=${library2}]
 
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opts] != "" } {
     untested "Could not compile $binfile."
@@ -46,12 +59,17 @@ if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opt
 gdb_exit
 gdb_start
 
-# Clear it to never find any separate system debug infos.
-gdb_test_no_output "set debug-file-directory"
+# Note: The test previously did "set debug-file-directory" to (try to)
+# ensure the debug info for the dynamic loader and libc weren't found.
+# This doesn't work if the debug info is in the .debug subdirectory.
+# Avoiding debug info for system libraries is not germaine to this test
+# and is no longer attempted.  Instead, the test does not make assumptions
+# about whether the debug info is present or not.
 
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
-
+gdb_load_shlibs $library1
+gdb_load_shlibs $library2
 
 runto main
 
@@ -70,15 +88,10 @@ set end_part_one [gdb_get_line_number " end part one" "$srcfile"]
 set end_part_two [gdb_get_line_number " end part two" "$srcfile"]
 gdb_test "until $end_part_one" " end part one.*" "run until end part one"
 
-gdb_test "reverse-step" " sleep three .*" "reverse-step third sleep"
-gdb_test "reverse-step" " sleep two .*"   "reverse-step second sleep"
-gdb_test "reverse-step" " sleep one .*"   \
-		    "reverse-step first sleep, dynsym resolve"
+gdb_test "reverse-step" " shr1 three .*" "reverse-step third shr1"
+gdb_test "reverse-step" " shr1 two .*"   "reverse-step second shr1"
+gdb_test "reverse-step" " shr1 one .*"   "reverse-step first shr1"
 
-gdb_test "reverse-step" " printf three .*" "reverse-step third printf"
-gdb_test "reverse-step" " printf two .*"   "reverse-step second printf"
-gdb_test "reverse-step" " printf one .*"   \
-		    "reverse-step first printf, dynsym resolve"
 gdb_test "reverse-step" " generic statement.*" "reverse-step generic"
 
 
@@ -90,15 +103,10 @@ gdb_test "reverse-step" " generic statement.*" "reverse-step generic"
 
 gdb_test "until $end_part_one" " end part one.*" "forward to end part one"
 
-gdb_test "reverse-next" " sleep three .*" "reverse-next third sleep"
-gdb_test "reverse-next" " sleep two .*"   "reverse-next second sleep"
-gdb_test "reverse-next" " sleep one .*"   \
-		    "reverse-next first sleep, dynsym resolve"
+gdb_test "reverse-next" " shr1 three .*" "reverse-next third shr1"
+gdb_test "reverse-next" " shr1 two .*"   "reverse-next second shr1"
+gdb_test "reverse-next" " shr1 one .*"   "reverse-next first shr1"
 
-gdb_test "reverse-next" " printf three .*" "reverse-next third printf"
-gdb_test "reverse-next" " printf two .*"   "reverse-next second printf"
-gdb_test "reverse-next" " printf one .*"   \
-		    "reverse-next first printf, dynsym resolve"
 gdb_test "reverse-next" " generic statement.*" "reverse-next generic"
 
 
@@ -106,11 +114,11 @@ gdb_test "reverse-next" " generic statement.*" "reverse-next generic"
 # Test reverse-step into debuggable solib function
 #
 
-gdb_test "reverse-step" "${libsrc}.*" "reverse-step into solib function one"
+gdb_test "reverse-step" "${lib2src}.*" "reverse-step into solib function one"
 gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function one"
 gdb_test "reverse-step" " middle part two.*" "reverse-step back to main one"
 
-gdb_test "reverse-step" "${libsrc}.*" "reverse-step into solib function two"
+gdb_test "reverse-step" "${lib2src}.*" "reverse-step into solib function two"
 gdb_test "reverse-step" "return 2.x.*" "reverse-step within solib function two"
 gdb_test "reverse-step" " begin part two.*" "reverse-step back to main two"