Switch the license of all .exp files to GPLv3.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.mi / mi-cli.exp

diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp
index 4b493ab761ad863cd2ba70fbb8298d2987f404c1..6a05e66a9aeeeb729240fedaa9a4edca2d1a1579 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-cli.exp
@@ -1,18 +1,17 @@
-# Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright 2002, 2003, 2004, 2005, 2007 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file tests that GDB's console can be accessed via the MI.
 # Specifically, we are testing the "interpreter-exec" command and that
@@ -32,11 +31,10 @@ set testfile "basics"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+     untested mi-cli.exp
+     return -1
 }
 
-mi_gdb_reinitialize_dir $srcdir/$subdir
-
 mi_gdb_test "-interpreter-exec" \
   {\^error,msg="mi_cmd_interpreter_exec: Usage: -interpreter-exec interp command"} \
   "-interpreter-exec with no arguments"
@@ -59,7 +57,7 @@ mi_gdb_test "-interpreter-exec console bogus" \
 #   {(=.*)+\^done} \
 #   "-interpreter-exec console \"file \$binfile\""
 mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
-  {\^done} \
+  {~"Reading symbols from .*basics...".*done} \
   "-interpreter-exec console \"file \$binfile\""
 
 mi_run_to_main
@@ -100,7 +98,7 @@ mi_gdb_test "-interpreter-exec console \"list\"" \
 
 # # NOTE: cagney/2003-02-03: Not yet.
 # mi_gdb_test "-exec-continue" \
-#    {.*\*stopped,reason="breakpoint-hit",.*func="callee4".*file=".*basics.c",line="8"\}} \
+#    {.*\*stopped,reason="breakpoint-hit",.*func="callee4".*file=".*basics.c",fullname="${fullname_syntax}${srcfile}",line="8"\}} \
 #    "-interpreter-exec console \"continue to callee4\""
 send_gdb "999-exec-continue\n"
 gdb_expect {
@@ -125,7 +123,7 @@ mi_gdb_test "100-interpreter-exec console \"delete 2\"" \
 #   {.*=selected-frame-level-changed,level="1".*\^done} \
 #   "-interpreter-exec console \"up\""
 mi_gdb_test "200-interpreter-exec console \"up\"" \
-  {200\^done} \
+  {~"#.*".*200\^done} \
   "-interpreter-exec console \"up\""
 
 # NOTE: cagney/2003-02-03: Not yet.
@@ -133,7 +131,7 @@ mi_gdb_test "200-interpreter-exec console \"up\"" \
 #   {.*=selected-frame-level-changed,level="0".*\^done} \
 #   "-interpreter-exec console \"down\""
 mi_gdb_test "300-interpreter-exec console \"down\"" \
-  {300\^done} \
+  {~"#.*".*300\^done} \
   "-interpreter-exec console \"down\""
 
 # NOTE: cagney/2003-02-03: Not yet.
@@ -141,7 +139,7 @@ mi_gdb_test "300-interpreter-exec console \"down\"" \
 #   {.*=selected-frame-level-changed,level="2".*\^done} \
 #   "-interpreter-exec console \"frame 2\""
 mi_gdb_test "400-interpreter-exec console \"frame 2\"" \
-  {400\^done} \
+  {~"#.*".*400\^done} \
   "-interpreter-exec console \"frame 2\""
 
 # NOTE: cagney/2003-02-03: Not yet.
@@ -161,11 +159,11 @@ mi_gdb_test "600-break-insert -t basics.c:$line_main_hello" \
        "-break-insert -t basics.c:\$line_main_hello"
 
 # mi_gdb_test "-exec-continue" \
-#   {.*\*stopped.*,file=".*basics.c",line="$line_main_hello"\}} \
+#   {.*\*stopped.*,file=".*basics.c",fullname="${fullname_syntax}${srcfile}",line="$line_main_hello"\}} \
 #   "-exec-continue to line \$line_main_hello"
 send_gdb "700-exec-continue\n"
 gdb_expect {
-    -re "700\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped.*,file=.*basics.c.,line=.$line_main_hello.*$mi_gdb_prompt$" {
+    -re "700\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped.*,file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=.$line_main_hello.*$mi_gdb_prompt$" {
        pass "-exec-continue to line \$line_main_hello"
     }
     timeout {
@@ -175,11 +173,11 @@ gdb_expect {
 
 # NOTE: cagney/2003-02-03: Not yet.
 # mi_gdb_test "-exec-next" \
-#   {.*\*stopped,reason="end-stepping-range",.*,file=".*basics.c",line="$line_main_return"\}} \
+#   {.*\*stopped,reason="end-stepping-range",.*,file=".*basics.c",fullname="${fullname_syntax}${srcfile}",line="$line_main_return"\}} \
 #   "-exec-next to line \$line_main_return"
 send_gdb "800-exec-next\n"
 gdb_expect {
-    -re "800\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped,reason=.end-stepping-range.*,file=.*basics.c.,line=.$line_main_return.*$mi_gdb_prompt$" {
+    -re "800\\^running\[\r\n\]+$mi_gdb_prompt.*\\*stopped,reason=.end-stepping-range.*,file=\".*basics.c\",fullname=\"${fullname_syntax}${srcfile}\",line=.$line_main_return.*$mi_gdb_prompt$" {
        pass "-exec-next to line \$line_main_return"
     }
     timeout {