From 40b53987702c22f0ce9d5363fc493919517fa70a Mon Sep 17 00:00:00 2001
From: Daniel Jacobowitz <drow@false.org>
Date: Wed, 12 Sep 2007 15:12:53 +0000
Subject: [PATCH] 	* gdb.base/solib-weak.exp (do_test): Adjust the file
 names for each 	test.

---
 gdb/testsuite/ChangeLog               |  5 +++++
 gdb/testsuite/gdb.base/solib-weak.exp | 21 ++++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f999c0c6453..ab73ca5bb3c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-12  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.base/solib-weak.exp (do_test): Adjust the file names for each
+	test.
+
 2007-09-10  Mark Kettenis  <kettenis@gnu.org>
 
 	* lib/gdb.exp (build_id_debug_filename_get): Improve check for
diff --git a/gdb/testsuite/gdb.base/solib-weak.exp b/gdb/testsuite/gdb.base/solib-weak.exp
index 0386de91833..e5fb580e28e 100644
--- a/gdb/testsuite/gdb.base/solib-weak.exp
+++ b/gdb/testsuite/gdb.base/solib-weak.exp
@@ -41,31 +41,38 @@ if {![test_compiler_info "gcc-*"]} {
 proc do_test { lib1opts lib2opts lib1first } {
     global objdir srcdir subdir
 
+    set testfile "solib-weak"
+    set srcfile ${testfile}.c
+
+    set libfile1 "weaklib1"
+    set libfile2 "weaklib2"
+    set lib1src ${srcdir}/${subdir}/${libfile1}.c
+    set lib2src ${srcdir}/${subdir}/${libfile2}.c
+
+    # Select a unique name for this test.  Give each library and
+    # executable a name reflecting its options, so that file caching
+    # on the target system does not pick up the wrong file.
     set testopts ""
     if {$lib1opts == ""} {
 	append testopts "lib1 nodebug, "
     } else {
 	append testopts "lib1 debug, "
+	append lib1 "-dbg"
     }
     if {$lib2opts == ""} {
 	append testopts "lib2 nodebug, "
     } else {
 	append testopts "lib2 debug, "
+	append lib2 "-dbg"
     }
     if {$lib1first} {
 	append testopts "lib1 first"
     } else {
 	append testopts "lib2 first"
+	append testfile "-lib2"
     }
 
-    set testfile "solib-weak"
-    set srcfile ${testfile}.c
     set binfile ${objdir}/${subdir}/${testfile}
-
-    set libfile1 "weaklib1"
-    set libfile2 "weaklib2"
-    set lib1src ${srcdir}/${subdir}/${libfile1}.c
-    set lib2src ${srcdir}/${subdir}/${libfile2}.c
     set lib1 ${objdir}/${subdir}/${libfile1}.sl
     set lib2 ${objdir}/${subdir}/${libfile2}.sl
 
-- 
2.30.2