aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog16
-rw-r--r--gdb/testsuite/gdb.reverse/break-precsave.exp12
-rw-r--r--gdb/testsuite/gdb.reverse/break-reverse.exp15
-rw-r--r--gdb/testsuite/gdb.reverse/finish-precsave.exp18
-rw-r--r--gdb/testsuite/gdb.reverse/finish-reverse.exp18
-rw-r--r--gdb/testsuite/gdb.reverse/machinestate-precsave.exp6
-rw-r--r--gdb/testsuite/gdb.reverse/machinestate.exp6
-rw-r--r--gdb/testsuite/gdb.reverse/readv-reverse.exp8
-rw-r--r--gdb/testsuite/gdb.reverse/recvmsg-reverse.exp6
-rw-r--r--gdb/testsuite/gdb.reverse/sigall-precsave.exp14
-rw-r--r--gdb/testsuite/gdb.reverse/sigall-reverse.exp14
-rw-r--r--gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp4
-rw-r--r--gdb/testsuite/gdb.reverse/watch-precsave.exp6
-rw-r--r--gdb/testsuite/gdb.reverse/watch-reverse.exp6
14 files changed, 102 insertions, 47 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 867db05..b78d16f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,21 @@
2019-10-03 Andrew Burgess <andrew.burgess@embecosm.com>
+ * gdb.reverse/break-precsave.exp: Make test names unique.
+ * gdb.reverse/break-reverse.exp: Likewise.
+ * gdb.reverse/finish-precsave.exp: Likewise.
+ * gdb.reverse/finish-reverse.exp: Likewise.
+ * gdb.reverse/machinestate-precsave.exp: Likewise.
+ * gdb.reverse/machinestate.exp: Likewise.
+ * gdb.reverse/readv-reverse.exp: Likewise.
+ * gdb.reverse/recvmsg-reverse.exp: Likewise.
+ * gdb.reverse/sigall-precsave.exp: Likewise.
+ * gdb.reverse/sigall-reverse.exp: Likewise.
+ * gdb.reverse/step-indirect-call-thunk.exp: Likewise.
+ * gdb.reverse/watch-precsave.exp: Likewise.
+ * gdb.reverse/watch-reverse.exp: Likewise.
+
+2019-10-03 Andrew Burgess <andrew.burgess@embecosm.com>
+
* gdb.threads/stop-with-handle.c: New file.
* gdb.threads/stop-with-handle.exp: New file.
diff --git a/gdb/testsuite/gdb.reverse/break-precsave.exp b/gdb/testsuite/gdb.reverse/break-precsave.exp
index 68ac35d..085526b 100644
--- a/gdb/testsuite/gdb.reverse/break-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/break-precsave.exp
@@ -69,8 +69,10 @@ proc precsave_tests {} {
"Breakpoint $decimal at .* line $bar_location\." \
"set breakpoint on bar"
- gdb_continue_to_breakpoint "foo" ".*$srcfile:$foo_location.*"
- gdb_continue_to_breakpoint "bar" ".*$srcfile:$bar_location.*"
+ gdb_continue_to_breakpoint "foo forward after restore" \
+ ".*$srcfile:$foo_location.*"
+ gdb_continue_to_breakpoint "bar forward after restore" \
+ ".*$srcfile:$bar_location.*"
gdb_test_multiple "continue" "go to end of main forward" {
-re ".*Breakpoint $decimal,.*$srcfile:$end_location.*$gdb_prompt $" {
pass "go to end of main forward"
@@ -96,8 +98,10 @@ proc precsave_tests {} {
gdb_test_no_output "set exec-direction forward" "set forward"
- gdb_continue_to_breakpoint "foo" ".*$srcfile:$foo_location.*"
- gdb_continue_to_breakpoint "bar" ".*$srcfile:$bar_location.*"
+ gdb_continue_to_breakpoint "foo forward again" \
+ ".*$srcfile:$foo_location.*"
+ gdb_continue_to_breakpoint "bar forward again" \
+ ".*$srcfile:$bar_location.*"
gdb_test_multiple "continue" "end of record log" {
-re ".*Breakpoint $decimal,.*$srcfile:$end_location.*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.reverse/break-reverse.exp b/gdb/testsuite/gdb.reverse/break-reverse.exp
index c1242c8..602b6e6 100644
--- a/gdb/testsuite/gdb.reverse/break-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/break-reverse.exp
@@ -50,9 +50,12 @@ gdb_test "break $end_location" \
"Breakpoint $decimal at .* line $end_location\." \
"set breakpoint at end of main"
-gdb_continue_to_breakpoint "foo" ".*$srcfile:$foo_location.*"
-gdb_continue_to_breakpoint "bar" ".*$srcfile:$bar_location.*"
-gdb_continue_to_breakpoint "end" ".*$srcfile:$end_location.*"
+gdb_continue_to_breakpoint "foo forward, the first time" \
+ ".*$srcfile:$foo_location.*"
+gdb_continue_to_breakpoint "bar forward, the first time" \
+ ".*$srcfile:$bar_location.*"
+gdb_continue_to_breakpoint "end forward, the first time" \
+ ".*$srcfile:$end_location.*"
gdb_test_no_output "set exec-direction reverse" "set reverse"
@@ -70,8 +73,10 @@ gdb_test_multiple "continue" "main backward" {
gdb_test_no_output "set exec-direction forward" "set forward"
-gdb_continue_to_breakpoint "foo" ".*$srcfile:$foo_location.*"
-gdb_continue_to_breakpoint "bar" ".*$srcfile:$bar_location.*"
+gdb_continue_to_breakpoint "foo forward again" \
+ ".*$srcfile:$foo_location.*"
+gdb_continue_to_breakpoint "bar forward again" \
+ ".*$srcfile:$bar_location.*"
gdb_test_multiple "continue" "end of record log" {
-re ".*Breakpoint $decimal,.*$srcfile:$end_location.*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.reverse/finish-precsave.exp b/gdb/testsuite/gdb.reverse/finish-precsave.exp
index d2a6837..a83decf 100644
--- a/gdb/testsuite/gdb.reverse/finish-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/finish-precsave.exp
@@ -179,7 +179,8 @@ gdb_test_no_output "set exec-dir reverse" "set reverse execution"
# Test reverse finish from long long func
set breakloc [gdb_get_line_number "LONG LONG FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "long_long_func" ".*$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "long_long_func backward" \
+ ".*$srcfile:$breakloc.*"
set test_msg "reverse finish from long_long_func"
gdb_test_multiple "finish" "$test_msg" {
@@ -191,7 +192,8 @@ gdb_test_multiple "finish" "$test_msg" {
# Test reverse finish from long func
set breakloc [gdb_get_line_number "LONG FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "long_func" ".*$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "long_func backward" \
+ ".*$srcfile:$breakloc.*"
set test_msg "reverse finish from long_func"
gdb_test_multiple "finish" "$test_msg" {
@@ -203,7 +205,8 @@ gdb_test_multiple "finish" "$test_msg" {
# Test reverse finish from int func
set breakloc [gdb_get_line_number "INT FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "int_func" ".*$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "int_func backward" \
+ ".*$srcfile:$breakloc.*"
set test_msg "reverse finish from int_func"
gdb_test_multiple "finish" "$test_msg" {
@@ -215,7 +218,8 @@ gdb_test_multiple "finish" "$test_msg" {
# Test reverse finish from short func
set breakloc [gdb_get_line_number "SHORT FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "short_func" ".*$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "short_func backward" \
+ ".*$srcfile:$breakloc.*"
set test_msg "reverse finish from short_func"
gdb_test_multiple "finish" "$test_msg" {
@@ -227,7 +231,8 @@ gdb_test_multiple "finish" "$test_msg" {
# Test reverse finish from char func
set breakloc [gdb_get_line_number "CHAR FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "char_func" ".*$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "char_func backward" \
+ ".*$srcfile:$breakloc.*"
set test_msg "reverse finish from char_func"
gdb_test_multiple "finish" "$test_msg" {
@@ -239,7 +244,8 @@ gdb_test_multiple "finish" "$test_msg" {
# Test reverse finish from void func
set breakloc [gdb_get_line_number "VOID FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "void_func" ".*$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "void_func backward" \
+ ".*$srcfile:$breakloc.*"
set test_msg "reverse finish from void_func"
gdb_test_multiple "finish" "$test_msg" {
diff --git a/gdb/testsuite/gdb.reverse/finish-reverse.exp b/gdb/testsuite/gdb.reverse/finish-reverse.exp
index 73eb287..88bf4cb 100644
--- a/gdb/testsuite/gdb.reverse/finish-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/finish-reverse.exp
@@ -158,7 +158,8 @@ gdb_test_no_output "set exec-dir reverse" "set reverse execution"
# Test reverse finish from long long func
set breakloc [gdb_get_line_number "LONG LONG FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "long_long_func" ".*$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "long_long_func backward" \
+ ".*$srcfile:$breakloc.*"
set test_msg "reverse finish from long_long_func"
gdb_test_multiple "finish" "$test_msg" {
@@ -170,7 +171,8 @@ gdb_test_multiple "finish" "$test_msg" {
# Test reverse finish from long func
set breakloc [gdb_get_line_number "LONG FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "long_func" ".*$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "long_func backward" \
+ ".*$srcfile:$breakloc.*"
set test_msg "reverse finish from long_func"
gdb_test_multiple "finish" "$test_msg" {
@@ -182,7 +184,8 @@ gdb_test_multiple "finish" "$test_msg" {
# Test reverse finish from int func
set breakloc [gdb_get_line_number "INT FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "int_func" ".*$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "int_func backward" \
+ ".*$srcfile:$breakloc.*"
set test_msg "reverse finish from int_func"
gdb_test_multiple "finish" "$test_msg" {
@@ -194,7 +197,8 @@ gdb_test_multiple "finish" "$test_msg" {
# Test reverse finish from short func
set breakloc [gdb_get_line_number "SHORT FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "short_func" ".*$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "short_func backward" \
+ ".*$srcfile:$breakloc.*"
set test_msg "reverse finish from short_func"
gdb_test_multiple "finish" "$test_msg" {
@@ -206,7 +210,8 @@ gdb_test_multiple "finish" "$test_msg" {
# Test reverse finish from char func
set breakloc [gdb_get_line_number "CHAR FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "char_func" ".*$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "char_func backward" \
+ ".*$srcfile:$breakloc.*"
set test_msg "reverse finish from char_func"
gdb_test_multiple "finish" "$test_msg" {
@@ -218,7 +223,8 @@ gdb_test_multiple "finish" "$test_msg" {
# Test reverse finish from void func
set breakloc [gdb_get_line_number "VOID FUNC" "$srcfile"]
-gdb_continue_to_breakpoint "void_func" ".*$srcfile:$breakloc.*"
+gdb_continue_to_breakpoint "void_func backward" \
+ ".*$srcfile:$breakloc.*"
set test_msg "reverse finish from void_func"
gdb_test_multiple "finish" "$test_msg" {
diff --git a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
index a0df7c1..73e02a9 100644
--- a/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/machinestate-precsave.exp
@@ -167,7 +167,8 @@ gdb_test "reverse-continue" ".*$srcfile:$breakloc.*" "reverse to $breakloc"
gdb_test "print a" ".* = 0$newline" "register var reverse-breakpoint"
gdb_test "step" ".* register post-change .*" ""
-gdb_test "print a" ".* = 1$newline" "register var step post-change"
+gdb_test "print a" ".* = 1$newline" \
+ "register var step post-change, first time"
gdb_test "reverse-step" ".*$newline$breakloc.*" ""
gdb_test "print a" ".* = 0$newline" "register var reverse step-to"
@@ -191,7 +192,8 @@ gdb_test "reverse-step" ".*hide.*" ""
gdb_test "step" ".*$newline$breakloc.*" ""
gdb_test "print a" ".* = 0$newline" "register var forward step-to"
gdb_test "step" ".* register post-change .*" ""
-gdb_test "print a" ".* = 1$newline" "register var step post-change"
+gdb_test "print a" ".* = 1$newline" \
+ "register var step post-change, second time"
# Auto variable, forward
diff --git a/gdb/testsuite/gdb.reverse/machinestate.exp b/gdb/testsuite/gdb.reverse/machinestate.exp
index ed65db1..623498f 100644
--- a/gdb/testsuite/gdb.reverse/machinestate.exp
+++ b/gdb/testsuite/gdb.reverse/machinestate.exp
@@ -142,7 +142,8 @@ gdb_test "print a" ".* = 0$newline" "register var reverse-breakpoint"
gdb_test "step" ".* register post-change .*" ""
gdb_test "print a" ".* = 1$newline" "register var step post-change"
gdb_test "reverse-step" ".*$newline$breakloc.*" ""
-gdb_test "print a" ".* = 0$newline" "register var reverse step-to"
+gdb_test "print a" ".* = 0$newline" \
+ "register var reverse step-to, first time"
# Proceed to beginning of main
@@ -164,7 +165,8 @@ gdb_test "reverse-step" ".*hide.*" ""
gdb_test "step" ".*$newline$breakloc.*" ""
gdb_test "print a" ".* = 0$newline" "register var forward step-to"
gdb_test "step" ".* register post-change .*" ""
-gdb_test "print a" ".* = 1$newline" "register var step post-change"
+gdb_test "print a" ".* = 1$newline" \
+ "register var step post-change, second time"
# Auto variable, forward
diff --git a/gdb/testsuite/gdb.reverse/readv-reverse.exp b/gdb/testsuite/gdb.reverse/readv-reverse.exp
index 19ad423..2f16c5c 100644
--- a/gdb/testsuite/gdb.reverse/readv-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/readv-reverse.exp
@@ -52,7 +52,7 @@ gdb_test "reverse-continue" ".*$srcfile:$decimal.*" "reverse to marker1"
# will be remembered. If not, new contents ("NUXI") will be
# used, and the test will fail.
-gdb_test "print (int)buf\[0]" ".* = 0" "check readv record"
-gdb_test "print (int)buf\[1]" ".* = 0" "check readv record"
-gdb_test "print (int)buf\[2]" ".* = 0" "check readv record"
-gdb_test "print (int)buf\[3]" ".* = 0" "check readv record"
+for { set i 0 } { $i < 4 } { incr i } {
+ gdb_test "print (int)buf\[$i]" ".* = 0" \
+ "check readv record for buf\[$i\]"
+}
diff --git a/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp b/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp
index 724927f..9eea3e7 100644
--- a/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/recvmsg-reverse.exp
@@ -55,11 +55,13 @@ gdb_test "reverse-continue" ".*$srcfile:$decimal.*" "reverse to marker1"
gdb_test "print rdata" ".* = \"xxxx\"" "check recvmsg record - rdata"
# rmsg.msg_flags should be zeros, not MSG_TRUNC | MSG_CTRUNC
-gdb_test "print rmsg.msg_flags" ".* = 0" "check recvmsg record - rmsg"
+gdb_test "print rmsg.msg_flags" ".* = 0" \
+ "check recvmsg record - rmsg.msg_flags"
# rmsg.msg_controllen should be sizeof rc, not actual size of control data
# (7 bytes less)
-gdb_test "print rmsg.msg_controllen - sizeof rc" ".* = 0" "check recvmsg record - rmsg"
+gdb_test "print rmsg.msg_controllen - sizeof rc" ".* = 0" \
+ "check recvmsg record - rmsg.msg_controllen"
# rc should be zeros, not received cmsg
gdb_test "print ((struct cmsghdr *)rc)->cmsg_len" ".* = 0" "check recvmsg record - cmsg"
diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
index 79a1e72..371eecd 100644
--- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp
@@ -117,7 +117,7 @@ proc test_one_sig_reverse {prevsig} {
-re "Program received signal SIG$prevsig.*$gdb_prompt " {
pass "reverse to signal event, $prevsig"
- set nested_testmsg "reverse signal delivered"
+ set nested_testmsg "reverse signal $prevsig delivered"
gdb_test_multiple "frame" $nested_testmsg {
-re ".*handle_$prevsig.*$gdb_prompt " {
fail "$nested_testmsg (wrong location)"
@@ -289,8 +289,10 @@ set sig_supported 1
set thissig "ABRT"
# test signal handling
-foreach sig [lrange $signals 1 end] {
- test_one_sig $sig
+with_test_prefix "sig-test-1" {
+ foreach sig [lrange $signals 1 end] {
+ test_one_sig $sig
+ }
}
# The last signal (SIGTERM) gets handled slightly differently because
@@ -313,6 +315,8 @@ foreach sig [lreverse $signals] {
set sig_supported 1
set thissig "ABRT"
-foreach sig [lrange $signals 1 end] {
- test_one_sig $sig
+with_test_prefix "sig-test-2" {
+ foreach sig [lrange $signals 1 end] {
+ test_one_sig $sig
+ }
}
diff --git a/gdb/testsuite/gdb.reverse/sigall-reverse.exp b/gdb/testsuite/gdb.reverse/sigall-reverse.exp
index c734fe8..651e14d 100644
--- a/gdb/testsuite/gdb.reverse/sigall-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/sigall-reverse.exp
@@ -116,7 +116,7 @@ proc test_one_sig_reverse {prevsig} {
-re "Program received signal SIG$prevsig.*$gdb_prompt " {
pass "reverse to signal event, $prevsig"
- set nested_testmsg "reverse signal delivered"
+ set nested_testmsg "reverse signal $prevsig delivered"
gdb_test_multiple "frame" $nested_testmsg {
-re ".*handle_$prevsig.*$gdb_prompt " {
fail "$nested_testmsg (wrong location)"
@@ -237,8 +237,10 @@ set sig_supported 1
set thissig "ABRT"
# test signal handling
-foreach sig [lrange $signals 1 end] {
- test_one_sig $sig
+with_test_prefix "sig-test-1" {
+ foreach sig [lrange $signals 1 end] {
+ test_one_sig $sig
+ }
}
# The last signal (SIGTERM) gets handled slightly differently because
@@ -265,6 +267,8 @@ foreach sig [lreverse $signals] {
set sig_supported 1
set thissig "ABRT"
-foreach sig [lrange $signals 1 end] {
- test_one_sig $sig
+with_test_prefix "sig-test-2" {
+ foreach sig [lrange $signals 1 end] {
+ test_one_sig $sig
+ }
}
diff --git a/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp b/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp
index 2c6cbe9..aa1a4f3 100644
--- a/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp
+++ b/gdb/testsuite/gdb.reverse/step-indirect-call-thunk.exp
@@ -72,12 +72,12 @@ gdb_test "reverse-step" "apply\.3.*" "reverse-step into apply"
gdb_test "reverse-step" "inc\.3.*" "reverse-step into inc"
gdb_test "reverse-step" "inc\.2.*" "reverse-step inside inc"
gdb_test "reverse-step" "apply\.2.*" \
- "reverse-step through call thunk into apply"
+ "reverse-step through call thunk into apply, first time"
gdb_test "reverse-step" "main\.2.*" "reverse-step into main"
gdb_test "step" "apply\.2.*" "step into apply"
gdb_test "step" "inc\.2.*" "step through call thunk into inc"
gdb_test "reverse-step" "apply\.2.*" \
- "reverse-step through call thunk into apply"
+ "reverse-step through call thunk into apply, second time"
gdb_test "next" "apply\.3.*" "step through thunks and over inc"
gdb_test "reverse-next" "apply\.2.*" \
"reverse-step through thunks and over inc"
diff --git a/gdb/testsuite/gdb.reverse/watch-precsave.exp b/gdb/testsuite/gdb.reverse/watch-precsave.exp
index 6ba381f..f49a8df 100644
--- a/gdb/testsuite/gdb.reverse/watch-precsave.exp
+++ b/gdb/testsuite/gdb.reverse/watch-precsave.exp
@@ -108,7 +108,8 @@ gdb_continue_to_breakpoint "marker2" ".*$srcfile:.*"
###
###
-gdb_test_no_output "set exec-direction reverse" "set reverse"
+gdb_test_no_output "set exec-direction reverse" \
+ "set reverse, first time"
# Reverse until the previous change, from 4 to 3
# Note that this one is outside the loop
@@ -183,7 +184,8 @@ gdb_test "continue" "marker2 .*" "replay forward to marker2"
###
###
-gdb_test_no_output "set exec-direction reverse" "set reverse"
+gdb_test_no_output "set exec-direction reverse" \
+ "set reverse, second time"
# Reverse until the previous change, from 4 to 3
# Note that this one is outside the loop
diff --git a/gdb/testsuite/gdb.reverse/watch-reverse.exp b/gdb/testsuite/gdb.reverse/watch-reverse.exp
index 4cc04e8..9e866df 100644
--- a/gdb/testsuite/gdb.reverse/watch-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/watch-reverse.exp
@@ -89,7 +89,8 @@ gdb_continue_to_breakpoint "marker2" ".*$srcfile:.*"
###
###
-gdb_test_no_output "set exec-direction reverse" "set reverse"
+gdb_test_no_output "set exec-direction reverse" \
+ "set reverse, first time"
# Reverse until the previous change, from 4 to 3
# Note that this one is outside the loop
@@ -164,7 +165,8 @@ gdb_test "continue" "marker2 .*" "replay forward to marker2"
###
###
-gdb_test_no_output "set exec-direction reverse" "set reverse"
+gdb_test_no_output "set exec-direction reverse" \
+ "set reverse, second time"
# Reverse until the previous change, from 4 to 3
# Note that this one is outside the loop