gdb/

        * cli/cli-script.c (process_next_line): Handle 'stepping'.

	gdb/testsuite/
	* gdb.trace/while-dyn.exp (executable): New variable.
	(binfile): Use it.
	(test_while_stepping): New function.  Move most tests here.  Call
	it once for each of the while-stepping, stepping and ws aliases.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6f7ef2219764aa20157511303f3c86165366e31c..9ebbaa3a664bb8191f963c68dfb143290ed80db1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-28  Pedro Alves  <pedro@codesourcery.com>
+
+        * cli/cli-script.c (process_next_line): Handle 'stepping'.
+
 2010-03-26  Stan Shebs  <stan@codesourcery.com>
 
        * tracepoint.c (disconnect_or_stop_tracing): Get out of tfind mode.

diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index 660ea469dc61444d2c211179cae367a063f99559..0b85bab77bba6664ee5df647b206a72cd2b508a0 100644 (file)
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -932,7 +932,8 @@ process_next_line (char *p, struct command_line **command, int parse_commands,
       /* Check for while, if, break, continue, etc and build a new command
         line structure for them.  */
       if ((p_end - p >= 14 && !strncmp (p, "while-stepping", 14))
-         || (p_end -p >= 2 && !strncmp (p, "ws", 2)))
+         || (p_end - p >= 8 && !strncmp (p, "stepping", 8))
+         || (p_end - p >= 2 && !strncmp (p, "ws", 2)))
        {
          /* Because validate_actionline and encode_action lookup
             command's line as command, we need the line to

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d506e1ac21267cd5806300ddb4f4e96fdb3eb862..29a7e9f04728fa280a797d7bbb14faa2a54c7e9d 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-28  Pedro Alves  <pedro@codesourcery.com>
+
+       * gdb.trace/while-dyn.exp (executable): New variable.
+       (binfile): Use it.
+       (test_while_stepping): New function.  Move most tests here.  Call
+       it once for each of the while-stepping, stepping and ws aliases.
+
 2010-03-26  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
        * gdb.cp/inherit.exp (test_ptype_si): XFAIL test for GCC versions

diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp
index d379e1dc0dc82c8bd44842857e7415e8f1179c35..4d1ae596fcdf6bbe3028bfccb1a21753bbf7b65c 100644 (file)
--- a/gdb/testsuite/gdb.trace/while-dyn.exp
+++ b/gdb/testsuite/gdb.trace/while-dyn.exp
@@ -29,7 +29,8 @@ gdb_start
 
 set testfile "actions"
 set srcfile $testfile.c
-set binfile $objdir/$subdir/while-dyn
+set executable while-dyn
+set binfile $objdir/$subdir/$executable
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
          executable {debug nowarnings}] != "" } {
     untested while-dyn.exp
@@ -46,23 +47,12 @@ gdb_reinitialize_dir $srcdir/$subdir
 if { ![gdb_target_supports_trace] } then {
     pass "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
-
-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 {
@@ -71,33 +61,59 @@ if [istarget "x86_64-*"] then {
     set fpreg "\$fp"
 }
 
-gdb_trace_setactions "5.12: define while-stepping <stepcount>" \
+proc test_while_stepping { while_stepping } {
+    global fpreg
+    global decimal
+    global gdb_prompt
+    global executable
+
+    clean_restart $executable
+
+    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 .*" \
+       "$while_stepping: Set tracepoint at gdb_c_test"
+
+    gdb_trace_setactions "5.12: define $while_stepping <stepcount>" \
        "" \
        "collect $fpreg" "^$" \
-       "while-stepping 5" "^$" \
+       "$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_test "break end" "" ""
+    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"