gdb/testsuite/

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

diff --git a/gdb/testsuite/gdb.base/until.exp b/gdb/testsuite/gdb.base/until.exp
index f646c6d36ae58f221498a8fbdaa9750723965926..8c59430a67529b3e08076fbce1e8b40eb7bd7f47 100644 (file)
--- a/gdb/testsuite/gdb.base/until.exp
+++ b/gdb/testsuite/gdb.base/until.exp
@@ -1,21 +1,17 @@
-# Copyright 2003 Free Software Foundation, Inc.
+# Copyright 2003, 2007, 2008, 2009 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.  */
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 # until.exp -- Expect script to test 'until' in gdb
 
@@ -23,19 +19,15 @@ if $tracelevel then {
     strace $tracelevel
 }
 
-set testfile break
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-
-remote_exec build "rm -f ${binfile}"
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+set srcfile break.c
+if { [prepare_for_testing until.exp "until" {break.c break1.c} {debug nowarnings}] } {
+    return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
+set bp_location19 [gdb_get_line_number "set breakpoint 19 here"]
+set bp_location20 [gdb_get_line_number "set breakpoint 20 here"]
+set bp_location21 [gdb_get_line_number "set breakpoint 21 here"]
 
 if ![runto_main] then {
     fail "Can't run to main"
@@ -45,8 +37,8 @@ if ![runto_main] then {
 # Verify that "until <location>" works.  (This is really just syntactic
 # sugar for "tbreak <location>; continue".)
 #
-gdb_test "until 79" \
-       "main .* at .*:79.*" \
+gdb_test "until $bp_location1" \
+       "main .* at .*:$bp_location1.*" \
        "until line number"
 
 # Verify that a malformed "advance" is gracefully caught.
@@ -62,8 +54,8 @@ delete_breakpoints
 # inner invocations of factorial() are completed and we are back at this
 # frame.
 #
-gdb_test "until 99" \
-       "factorial.*value=720.*at.*${srcfile}:99.*return \\(value\\)." \
+gdb_test "until $bp_location19" \
+       "factorial.*value=720.*at.*${srcfile}:$bp_location19.*return \\(value\\).*" \
        "until factorial, recursive function"
 
 # Run to a function called by main
@@ -76,6 +68,6 @@ delete_breakpoints
 # stop at main, the caller, where we put the 'guard' breakpoint.
 #
 gdb_test "until marker3" \
-       "($hex in |)main.*argc.*argv.*envp.*at.*${srcfile}:(82.*marker2 \\(43\\)|83.*marker3 \\(.stack., .trace.\\))." \
+       "($hex in |)main.*argc.*argv.*envp.*at.*${srcfile}:($bp_location20.*marker2 \\(43\\)|$bp_location21.*marker3 \\(.stack., .trace.\\)).*" \
        "until func, not called by current frame"