2003-01-20 Elena Zannoni <ezannoni@redhat.com>

[thirdparty/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 b9b8b2d9c106acf3bd02cee998e6b1b65ce8be8c..815933279c9d0f07719ffb757346299c41a6c4eb 100644 (file)
--- a/gdb/testsuite/gdb.base/until.exp
+++ b/gdb/testsuite/gdb.base/until.exp
@@ -24,11 +24,11 @@ if $tracelevel then {
 }
 
 set testfile break
-set srcfile ${srcdir}/${subdir}/${testfile}.c
+set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 remote_exec build "rm -f ${binfile}"
-if { [gdb_compile "${srcfile}" "${binfile}" executable {debug}] != "" } {
+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."
 }
 
@@ -63,7 +63,7 @@ delete_breakpoints
 # frame.
 #
 gdb_test "until 99" \
-       "factorial.*value=720.*at ${srcfile}:99.*return \\(value\\)." \
+       "factorial.*value=720.*at.*${srcfile}:99.*return \\(value\\)." \
        "until factorial, recursive function"
 
 # Run to a function called by main
@@ -76,6 +76,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\\)." \
+       "$hex in main.*argc.*argv.*envp.*at.*${srcfile}:82.*marker2 \\(43\\)." \
        "until func, not called by current frame"