diff options
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/gdb.base/break.exp | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/scope.exp | 11 |
2 files changed, 8 insertions, 11 deletions
diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp index 7795b48..42d7824 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -128,7 +128,7 @@ if [istarget "mips-idt-*"] then { # # run until the breakpoint at main is hit # -if [istarget "*-*-vxworks"] then { +if [istarget "*-*-vxworks*"] then { send "run vxmain \"2\"\n" set timeout 120 } else { @@ -144,7 +144,7 @@ expect { # # 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" # @@ -298,7 +298,7 @@ proc test_next_with_recursion {} { # Run until we call factorial with 6 - if [istarget "*-*-vxworks"] then { + if [istarget "*-*-vxworks*"] then { send "run vxmain \"6\"\n" } else { send "run\n" @@ -370,7 +370,7 @@ test_clear_command test_next_with_recursion # Reset the default arguments for VxWorks -if [istarget "*-*-vxworks"] then { +if [istarget "*-*-vxworks*"] then { set timeout 10 send "set args main\n" expect -re ".*$prompt $" {} diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp index 972a22e..e2b1c05 100644 --- a/gdb/testsuite/gdb.base/scope.exp +++ b/gdb/testsuite/gdb.base/scope.exp @@ -198,7 +198,6 @@ proc test_at_main {} { # Print scope1.c::foo::funclocal, which is 3 - setup_xfail "mips-*-*" 1843 send "print foo::funclocal\n" expect { -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" expect { -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 - setup_xfail "mips-*-*" 1843 send "print foo::funclocal\n" expect { -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 # there's no way to check that. - setup_xfail "mips-*-*" 1868 setup_xfail "a29k-*-udi" 2423 send "cont\n" expect { -re "Break.* marker4.*at .*:$decimal.*$prompt $" { + pass "continue to marker4" send "up\n" expect { - -re ".*$prompt $" {} + -re ".*$prompt $" { pass "up from marker4" } timeout { fail "up from marker4" ; return } } } @@ -1035,7 +1032,7 @@ gdb_start gdb_reinitialize_dir $srcdir/$subdir gdb_load $objdir/$subdir/$binfile -if [istarget "*-*-vxworks"] { +if [istarget "*-*-vxworks*"] { set timeout 120 } @@ -1106,6 +1103,6 @@ if [istarget "mips-idt-*"] then { } if [runto autovars] then { test_at_autovars } -if [istarget "*-*-vxworks"] { +if [istarget "*-*-vxworks*"] { set timeout 120 } |