Commit Message
When I run test with board file local-remote-host-native.exp, I see
the following warning,
$ make check RUNTESTFLAGS="--host_board=local-remote-host-native
--target_board=local-remote-host-native tdesc-arch.exp
HOST_DIR=/tmp/foo/"
(gdb) set tdesc filename ../../../../git/gdb/testsuite/gdb.xml/trivial.xml^M
warning: Could not open "../../../../git/gdb/testsuite/gdb.xml/trivial.xml"
(gdb) quit^
because "${srcdir}/gdb.xml/trivial.xml" doesn't exist on host. This
patch is to copy trivial.xml to host and the warning goes away.
(gdb) set tdesc filename /tmp/foo/trivial.xml^M
(gdb) quit^
tdesc-regs.exp has the similar problem that single-reg.xml may not
exist on host at all, and it should be copied to host too.
gdb/testsuite:
2014-10-16 Yao Qi <yao@codesourcery.com>
* lib/gdb.exp (gdb_skip_xml_test): Copy trivial.xml to host.
* gdb.xml/tdesc-regs.exp: Copy single-reg.xml to host.
---
gdb/testsuite/gdb.xml/tdesc-regs.exp | 8 ++++++--
gdb/testsuite/lib/gdb.exp | 4 +++-
2 files changed, 9 insertions(+), 3 deletions(-)
Comments
On 10/16/2014 02:31 PM, Yao Qi wrote:
> When I run test with board file local-remote-host-native.exp, I see
> the following warning,
>
> $ make check RUNTESTFLAGS="--host_board=local-remote-host-native
> --target_board=local-remote-host-native tdesc-arch.exp
> HOST_DIR=/tmp/foo/"
>
> (gdb) set tdesc filename ../../../../git/gdb/testsuite/gdb.xml/trivial.xml^M
> warning: Could not open "../../../../git/gdb/testsuite/gdb.xml/trivial.xml"
> (gdb) quit^
>
> because "${srcdir}/gdb.xml/trivial.xml" doesn't exist on host. This
> patch is to copy trivial.xml to host and the warning goes away.
>
> (gdb) set tdesc filename /tmp/foo/trivial.xml^M
> (gdb) quit^
>
> tdesc-regs.exp has the similar problem that single-reg.xml may not
> exist on host at all, and it should be copied to host too.
>
> gdb/testsuite:
>
> 2014-10-16 Yao Qi <yao@codesourcery.com>
>
> * lib/gdb.exp (gdb_skip_xml_test): Copy trivial.xml to host.
> * gdb.xml/tdesc-regs.exp: Copy single-reg.xml to host.
Looks good.
Thanks,
Pedro Alves
Pedro Alves <palves@redhat.com> writes:
>> gdb/testsuite:
>>
>> 2014-10-16 Yao Qi <yao@codesourcery.com>
>>
>> * lib/gdb.exp (gdb_skip_xml_test): Copy trivial.xml to host.
>> * gdb.xml/tdesc-regs.exp: Copy single-reg.xml to host.
>
> Looks good.
Thanks, patch is pushed in.
@@ -75,8 +75,12 @@ switch -glob -- [istarget] {
# support target-defined registers. Verify that we get a warning if
# we try to use them. This not only tests the warning, but also
# reminds maintainers to add test support when they add the feature.
+
+set single_reg_xml [gdb_remote_download host \
+ "$srcdir/$subdir/single-reg.xml"]
+
if {[string equal ${core-regs} ""]} {
- gdb_test "set tdesc file $srcdir/$subdir/single-reg.xml" \
+ gdb_test "set tdesc file $single_reg_xml" \
"warning: Target-supplied registers are not supported.*" \
"set tdesc file single-reg.xml"
unsupported "register tests"
@@ -87,7 +91,7 @@ if {[string equal ${core-regs} ""]} {
# Make sure we reject a description missing standard registers,
# like the PC.
-gdb_test "set tdesc file $srcdir/$subdir/single-reg.xml" \
+gdb_test "set tdesc file $single_reg_xml" \
"warning: Architecture rejected target-supplied description" \
"set tdesc file single-reg.xml"
@@ -4213,9 +4213,11 @@ gdb_caching_proc gdb_skip_xml_test {
global gdb_prompt
global srcdir
+ set xml_file [gdb_remote_download host "${srcdir}/gdb.xml/trivial.xml"]
+
gdb_start
set xml_missing 0
- gdb_test_multiple "set tdesc filename ${srcdir}/gdb.xml/trivial.xml" "" {
+ gdb_test_multiple "set tdesc filename $xml_file" "" {
-re ".*XML support was disabled at compile time.*$gdb_prompt $" {
set xml_missing 1
}