Change argument to istarget from "*-*-vxworks" to "*-*-vxworks*".

This commit is contained in:
David Edelsohn
1995-03-22 04:52:25 +00:00
parent 1c2258cc42
commit e965bc396d
2 changed files with 8 additions and 11 deletions

View File

@ -128,7 +128,7 @@ if [istarget "mips-idt-*"] then {
# #
# run until the breakpoint at main is hit # run until the breakpoint at main is hit
# #
if [istarget "*-*-vxworks"] then { if [istarget "*-*-vxworks*"] then {
send "run vxmain \"2\"\n" send "run vxmain \"2\"\n"
set timeout 120 set timeout 120
} else { } else {
@ -144,7 +144,7 @@ expect {
# #
# run until the breakpoint at a line number # run until the breakpoint at a line number
# #
gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:60.*60\[\t \]+printf.*factorial" \ gdb_test continue "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:60.*60\[\t \]+printf.*factorial.*" \
"run until breakpoint set at a line number" "run until breakpoint set at a line number"
# #
@ -298,7 +298,7 @@ proc test_next_with_recursion {} {
# Run until we call factorial with 6 # Run until we call factorial with 6
if [istarget "*-*-vxworks"] then { if [istarget "*-*-vxworks*"] then {
send "run vxmain \"6\"\n" send "run vxmain \"6\"\n"
} else { } else {
send "run\n" send "run\n"
@ -370,7 +370,7 @@ test_clear_command
test_next_with_recursion test_next_with_recursion
# Reset the default arguments for VxWorks # Reset the default arguments for VxWorks
if [istarget "*-*-vxworks"] then { if [istarget "*-*-vxworks*"] then {
set timeout 10 set timeout 10
send "set args main\n" send "set args main\n"
expect -re ".*$prompt $" {} expect -re ".*$prompt $" {}

View File

@ -198,7 +198,6 @@ proc test_at_main {} {
# Print scope1.c::foo::funclocal, which is 3 # Print scope1.c::foo::funclocal, which is 3
setup_xfail "mips-*-*" 1843
send "print foo::funclocal\n" send "print foo::funclocal\n"
expect { expect {
-re "\\\$$decimal = 3\r\n$prompt $" { pass "print foo::funclocal" } -re "\\\$$decimal = 3\r\n$prompt $" { pass "print foo::funclocal" }
@ -430,7 +429,6 @@ proc test_at_foo {} {
} }
} }
setup_xfail "mips-*-*" 1843
send "print foo::funclocal\n" send "print foo::funclocal\n"
expect { expect {
-re "\\\$$decimal = 3\r\n$prompt $" { pass "print foo::funclocal" } -re "\\\$$decimal = 3\r\n$prompt $" { pass "print foo::funclocal" }
@ -688,7 +686,6 @@ proc test_at_bar {} {
# Print scope1.c::foo::funclocal, which is 3 # Print scope1.c::foo::funclocal, which is 3
setup_xfail "mips-*-*" 1843
send "print foo::funclocal\n" send "print foo::funclocal\n"
expect { expect {
-re "\\\$$decimal = 3\r\n$prompt $" { pass "print foo::funclocal" } -re "\\\$$decimal = 3\r\n$prompt $" { pass "print foo::funclocal" }
@ -983,14 +980,14 @@ proc test_at_localscopes {} {
# This test will only fail if the file was compiled by gcc, but # This test will only fail if the file was compiled by gcc, but
# there's no way to check that. # there's no way to check that.
setup_xfail "mips-*-*" 1868
setup_xfail "a29k-*-udi" 2423 setup_xfail "a29k-*-udi" 2423
send "cont\n" send "cont\n"
expect { expect {
-re "Break.* marker4.*at .*:$decimal.*$prompt $" { -re "Break.* marker4.*at .*:$decimal.*$prompt $" {
pass "continue to marker4"
send "up\n" send "up\n"
expect { expect {
-re ".*$prompt $" {} -re ".*$prompt $" { pass "up from marker4" }
timeout { fail "up from marker4" ; return } timeout { fail "up from marker4" ; return }
} }
} }
@ -1035,7 +1032,7 @@ gdb_start
gdb_reinitialize_dir $srcdir/$subdir gdb_reinitialize_dir $srcdir/$subdir
gdb_load $objdir/$subdir/$binfile gdb_load $objdir/$subdir/$binfile
if [istarget "*-*-vxworks"] { if [istarget "*-*-vxworks*"] {
set timeout 120 set timeout 120
} }
@ -1106,6 +1103,6 @@ if [istarget "mips-idt-*"] then {
} }
if [runto autovars] then { test_at_autovars } if [runto autovars] then { test_at_autovars }
if [istarget "*-*-vxworks"] { if [istarget "*-*-vxworks*"] {
set timeout 120 set timeout 120
} }