* gdb.arch/i386-prologue.exp (skip_breakpoint): New function. Use

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

diff --git a/gdb/testsuite/gdb.base/term.exp b/gdb/testsuite/gdb.base/term.exp
index ced0ae45d47de6e88a13eb6b0c1d4f4594e589de..1a6453112976e54a9f2d859fb259024aba014b90 100644 (file)
--- a/gdb/testsuite/gdb.base/term.exp
+++ b/gdb/testsuite/gdb.base/term.exp
@@ -1,4 +1,5 @@
-#   Copyright (C) 1988, 1990, 1991, 1992 Free Software Foundation, Inc.
+#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1999
+#   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
@@ -23,8 +24,8 @@ if $tracelevel then {
     strace $tracelevel
 }
 
-# This only works for native, I think.
-if ![isnative] then {
+# Don't try this for remote targets.
+if [is_remote target] then {
     continue
 }
 
@@ -40,10 +41,11 @@ set testfile "run"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    perror "Couldn't compile ${srcfile}"
-    return -1
+     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 }
 
+gdb_exit
+gdb_start
 delete_breakpoints
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
@@ -53,9 +55,9 @@ gdb_test "set print address off" "" "test set print address off"
 gdb_test "set width 0" "" "test set width 0"
 gdb_test "info terminal" "No saved terminal information.*" "test info terminal"
 gdb_run_cmd 5
-expect {
-    -re ".*120.*Program exited normally.*$prompt $" {
-       gdb_test "info terminal" "No saved terminal information.*" "test info terminal"
+gdb_expect {
+    -re ".*120.*Program exited normally.*$gdb_prompt $" {
+       gdb_test "info terminal" "No saved terminal information.*" "test info terminal #2"
     }
     default {
        fail "term.exp, factorial didn't run to completion for info terminal"
@@ -65,10 +67,10 @@ expect {
 # In mid-execution
 gdb_breakpoint main
 gdb_run_cmd 5
-expect {
-    -re ".*Breakpoint \[0-9\]+,.*main.*if .argc != 2.*$prompt $" {
+gdb_expect {
+    -re ".*Breakpoint \[0-9\]+,.*main.*if .argc != 2.*$gdb_prompt $" {
        gdb_test "info terminal" "Inferior's terminal status .currently saved by GDB.:.*" "info terminal at breakpoint"
     }
-    -re ".*$prompt $"  { fail "info terminal at breakpoint" }
+    -re ".*$gdb_prompt $"      { fail "info terminal at breakpoint" }
     timeout            { fail "(timeout) info terminal at breakpoint" }
 }