From e11a2ebb8e44b75fad8c520a170dcce6254c5164 Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Mon, 19 Jun 2023 19:09:58 +0200
Subject: [PATCH] Revert "[gdb/testsuite] Clean standard_output_file dir in
 gdb_init"

This reverts commit b7b77500dc56e5bc21473dd4f3dde2543d894557.
---
 gdb/testsuite/gdb.ada/call-no-debug.exp | 5 +++++
 gdb/testsuite/lib/gdb.exp               | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/call-no-debug.exp b/gdb/testsuite/gdb.ada/call-no-debug.exp
index 422b83761d9..df81c87ade2 100644
--- a/gdb/testsuite/gdb.ada/call-no-debug.exp
+++ b/gdb/testsuite/gdb.ada/call-no-debug.exp
@@ -21,6 +21,11 @@ require allow_ada_tests
 
 standard_ada_testfile prog
 
+# Since we use no-force to compile prog, make sure we don't pick up files
+# from a previous compilation.
+remote_file host delete [standard_output_file prog.o]
+remote_file host delete [standard_output_file prog.ali]
+
 # Compile pck without debuginfo but prog with it.
 if {[gdb_compile_ada $srcdir/$subdir/$testdir/pck.adb \
 	 [standard_output_file pck.o] object {}] != ""} {
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 741b851b900..f214a6bb54d 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -6420,9 +6420,6 @@ proc default_gdb_init { test_file_name } {
 
     set gdb_test_file_name [file rootname [file tail $test_file_name]]
 
-    # Clean directory containing the standard output files.
-    remote_exec build "rm -rf [standard_output_file ""]"
-
     # Make sure that the wrapper is rebuilt
     # with the appropriate multilib option.
     if { $gdb_wrapper_target != [current_target_name] } {
-- 
2.11.4.GIT