diff options
| author | Tom de Vries <tdevries@suse.de> | 2020-05-12 14:59:01 +0200 |
|---|---|---|
| committer | Tom de Vries <tdevries@suse.de> | 2020-05-12 14:59:01 +0200 |
| commit | c7c663418085fa497603bb04bb146a70010aade1 (patch) | |
| tree | be6405ec293c8d348a9f16be12511418fb726737 | |
| parent | 1b59ca1cf1905a2c0d0b7e2e5ca8145bc0b39385 (diff) | |
| download | gdb-c7c663418085fa497603bb04bb146a70010aade1.zip gdb-c7c663418085fa497603bb04bb146a70010aade1.tar.gz gdb-c7c663418085fa497603bb04bb146a70010aade1.tar.bz2 | |
[gdb/testsuite] Fix incorrect string concat in jit-elf.exp
When running test-case gdb.base/jit-elf.exp with target board
cc-with-gdb-index, we get:
...
spawn -ignore SIGHUP gdb/contrib/cc-with-tweaks.sh -i gcc \
-fno-stack-protector src/gdb/testsuite/gdb.base/jit-elf-main.c \
-fdiagnostics-color=never -DATTACH=1 -DLOAD_ADDRESS=0x7000000 \
-DLOAD_INCREMENT=0x1000000 -g -lm \
-o outputs/gdb.base/jit-elf/jit-elf-main"-attach"^M
outputs/gdb.base/jit-elf/.tmp/jit-elf-main-attach: \
No such file or directory.^M
output is:
outputs/gdb.base/jit-elf/.tmp/jit-elf-main-attach: \
No such file or directory.^M
gdb compile failed, outputs/gdb.base/jit-elf/.tmp/jit-elf-main-attach: \
No such file or directory.
UNTESTED: gdb.base/jit-elf.exp: failed to compile jit-elf-main"-attach"
...
The problem is a string concat in jit-elf.exp:
...
${main_binfile}"-attach"
...
which is intended to generate string 'jit-elf-main-attach' but instead
generates string 'jit-elf-main"-attach"'.
Fix this by using "${main_binfile}-attach" instead.
Tested on x86_64-linux.
gdb/testsuite/ChangeLog:
2020-05-12 Tom de Vries <tdevries@suse.de>
* gdb.base/jit-elf.exp: Fix string concat.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/jit-elf.exp | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8e7af0b..cd8440d 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2020-05-12 Tom de Vries <tdevries@suse.de> + * gdb.base/jit-elf.exp: Fix string concat. + +2020-05-12 Tom de Vries <tdevries@suse.de> + * lib/jit-elf-helpers.exp: Don't use undefined variables in untested messages. diff --git a/gdb/testsuite/gdb.base/jit-elf.exp b/gdb/testsuite/gdb.base/jit-elf.exp index 68196a0..78a19c2 100644 --- a/gdb/testsuite/gdb.base/jit-elf.exp +++ b/gdb/testsuite/gdb.base/jit-elf.exp @@ -147,7 +147,7 @@ if { [compile_jit_main ${main_srcfile} ${main_binfile} {}] == 0 } { # registered. We reuse the normal test, and detach/reattach at # specific interesting points. if {[can_spawn_for_attach]} { - if { [compile_jit_main ${main_srcfile} ${main_binfile}"-attach" \ + if { [compile_jit_main ${main_srcfile} "${main_binfile}-attach" \ {additional_flags=-DATTACH=1}] == 0 } { with_test_prefix attach { one_jit_test $jit_solibs_target "${hex} jit_function_0001\[\r\n\]+${hex} jit_function_0002" 1 @@ -155,7 +155,8 @@ if {[can_spawn_for_attach]} { } } -if { [compile_jit_main ${main_srcfile} ${main_binfile}"-pie" {additional_flags=-fPIE ldflags=-pie}] == 0 } { +if { [compile_jit_main ${main_srcfile} "${main_binfile}-pie" \ + {additional_flags=-fPIE ldflags=-pie}] == 0 } { with_test_prefix PIE { one_jit_test [lindex $jit_solibs_target 0] "${hex} jit_function_0001" 0 } |