Clean up gdb.trace test results on targets not supporting this feature.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.trace / while-dyn.exp

diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp
index d379e1dc0dc82c8bd44842857e7415e8f1179c35..95718797fa04579ac9d81d3a6aab4e7dbb8cf8ec 100644 (file)
--- a/gdb/testsuite/gdb.trace/while-dyn.exp
+++ b/gdb/testsuite/gdb.trace/while-dyn.exp
@@ -1,4 +1,4 @@
-#   Copyright 1998, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#   Copyright 1998-2018 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,87 +17,89 @@
 
 load_lib "trace-support.exp"
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
 
 gdb_exit
 gdb_start
 
-set testfile "actions"
-set srcfile $testfile.c
-set binfile $objdir/$subdir/while-dyn
+standard_testfile actions.c
+set executable $testfile
+if ![gdb_trace_common_supports_arch] {
+    unsupported "no trace-common.h support for arch"
+    return -1
+}
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
          executable {debug nowarnings}] != "" } {
-    untested while-dyn.exp
+    untested "failed to compile"
     return -1
 }
 gdb_load $binfile
-gdb_test "tstop"       "" ""
-gdb_test "tfind none"  "" ""
+gdb_test "tstop"       ".*" ""
+gdb_test "tfind none"  ".*" ""
 runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
-# We generously give ourselves one "pass" if we successfully 
-# detect that this test cannot be run on this target!
 if { ![gdb_target_supports_trace] } then {
-    pass "Current target does not support trace"
-    return 1;
-
+    unsupported "current target does not support trace"
+    return 1
 }
 
-# If testing on a remote host, download the source file.
-# remote_download host $srcdir/$subdir/$srcfile
-
 #
 # test while-stepping dynamically (live target)
 #
 
-## verify number of trace frames collected matches stepcount
+proc test_while_stepping { while_stepping } {
+    global fpreg
+    global decimal
+    global gdb_prompt
+    global executable
+
+    clean_restart $executable
 
-gdb_delete_tracepoints
-gdb_test "trace gdb_c_test" \
+    gdb_test "tstop" ".*" ""
+    gdb_test "tfind none" ".*" ""
+    runto_main
+
+    ## verify number of trace frames collected matches stepcount
+
+    gdb_delete_tracepoints
+    gdb_test "trace gdb_c_test" \
        "Tracepoint $decimal at .*" \
-       "Set tracepoint at gdb_c_test"
-
-if [istarget "x86_64-*"] then {
-    set fpreg "\$rbp"
-} elseif [istarget "i?86-*"] then {
-    set fpreg "\$ebp"
-} else {
-    set fpreg "\$fp"
-}
+       "$while_stepping: Set tracepoint at gdb_c_test"
 
-gdb_trace_setactions "5.12: define while-stepping <stepcount>" \
+    gdb_trace_setactions "5.12: define $while_stepping <stepcount>" \
        "" \
-       "collect $fpreg" "^$" \
-       "while-stepping 5" "^$" \
+       "collect \$$fpreg" "^$" \
+       "$while_stepping 5" "^$" \
        "collect p" "^$" \
        "end" "^$" \
        "end" ""
 
-gdb_test "tstart" "" ""
+    gdb_test "tstart" ".*" ""
 
-gdb_test "break end" "" ""
-gdb_test "continue" \
-    "Continuing.*Breakpoint $decimal, end.*" \
-    "run trace experiment"
+    gdb_breakpoint "end" qualified
+    gdb_test "continue" \
+       "Continuing.*Breakpoint $decimal, end.*" \
+       "$while_stepping: run trace experiment"
 
-gdb_test "tstop" "" ""
+    gdb_test "tstop" ".*" ""
 
-gdb_tfind_test "5.12: frame 5 should be the last one collected" "5" "5"
+    gdb_tfind_test "$while_stepping: frame 5 should be the last one collected" "5" "5"
 
-send_gdb "tfind 6\n"
-gdb_expect {
-    -re "failed to find.*$gdb_prompt $" {
-       pass "5.12: trace stopped after 5 stepping frames"
-    }
-    -re ".*$gdb_prompt $" {
-       fail "5.12: trace stopped after 5 stepping frames"
+    set test "$while_stepping: trace stopped after 5 stepping frames"
+    gdb_test_multiple "tfind 6" "$test" {
+       -re "failed to find.*$gdb_prompt $" {
+           pass "$test"
+       }
+       -re ".*$gdb_prompt $" {
+           fail "$test"
+       }
     }
+
+    gdb_test "tfind none" ".*" ""
 }
 
-gdb_test "tfind none" "" ""
+# Test all while-stepping aliases.
+
+test_while_stepping "while-stepping"
+test_while_stepping "stepping"
+test_while_stepping "ws"