aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog7
-rw-r--r--gdb/testsuite/gdb.btrace/vdso.c4
-rw-r--r--gdb/testsuite/gdb.btrace/vdso.exp7
3 files changed, 14 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a48bbee..71765a8 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2015-10-09 Markus Metzger <markus.t.metzger@intel.com>
+
+ * gdb.btrace/vdso.c (main): Remove breakpoint markers.
+ * gdb.btrace/vdso.exp: Change stepping command to "next" and ignore
+ its output. Ignore the output of "record goto begin" and instead
+ check that GDB is replaying.
+
2015-10-09 Pedro Alves <palves@redhat.com>
* gdb.base/a2-run.exp (maybe_exp_continue): New procedure.
diff --git a/gdb/testsuite/gdb.btrace/vdso.c b/gdb/testsuite/gdb.btrace/vdso.c
index 3c236ba..3c51c89 100644
--- a/gdb/testsuite/gdb.btrace/vdso.c
+++ b/gdb/testsuite/gdb.btrace/vdso.c
@@ -24,7 +24,7 @@ main (void)
{
struct timeval tv;
- gettimeofday (&tv, 0); /* main.1. */
+ gettimeofday (&tv, 0);
- return 0; /* main.2. */
+ return 0;
}
diff --git a/gdb/testsuite/gdb.btrace/vdso.exp b/gdb/testsuite/gdb.btrace/vdso.exp
index e0e62de..353c80f 100644
--- a/gdb/testsuite/gdb.btrace/vdso.exp
+++ b/gdb/testsuite/gdb.btrace/vdso.exp
@@ -37,11 +37,14 @@ set live_gettimeofday [capture_command_output "disassemble gettimeofday" ""]
# trace the test code
gdb_test_no_output "record btrace"
-gdb_test "next" "main\.2.*"
+gdb_test "stepi" ".*"
with_test_prefix "replay" {
+ # start replaying
+ gdb_test "record goto begin" ".*"
+ gdb_test "info record" "Replay in progress\.\[^\\\r\\\n\]*"
+
# capture the disassembly of gettimeofday while replaying
- gdb_test "record goto begin" "main\.1.*"
set replay_gettimeofday [capture_command_output "disassemble gettimeofday" ""]
# the two disassemblies must be identical