aboutsummaryrefslogtreecommitdiff
path: root/gdb/testsuite/gdb.btrace
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/testsuite/gdb.btrace')
-rw-r--r--gdb/testsuite/gdb.btrace/multi-thread-step.exp6
-rw-r--r--gdb/testsuite/gdb.btrace/nohist.exp2
-rw-r--r--gdb/testsuite/gdb.btrace/non-stop.exp32
-rw-r--r--gdb/testsuite/gdb.btrace/stepi.exp14
4 files changed, 32 insertions, 22 deletions
diff --git a/gdb/testsuite/gdb.btrace/multi-thread-step.exp b/gdb/testsuite/gdb.btrace/multi-thread-step.exp
index 154db9a..cd20e8a 100644
--- a/gdb/testsuite/gdb.btrace/multi-thread-step.exp
+++ b/gdb/testsuite/gdb.btrace/multi-thread-step.exp
@@ -111,14 +111,14 @@ proc test_cont {} {
with_test_prefix "cont" {
gdb_test "thread 1" ".*"
with_test_prefix "thread 1" {
- gdb_test "continue" "No more reverse-execution history.*"
+ gdb_test "continue" "Reached end of recorded history.*"
check_not_replaying 1
check_replay_insn 2 2
}
gdb_test "thread 2" ".*"
with_test_prefix "thread 2" {
- gdb_test "continue" "No more reverse-execution history.*"
+ gdb_test "continue" "Reached end of recorded history.*"
check_not_replaying 1
check_not_replaying 2
@@ -128,7 +128,7 @@ proc test_cont {} {
proc test_cont_all {} {
with_test_prefix "cont-all" {
- gdb_test "continue" "No more reverse-execution history.*"
+ gdb_test "continue" "Reached end of recorded history.*"
# this works because we're lock-stepping threads that executed exactly
# the same code starting from the same instruction.
diff --git a/gdb/testsuite/gdb.btrace/nohist.exp b/gdb/testsuite/gdb.btrace/nohist.exp
index d719091..ac6a41c 100644
--- a/gdb/testsuite/gdb.btrace/nohist.exp
+++ b/gdb/testsuite/gdb.btrace/nohist.exp
@@ -42,7 +42,7 @@ with_test_prefix "forward" {
check_not_replaying
}
-gdb_test "reverse-continue" "No more reverse-execution history\.\r\n.*"
+gdb_test "reverse-continue" "Reached end of recorded history; stopping.*"
with_test_prefix "backward" {
check_not_replaying
diff --git a/gdb/testsuite/gdb.btrace/non-stop.exp b/gdb/testsuite/gdb.btrace/non-stop.exp
index 62c940e..5e43545 100644
--- a/gdb/testsuite/gdb.btrace/non-stop.exp
+++ b/gdb/testsuite/gdb.btrace/non-stop.exp
@@ -79,16 +79,26 @@ proc gdb_cont_to_bp_line { line threads nthreads } {
$nthreads
}
-proc gdb_cont_to_no_history { threads cmd nthreads } {
+proc gdb_cont_to_no_history_backward { threads cmd nthreads } {
gdb_cont_to $threads $cmd \
[multi_line \
- "No more reverse-execution history\." \
+ "Reached end of recorded.*Backward execution.*" \
"\[^\\\r\\\n\]*" \
"\[^\\\r\\\n\]*" \
] \
$nthreads
}
+proc gdb_cont_to_no_history_forward { threads cmd nthreads } {
+ gdb_cont_to $threads $cmd \
+ [multi_line \
+ "Reached end of recorded.*Following forward.*" \
+ "\[^\\\r\\\n\]*" \
+ "\[^\\\r\\\n\]*" \
+ ] \
+ $nthreads
+}
+
# trace the code between the two breakpoints
with_test_prefix "prepare" {
gdb_cont_to_bp_line "$srcfile:$bp_1" all 2
@@ -176,14 +186,14 @@ with_test_prefix "reverse-step" {
with_test_prefix "continue" {
with_test_prefix "thread 1" {
with_test_prefix "continue" {
- gdb_cont_to_no_history 1 "continue" 1
+ gdb_cont_to_no_history_forward 1 "continue" 1
gdb_test "thread apply 1 info record" \
".*Recorded \[0-9\]+ instructions \[^\\\r\\\n\]*"
gdb_test "thread apply 2 info record" \
".*Replay in progress\. At instruction 5\."
}
with_test_prefix "reverse-continue" {
- gdb_cont_to_no_history 1 "reverse-continue" 1
+ gdb_cont_to_no_history_backward 1 "reverse-continue" 1
gdb_test "thread apply 1 info record" \
".*Replay in progress\. At instruction 1\."
gdb_test "thread apply 2 info record" \
@@ -193,14 +203,14 @@ with_test_prefix "continue" {
with_test_prefix "thread 2" {
with_test_prefix "continue" {
- gdb_cont_to_no_history 2 "continue" 1
+ gdb_cont_to_no_history_forward 2 "continue" 1
gdb_test "thread apply 1 info record" \
".*Replay in progress\. At instruction 1\."
gdb_test "thread apply 2 info record" \
".*Recorded \[0-9\]+ instructions \[^\\\r\\\n\]*"
}
with_test_prefix "reverse-continue" {
- gdb_cont_to_no_history 2 "reverse-continue" 1
+ gdb_cont_to_no_history_backward 2 "reverse-continue" 1
gdb_test "thread apply 1 info record" \
".*Replay in progress\. At instruction 1\."
gdb_test "thread apply 2 info record" \
@@ -215,8 +225,8 @@ with_test_prefix "no progress" {
gdb_test "thread apply 1 record goto end" ".*"
gdb_test "thread apply 2 record goto begin" ".*"
- gdb_cont_to_no_history 1 "continue" 1
- gdb_cont_to_no_history 1 "step" 1
+ gdb_cont_to_no_history_forward 1 "continue" 1
+ gdb_cont_to_no_history_forward 1 "step" 1
gdb_test "thread apply 1 info record" \
".*Recorded \[0-9\]+ instructions \[^\\\r\\\n\]*"
gdb_test "thread apply 2 info record" \
@@ -227,8 +237,8 @@ with_test_prefix "no progress" {
gdb_test "thread apply 1 record goto begin" ".*"
gdb_test "thread apply 2 record goto end" ".*"
- gdb_cont_to_no_history 2 "continue" 1
- gdb_cont_to_no_history 2 "step" 1
+ gdb_cont_to_no_history_forward 2 "continue" 1
+ gdb_cont_to_no_history_forward 2 "step" 1
gdb_test "thread apply 1 info record" \
".*Replay in progress\. At instruction 1\."
gdb_test "thread apply 2 info record" \
@@ -238,7 +248,7 @@ with_test_prefix "no progress" {
with_test_prefix "all" {
gdb_test "thread apply all record goto begin" ".*"
- gdb_cont_to_no_history all "continue" 2
+ gdb_cont_to_no_history_forward all "continue" 2
gdb_test "thread apply 1 info record" \
".*Recorded \[0-9\]+ instructions \[^\\\r\\\n\]*"
gdb_test "thread apply 2 info record" \
diff --git a/gdb/testsuite/gdb.btrace/stepi.exp b/gdb/testsuite/gdb.btrace/stepi.exp
index a70a5ad..689bc79 100644
--- a/gdb/testsuite/gdb.btrace/stepi.exp
+++ b/gdb/testsuite/gdb.btrace/stepi.exp
@@ -100,7 +100,7 @@ with_test_prefix "reverse-nexti.1" {
# we can't reverse-nexti any further
with_test_prefix "reverse-nexti.2" {
gdb_test "reverse-nexti" \
- "No more reverse-execution history\.\r\n.*main\.2.*" \
+ "Reached end of recorded history; stopping\.\r\n.*main\.2.*" \
"reverse-nexti.2"
check_replay_at 1
}
@@ -140,20 +140,20 @@ with_test_prefix "goto begin" {
with_test_prefix "reverse-stepi" {
gdb_test "reverse-stepi" \
- "No more reverse-execution history\.\r\n.*main\.2.*" \
+ "Reached end of recorded history; stopping\.\r\n.*main\.2.*" \
"reverse-stepi.1"
gdb_test "reverse-stepi" \
- "No more reverse-execution history\.\r\n.*main\.2.*" \
+ "Reached end of recorded history; stopping\.\r\n.*main\.2.*" \
"reverse-stepi.2"
check_replay_at 1
}
with_test_prefix "reverse-nexti" {
gdb_test "reverse-nexti" \
- "No more reverse-execution history\.\r\n.*main\.2.*" \
+ "Reached end of recorded history; stopping\.\r\n.*main\.2.*" \
"reverse-nexti.1"
gdb_test "reverse-nexti" \
- "No more reverse-execution history\.\r\n.*main\.2.*" \
+ "Reached end of recorded history; stopping\.\r\n.*main\.2.*" \
"reverse-nexti.2"
check_replay_at 1
}
@@ -169,10 +169,10 @@ with_test_prefix "goto begin" {
with_test_prefix "reverse-stepi" {
gdb_test "reverse-stepi" ".*main\.2.*" "reverse-stepi.1"
gdb_test "reverse-stepi" \
- "No more reverse-execution history\.\r\n.*main\.2.*" \
+ "Reached end of recorded history; stopping\.\r\n.*main\.2.*" \
"reverse-stepi.2"
gdb_test "reverse-stepi" \
- "No more reverse-execution history\.\r\n.*main\.2.*" \
+ "Reached end of recorded history; stopping\.\r\n.*main\.2.*" \
"reverse-stepi.3"
check_replay_at 1
}
generated by cgit v1.1 at 2025-01-21 06:23:50 +0000