gdb/testsuite/

	* gdb.base/break-interp.exp: Remove $exec.debug safety removal.
	* gdb.base/sepdebug.exp: Remove .debug subdirectory handling.  New
	variable different_dir. Move debugfile into a full directory pathname
	under DIFFERENT_DIR.
	* lib/gdb.exp (separate_debug_filename): Remove.
	(gdb_gnu_strip_debug): No longer call separate_debug_filename.  Remove
	variable debug_dir and mkdir of it.  Update function comments.

2 files changed, 10 insertions, 11 deletions

diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp
index 86844ee..1fade4e 100644
--- a/gdb/testsuite/gdb.base/break-interp.exp
+++ b/gdb/testsuite/gdb.base/break-interp.exp
@@ -636,10 +636,6 @@ foreach ldprelink {NO YES} {
 		    }
 		    if {$binsepdebug == "SEP"} {
 			gdb_gnu_strip_debug $exec
-			# Just a sanity check.  As gdb_gnu_strip_debug uses the
-			# "[file dirname $exec]/.debug/[file tail $exec].debug"
-			# variant delete the higher-priority exec.debug file.
-			file delete "$exec.debug"
 		    }
 
 		    # Supply a self-sufficent directory $dir with the required
diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp
index 5267ffb..6802410 100644
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -50,7 +50,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 # ${binfile}, which is just like the executable ($binfile) but without
 # the debuginfo. Instead $binfile has a .gnudebuglink section which contains
 # the name of a debuginfo only file. This file will be stored in the
-# gdb.base/.debug subdirectory.
+# gdb.base/ subdirectory.
 
 if [gdb_gnu_strip_debug $binfile] {
     # check that you have a recent version of strip and objcopy installed
@@ -946,11 +946,14 @@ proc test_different_dir {type test_different_dir xfail} {
 
 # now move the .debug file to a different location so that we can test
 # the "set debug-file-directory" command.
-  
-remote_exec build "mv ${objdir}/${subdir}/.debug/${testfile}.debug ${objdir}/${subdir}"
-set debugfile "${objdir}/${subdir}/${testfile}.debug"
 
-test_different_dir debuglink "${objdir}/${subdir}" 0
+set different_dir "${objdir}/${subdir}/${testfile}.dir"
+set debugfile "${different_dir}/${objdir}/${subdir}/${testfile}.debug"
+remote_exec build "rm -rf $different_dir"
+remote_exec build "mkdir -p [file dirname $debugfile]"
+remote_exec build "mv -f ${objdir}/${subdir}/${testfile}.debug $debugfile"
+
+test_different_dir debuglink $different_dir 0
 
 
 # Test CRC mismatch is reported.
@@ -958,7 +961,7 @@ test_different_dir debuglink "${objdir}/${subdir}" 0
 if {[build_executable sepdebug.exp sepdebug2 sepdebug2.c debug] != -1
     && ![gdb_gnu_strip_debug ${objdir}/${subdir}/sepdebug2]} {
 
-    remote_exec build "cp ${debugfile} ${objdir}/${subdir}/.debug/sepdebug2.debug"
+    remote_exec build "cp ${debugfile} ${objdir}/${subdir}/sepdebug2.debug"
 
     gdb_exit
     gdb_start
@@ -966,7 +969,7 @@ if {[build_executable sepdebug.exp sepdebug2 sepdebug2.c debug] != -1
 
     set escapedobjdirsubdir [string_to_regexp ${objdir}/${subdir}]
 
-    gdb_test "file ${objdir}/${subdir}/sepdebug2" "warning: the debug information found in \"${escapedobjdirsubdir}/\\.debug/sepdebug2\\.debug\" does not match \"${escapedobjdirsubdir}/sepdebug2\" \\(CRC mismatch\\)\\..*\\(no debugging symbols found\\).*" "CRC mismatch is reported"
+    gdb_test "file ${objdir}/${subdir}/sepdebug2" "warning: the debug information found in \"${escapedobjdirsubdir}/sepdebug2\\.debug\" does not match \"${escapedobjdirsubdir}/sepdebug2\" \\(CRC mismatch\\)\\..*\\(no debugging symbols found\\).*" "CRC mismatch is reported"
 }