OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb/testsuite/ 

* gdb.xml/tdesc-arch.exp, gdb.xml/tdesc-regs.exp: Rewrite file
	creation to support remote host testing.
This commit is contained in:
Daniel Jacobowitz 2010-02-16 21:26:48 +00:00
parent 67bdab6cc5
commit d252f7e5ab
3 changed files with 22 additions and 11 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 @@
2010-02-16 Daniel Jacobowitz <dan@codesourcery.com>
* gdb.xml/tdesc-arch.exp, gdb.xml/tdesc-regs.exp: Rewrite file
creation to support remote host testing.
2010-02-16 Daniel Jacobowitz <dan@codesourcery.com> 2010-02-16 Daniel Jacobowitz <dan@codesourcery.com>
* gdb.base/valgrind-db-attach.exp: Use unsupported instead of xfail. * gdb.base/valgrind-db-attach.exp: Use unsupported instead of xfail.

13
gdb/testsuite/gdb.xml/tdesc-arch.exp
View File

@ -58,13 +58,15 @@ if { "$arch1" == "" || "$arch2" == "" || "$default_arch" == "" } {
proc set_arch { arch which } { proc set_arch { arch which } {
global gdb_prompt global gdb_prompt
global subdir
set fd [open "tdesc-arch.xml" w] set fd [open "$subdir/tdesc-arch.xml" w]
puts $fd \ puts $fd \
"<target> "<target>
<architecture>$arch</architecture> <architecture>$arch</architecture>
</target>" </target>"
close $fd close $fd
remote_download host "${subdir}/tdesc-arch.xml" "tdesc-arch.xml"
# Anchor the test output, so that error messages are detected. # Anchor the test output, so that error messages are detected.
set cmd "set tdesc filename tdesc-arch.xml" set cmd "set tdesc filename tdesc-arch.xml"
@ -84,19 +86,21 @@ proc set_arch { arch which } {
"The target architecture is set automatically \\(currently $arch\\)" \ "The target architecture is set automatically \\(currently $arch\\)" \
"$cmd ($which architecture)" "$cmd ($which architecture)"
file delete "tdesc-arch.xml" file delete "${subdir}/tdesc-arch.xml"
remote_file host delete "tdesc-arch.xml"
} }
set_arch $arch1 first set_arch $arch1 first
set_arch $arch2 second set_arch $arch2 second
# Check an invalid architecture setting. # Check an invalid architecture setting.
set fd [open "tdesc-arch.xml" w] set fd [open "${subdir}/tdesc-arch.xml" w]
puts $fd \ puts $fd \
"<target> "<target>
<architecture>invalid</architecture> <architecture>invalid</architecture>
</target>" </target>"
close $fd close $fd
remote_download host "$subdir/tdesc-arch.xml" "tdesc-arch.xml"
set cmd "set tdesc filename tdesc-arch.xml" set cmd "set tdesc filename tdesc-arch.xml"
gdb_test $cmd \ gdb_test $cmd \
@ -108,4 +112,5 @@ gdb_test $cmd \
"The target architecture is set automatically \\(currently $default_arch\\)" \ "The target architecture is set automatically \\(currently $default_arch\\)" \
"$cmd (invalid architecture)" "$cmd (invalid architecture)"
file delete "tdesc-arch.xml" file delete "${subdir}/tdesc-arch.xml"
remote_file host delete "tdesc-arch.xml"

15
gdb/testsuite/gdb.xml/tdesc-regs.exp
View File

@ -80,8 +80,7 @@ gdb_test "set tdesc file $srcdir/$subdir/single-reg.xml" \
# Copy the core registers into the objdir if necessary, so that they # Copy the core registers into the objdir if necessary, so that they
# will be found by <xi:include>. # will be found by <xi:include>.
foreach src ${core-regs} { foreach src ${core-regs} {
file delete "$src" set file [remote_download host "$srcdir/../features/$regdir$src" "$src"]
file copy "$srcdir/../features/$regdir$src" "$src"
} }
# Similarly, we need to copy files under test into the objdir. # Similarly, we need to copy files under test into the objdir.
@ -91,9 +90,9 @@ proc load_description { file errmsg } {
global gdb_prompt global gdb_prompt
global core-regs global core-regs
file delete "regs.xml" file delete "$subdir/regs.xml"
set ifd [open "$srcdir/$subdir/$file" r] set ifd [open "$srcdir/$subdir/$file" r]
set ofd [open "regs.xml" w] set ofd [open "$subdir/regs.xml" w]
while {[gets $ifd line] >= 0} { while {[gets $ifd line] >= 0} {
if {[regexp {<xi:include href="core-regs.xml"/>} $line]} { if {[regexp {<xi:include href="core-regs.xml"/>} $line]} {
foreach src ${core-regs} { foreach src ${core-regs} {
@ -105,16 +104,19 @@ proc load_description { file errmsg } {
} }
close $ifd close $ifd
close $ofd close $ofd
remote_download host "$subdir/regs.xml" "regs.xml"
file delete "$subdir/regs.xml"
# Anchor the test output, so that error messages are detected. # Anchor the test output, so that error messages are detected.
set cmd "set tdesc filename regs.xml" set cmd "set tdesc filename regs.xml"
set msg "set tdesc filename $file" set msg "set tdesc filename regs.xml - from $file"
set cmd_regex [string_to_regexp $cmd] set cmd_regex [string_to_regexp $cmd]
gdb_test_multiple $cmd $msg { gdb_test_multiple $cmd $msg {
-re "^$cmd_regex\r\n$errmsg$gdb_prompt $" { -re "^$cmd_regex\r\n$errmsg$gdb_prompt $" {
pass $msg pass $msg
} }
} }
remote_file host delete "regs.xml"
} }
load_description "extra-regs.xml" "" load_description "extra-regs.xml" ""
@ -130,6 +132,5 @@ load_description "core-only.xml" ""
gdb_test "ptype \$extrareg" "type = void" gdb_test "ptype \$extrareg" "type = void"
foreach src ${core-regs} { foreach src ${core-regs} {
file delete "$src" remote_file host delete "$src"
} }
file delete "regs.xml"