diff options
Diffstat (limited to 'gdb/testsuite/gdb.base')
| -rw-r--r-- | gdb/testsuite/gdb.base/foll-exec-mode.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/foll-fork.exp | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/foll-vfork.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/multi-forks.exp | 30 |
4 files changed, 11 insertions, 29 deletions
diff --git a/gdb/testsuite/gdb.base/foll-exec-mode.exp b/gdb/testsuite/gdb.base/foll-exec-mode.exp index ad23cb5..41d788b 100644 --- a/gdb/testsuite/gdb.base/foll-exec-mode.exp +++ b/gdb/testsuite/gdb.base/foll-exec-mode.exp @@ -150,7 +150,7 @@ proc do_follow_exec_mode_tests { mode cmd infswitch } { if {$mode == "same"} { set expected_re "\\* 1.*process.*" } else { - set expected_re "\\* 2.*process.*$testfile2 \r\n 1.*null.*$testfile.*" + set expected_re " 1.*null.*$testfile.*\r\n\\* 2.*process.*$testfile2 .*" } # Check that the inferior list is correct: diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp index bd1df14..61aefc1 100644 --- a/gdb/testsuite/gdb.base/foll-fork.exp +++ b/gdb/testsuite/gdb.base/foll-fork.exp @@ -139,7 +139,7 @@ proc test_follow_fork { who detach cmd } { # Follow parent / keep child: two inferiors under debug, the # parent is the current inferior. - gdb_test "info inferiors" " 2 .*process.*\\* 1 .*process.*" \ + gdb_test "info inferiors" "\\* 1 .*process.* 2 .*process.*" \ "info inferiors" gdb_test "inferior 2" "Switching to inferior 2 .*" @@ -150,14 +150,14 @@ proc test_follow_fork { who detach cmd } { # Follow child / detach parent: the child is under debug and is # the current inferior. The parent is listed but is not under # debug. - gdb_test "info inferiors" "\\* 2 .*process.* 1 .*<null>.*" \ + gdb_test "info inferiors" " 1 .*<null>.*\\* 2 .*process.*" \ "info inferiors" } elseif {$who == "child" && $detach == "off"} { # Follow child / keep parent: two inferiors under debug, the # child is the current inferior. - gdb_test "info inferiors" "\\* 2 .*process.* 1 .*process.*" \ + gdb_test "info inferiors" " 1 .*process.*\\* 2 .*process.*" \ "info inferiors" gdb_test "inferior 1" "Switching to inferior 1 .*" diff --git a/gdb/testsuite/gdb.base/foll-vfork.exp b/gdb/testsuite/gdb.base/foll-vfork.exp index 173a7c3..bf9b893 100644 --- a/gdb/testsuite/gdb.base/foll-vfork.exp +++ b/gdb/testsuite/gdb.base/foll-vfork.exp @@ -345,7 +345,7 @@ proc vfork_relations_in_info_inferiors { variant } { } gdb_test "info inferiors" \ - ".*is vfork child of inferior 1.*is vfork parent of inferior 2" \ + ".*is vfork parent of inferior 2.*is vfork child of inferior 1" \ "info inferiors shows vfork parent/child relation" if { $variant == "exec" } { diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp index 2f3dd86..1eaaa71 100644 --- a/gdb/testsuite/gdb.base/multi-forks.exp +++ b/gdb/testsuite/gdb.base/multi-forks.exp @@ -150,13 +150,13 @@ gdb_test_no_output "set detach off" "set detach off" for {set i 1} {$i <= 15} {incr i} { gdb_test "continue" "Breakpoint .* main .*exit.*" "Run to exit $i" - gdb_test "info inferior" " 5 .* 4 .* 3 .* 2 .*" "info inferior $i" + gdb_test "info inferior" " 2 .* 3 .* 4 .* 5 .*" "info inferior $i" gdb_test "inferior $i + 1" "(_dl_sysinfo_int80|fork|__kernel_(v|)syscall).*" \ "inferior $i" } gdb_test "continue" "Breakpoint .* main .*exit.*" "Run to exit 16" -gdb_test "info inferiors" " 5 .* 4 .* 3 .* 2 .*" "info inferior 16" +gdb_test "info inferior" " 2 .* 3 .* 4 .* 5 .*" "info inferior 16" gdb_test "inferior 2" " main .*" "restart final" # @@ -177,27 +177,9 @@ gdb_test "detach inferior 5" "Detaching .*" "Detach 5" # Test kill inferior # -gdb_test_no_output "kill inferior 6" "Kill 6" -gdb_test "info inferior 6" "<null>.*" "Did kill 6" -gdb_test_no_output "kill inferior 7" "Kill 7" -gdb_test "info inferior 7" "<null>.*" "Did kill 7" -gdb_test_no_output "kill inferior 8" "Kill 8" -gdb_test "info inferior 8" "<null>.*" "Did kill 8" -gdb_test_no_output "kill inferior 9" "Kill 9" -gdb_test "info inferior 9" "<null>.*" "Did kill 9" -gdb_test_no_output "kill inferior 10" "Kill 10" -gdb_test "info inferior 10" "<null>.*" "Did kill 10" -gdb_test_no_output "kill inferior 11" "Kill 11" -gdb_test "info inferior 11" "<null>.*" "Did kill 11" -gdb_test_no_output "kill inferior 12" "Kill 12" -gdb_test "info inferior 12" "<null>.*" "Did kill 12" -gdb_test_no_output "kill inferior 13" "Kill 13" -gdb_test "info inferior 13" "<null>.*" "Did kill 13" -gdb_test_no_output "kill inferior 14" "Kill 14" -gdb_test "info inferior 14" "<null>.*" "Did kill 14" -gdb_test_no_output "kill inferior 15" "Kill 15" -gdb_test "info inferior 15" "<null>.*" "Did kill 15" -gdb_test_no_output "kill inferior 16" "Kill 16" -gdb_test "info inferior 16" "<null>.*" "Did kill 16" +for {set i 6} { $i <= 16} {incr i} { + gdb_test_no_output "kill inferior $i" "Kill $i" + gdb_test "info inferior $i" "<null>.*" "Did kill $i" +} return 0 |