From 1df42e90836a542aa16b2f89b22810d264bb3882 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Mon, 2 Aug 2021 15:31:51 +0200 Subject: [PATCH] [gdb/testsuite] Fix gdb.dwarf2/per-bfd-sharing.exp with cc-with-gdb-index When running with target board cc-with-gdb-index, we run into: ... rm: cannot remove '/tmp/tmp.JmYTeiuFjj/*.gdb-index': \ No such file or directory^M FAIL: gdb.dwarf2/per-bfd-sharing.exp: \ couldn't remove files in temporary cache dir ... Fix this, as in gdb.base/index-cache.exp, by only FAILing when $expecting_index_cache_use. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2021-08-02 Tom de Vries * gdb.dwarf2/per-bfd-sharing.exp: Only expect index-cache files when $expecting_index_cache_use. --- gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp b/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp index 48a30fa741c..6891cd77446 100644 --- a/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp +++ b/gdb/testsuite/gdb.dwarf2/per-bfd-sharing.exp @@ -23,6 +23,10 @@ if { [build_executable "failed to prepare" $testfile $srcfile \ return } +set has_index_section [exec_has_index_section $binfile] +set uses_readnow [expr [string first "-readnow" $GDBFLAGS] != -1] +set expecting_index_cache_use [expr !$has_index_section && !$uses_readnow] + lassign [remote_exec host mktemp -d] ret cache_dir # The output of mktemp contains an end of line, remove it. @@ -93,7 +97,7 @@ foreach_with_prefix first $methods { } lassign [remote_exec host sh "-c \"rm $cache_dir/*.gdb-index\""] ret -if { $ret != 0 } { +if { $ret != 0 && $expecting_index_cache_use } { fail "couldn't remove files in temporary cache dir" return } -- 2.30.2