daily update

[external/binutils.git] / gdb / testsuite / gdb.base / echo.exp

diff --git a/gdb/testsuite/gdb.base/echo.exp b/gdb/testsuite/gdb.base/echo.exp
index cfad3b0..8a52169 100644 (file)
--- a/gdb/testsuite/gdb.base/echo.exp
+++ b/gdb/testsuite/gdb.base/echo.exp
@@ -1,27 +1,30 @@
-#   Copyright (C) 1988, 1990, 1991, 1992 Free Software Foundation, Inc.
+#   Copyright (C) 1988, 1990, 1991, 1992, 1997, 2007, 2008
+#   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,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-gdb@prep.ai.mit.edu
 
 # This file was written by Rob Savoye. (rob@cygnus.com)
 
+# Crank up gdb.
+gdb_start
+
 if $tracelevel then {
-       strace $tracelevel
-       }
+    strace $tracelevel
+}
 
 #
 # test the echo command
@@ -38,21 +41,4 @@ set prms_id 0
 #      ex: set bug_id 12
 set bug_id 0
 
-# this sends a string to the stdin of the tool being tested. The string
-# should be between the quotes.
-send "echo Hello world!\n"
-
-# any shell style globbing can be used between the ""
-# regular expressions can be used instead by preceding the
-# first quote with the option -re
-#      ex: "file deleted"      { fail "removed source file" }
-# the string between the quotes after a fail or pass is what
-# gets printed if the pattern matches. There can be multiple
-# send/expect sequences in one test.
-expect {
-       -re "Hello world.*$prompt $"    { pass "Echo test" }
-       -re "$prompt $"                 { fail "Echo test" }
-       timeout                         { fail "(timeout) Echo test" }
-       }
-
-# this dumps the output to the detailed log for this tool
+gdb_test "echo Hello world!\\n" "Hello world!" "Echo test"