Re: [committed][gdb/testsuite] Fix tcl error in jit-elf-helpers.exp

[Tom de Vries <tdevries@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 869 bytes --]

On 24-05-2020 16:24, Simon Marchi wrote:
> On 2020-05-12 8:43 a.m., Tom de Vries wrote:
>> @@ -94,8 +96,10 @@ proc compile_and_download_n_jit_so {jit_solib_basename jit_solib_srcfile count}
>>  	    additional_flags=-DFUNCTION_NAME=[format "jit_function_%04d" $i] \
>>  	    additional_flags=-Xlinker \
>>  	    additional_flags=-Ttext-segment=$addr]
>> -	if { [gdb_compile_shlib ${jit_solib_srcfile} ${binfile} $options] != "" } {
>> -	    untested "failed to compile ${jit_solib_basename}.c as a shared library"
>> +	if { [gdb_compile_shlib ${jit_solib_srcfile} ${binfile} \
>> +		  $options] != "" } {
>> +	    set f [file tail $binfile]
>> +	    untested "failed to compile shared library $binfile"
>>  	    return -1
> 
> I just noticed, should it be `$f` instead of `$binfile` here?

Yes, thanks for noticing.

Fixed in attached patch, committed.

Thanks,
- Tom


[-- Attachment #2: 0001-gdb-testsuite-Fix-var-use-in-compile_and_download_n_jit_so.patch --]
[-- Type: text/x-patch, Size: 1317 bytes --]

[gdb/testsuite] Fix var use in compile_and_download_n_jit_so

In commit 1b59ca1cf1 "[gdb/testsuite] Fix tcl error in jit-elf-helpers.exp", I
introduced a variable f in compile_and_download_n_jit_so, to be used in the
untested message, but actually variable binfile was used instead:
...
+           set f [file tail $binfile]
+           untested "failed to compile shared library $binfile"
...

Fix this by using $f in the untested message.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2020-05-25  Tom de Vries  <tdevries@suse.de>

	* lib/jit-elf-helpers.exp (compile_and_download_n_jit_so): Use $f
	instead of $binfile in the untested message.

---
 gdb/testsuite/lib/jit-elf-helpers.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/lib/jit-elf-helpers.exp b/gdb/testsuite/lib/jit-elf-helpers.exp
index 62672f4ab3..f1e8ad7785 100644
--- a/gdb/testsuite/lib/jit-elf-helpers.exp
+++ b/gdb/testsuite/lib/jit-elf-helpers.exp
@@ -99,7 +99,7 @@ proc compile_and_download_n_jit_so {jit_solib_basename jit_solib_srcfile count}
 	if { [gdb_compile_shlib ${jit_solib_srcfile} ${binfile} \
 		  $options] != "" } {
 	    set f [file tail $binfile]
-	    untested "failed to compile shared library $binfile"
+	    untested "failed to compile shared library $f"
 	    return -1
 	}