run copyright.sh for 2011.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / trace-commands.exp

diff --git a/gdb/testsuite/gdb.base/trace-commands.exp b/gdb/testsuite/gdb.base/trace-commands.exp
index 932f9ed4f9ae700bad5283c08e0e2528829ea0e5..24f270b122450886661604058a4ef304a7bc8827 100644 (file)
--- a/gdb/testsuite/gdb.base/trace-commands.exp
+++ b/gdb/testsuite/gdb.base/trace-commands.exp
@@ -1,8 +1,8 @@
-# Copyright 2006, 2007 Free Software Foundation, Inc.
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test that the source command's verbose mode works, the 'set trace-commands'
 # command works, and that the nest depth is correct in various circumstances.
@@ -49,8 +48,7 @@ gdb_test "show trace-commands" "State of GDB CLI command tracing is off\\." \
         "show trace-commands says off"
 
 # Source the script with verbose mode.
-send_gdb "source -v tracecommandsscript\n"
-gdb_expect_list "source -v" ".*$gdb_prompt $" {
+gdb_test_sequence "source -v tracecommandsscript" "source -v" {
   {[\r\n]\+echo in tracecommandsscript\\n}
   {[\r\n]\+define func}
   {[\r\n]\+if 1}
@@ -63,7 +61,7 @@ gdb_expect_list "source -v" ".*$gdb_prompt $" {
 }
 
 # Turn on command tracing.
-gdb_test "set trace-commands" "" "set trace-commands"
+gdb_test_no_output "set trace-commands" "set trace-commands"
 
 # Make sure show trace-commands now gives 'on'.
 gdb_test "show trace-commands" \
@@ -74,8 +72,8 @@ gdb_test "show trace-commands" \
 gdb_test "echo hi\\n" {\+echo hi\\n[\r\n]+hi} "simple trace-commands test"
 
 # Nested test
-send_gdb "if 1\nset \$i = 0\nwhile \$i < 5\nfunc \$i\nset \$i += 1\nend\nend\n"
-gdb_expect_list        "nested trace-commands test" ".*$gdb_prompt $" {
+gdb_test_sequence "if 1\nset \$i = 0\nwhile \$i < 5\nfunc \$i\nset \$i += 1\nend\nend" \
+    "nested trace-commands test" {
   {[\r\n]\+if 1}
   {[\r\n]\+\+set \$i = 0}
   {[\r\n]\+\+while \$i < 5}
@@ -97,12 +95,11 @@ gdb_expect_list     "nested trace-commands test" ".*$gdb_prompt $" {
 }
 
 # Function with source works
-send_gdb "define topfunc\nsource tracecommandsscript\nend\n"
-gdb_expect_list "define user command" ".*$gdb_prompt $" {
+gdb_test_sequence "define topfunc\nsource tracecommandsscript\nend" \
+    "define user command" {
   {[\r\n]\+define topfunc}
 }
-send_gdb "topfunc\n"
-gdb_expect_list "nested trace-commands test with source" ".*$gdb_prompt $" {
+gdb_test_sequence "topfunc" "nested trace-commands test with source" {
   {[\r\n]\+topfunc}
   {[\r\n]\+\+source tracecommandsscript}
   {[\r\n]\+\+echo in tracecommandsscript\\n}
@@ -117,8 +114,8 @@ gdb_expect_list "nested trace-commands test with source" ".*$gdb_prompt $" {
 }
 
 # Test nest depth resets properly on error
-send_gdb "if 1\nif 2\nload\necho should not get here\\n\nend\nend\n"
-gdb_expect_list "depth resets on error part 1" ".*$gdb_prompt $" {
+gdb_test_sequence "if 1\nif 2\nload\necho should not get here\\n\nend\nend" \
+    "depth resets on error part 1" {
   {[\r\n]\+if 1}
   {[\r\n]\+\+if 2}
   {[\r\n]\+\+\+load}