MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[gdb/testsuite] Fix "text file busy" errors with cc-with-tweaks.exp

Browse Source 
When using target board cc-with-gdb-index.exp and running tests in parallel,
we run into:
...
gdb compile failed, gdb/contrib/gdb-add-index.sh: line 86: \
  build/gdb/testsuite/gdb.sh: Text file busy
...

The problem is that because of the parallel test run, gdb.sh is created for
every single test-case, and eventually gdb.sh is overwritten while being
executed.

Fix this by creating gdb.sh only once.

Tested on x86_64-linux with target board cc-with-gdb-index.exp, using both a
serial and parallel -j 5 test run.

gdb/testsuite/ChangeLog:

2020-03-06  Tom de Vries  <tdevries@suse.de>

	* lib/gdb.exp (tentative_rename, cached_file): New proc.
	* boards/cc-with-tweaks.exp: Use cached_file to create gdb.sh.
This commit is contained in:
Tom de Vries 2020-03-06 18:03:01 +01:00
parent 31bf18645d
commit 436b5e99c8
3 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2020-03-06 Tom de Vries <tdevries@suse.de>
* lib/gdb.exp (tentative_rename, cached_file): New proc.
* boards/cc-with-tweaks.exp: Use cached_file to create gdb.sh.
2020-03-06 Tom de Vries <tdevries@suse.de>
* README: Fix "the the".

6
gdb/testsuite/boards/cc-with-tweaks.exp
View File

@ -69,7 +69,5 @@ if ![info exists F77_FOR_TARGET] {
}
set F77_FOR_TARGET "$contrib_dir/cc-with-tweaks.sh $CC_WITH_TWEAKS_FLAGS $F77_FOR_TARGET"
set pwd [exec pwd -P]
exec echo $GDB $INTERNAL_GDBFLAGS $GDBFLAGS \"\$@\" > $pwd/gdb.sh
exec chmod +x gdb.sh
set env(GDB) $pwd/gdb.sh
set env(GDB) \
[cached_file gdb.sh "$GDB $INTERNAL_GDBFLAGS $GDBFLAGS \"\$@\"" 1]

42
gdb/testsuite/lib/gdb.exp
View File

@ -4929,6 +4929,48 @@ proc standard_temp_file {basename} {
return [file join $dir $basename]
}
# Rename file A to file B, if B does not already exists. Otherwise, leave B
# as is and delete A. Return 1 if rename happened.
proc tentative_rename { a b } {
global errorInfo errorCode
set code [catch {file rename -- $a $b} result]
if { $code == 1 && [lindex $errorCode 0] == "POSIX" \
&& [lindex $errorCode 1] == "EEXIST" } {
file delete $a
return 0
}
if {$code == 1} {
return -code error -errorinfo $errorInfo -errorcode $errorCode $result
} elseif {$code > 1} {
return -code $code $result
}
return 1
}
# Create a file with name FILENAME and contents TXT in the cache directory.
# If EXECUTABLE, mark the new file for execution.
proc cached_file { filename txt {executable 0}} {
set filename [make_gdb_parallel_path cache $filename]
if { [file exists $filename] } {
return $filename
}
set tmp_filename $filename.[pid]
set fd [open $tmp_filename w]
puts $fd $txt
close $fd
if { $executable } {
exec chmod +x $tmp_filename
}
tentative_rename $tmp_filename $filename
return $filename
}
# Set 'testfile', 'srcfile', and 'binfile'.
#
# ARGS is a list of source file specifications.