Fixup testcases outputting own name as a test name and standardize failed compilation...

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

diff --git a/gdb/testsuite/gdb.base/cursal.exp b/gdb/testsuite/gdb.base/cursal.exp
index c3ddc554349fb9d46320a90b228fde4aa1129ec1..6834d76a8cd60fd4252c325400bcdb20cfea0a5a 100644 (file)
--- a/gdb/testsuite/gdb.base/cursal.exp
+++ b/gdb/testsuite/gdb.base/cursal.exp
@@ -1,8 +1,8 @@
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004-2016 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,39 +11,28 @@
 # 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/>.
 
-if $tracelevel {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
 
-set testfile "cursal"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != ""} {
-    untested "Couldn't compile $srcfile"
+    untested "failed to compile"
     return -1
 }
 
 gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-gdb_test "set listsize 1" \
-    ".*"
+gdb_file_cmd ${binfile}
+gdb_test_no_output "set listsize 1"
 
 # initial sal should be first statement in main
 gdb_test "list" \
     "v0 = 0;" \
     "list before run"
 
+gdb_load ${binfile}
 if {! [runto_main]} {
     return -1
 }
@@ -68,8 +57,8 @@ gdb_test "list -1" \
     "list after backtrace"
 
 # check the window
-gdb_test "set listsize 3" \
-    ".*"
+gdb_test_no_output "set listsize 3"
+
 if {! [runto_main]} {
     return -1
 }