1 files changed, 11 insertions, 12 deletions

diff --git a/gdb/testsuite/gdb.base/fullname.exp b/gdb/testsuite/gdb.base/fullname.exp
index d208b7a..32f6ea4 100644
--- a/gdb/testsuite/gdb.base/fullname.exp
+++ b/gdb/testsuite/gdb.base/fullname.exp
@@ -16,9 +16,7 @@
 # This file tests setting breakpoints according to the full path of a
 # source file.
 
-set testfile "fullname"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 
 # We rely on being able to copy things around.
 
@@ -30,13 +28,13 @@ if { [is_remote host] } {
 # Create a temporary file in the build directory.  Use a different
 # filename in case ${srcdir} == ${objdir}.
 if { [catch {file copy -force ${srcdir}/${subdir}/${srcfile} \
-			      ${objdir}/${subdir}/tmp-${srcfile}}] != 0 } {
+			      [standard_output_file tmp-${srcfile}]}] != 0 } {
     error "Could not create temporary file"
     return -1
 }
 
 # Build the test executable using an absolute path.
-if  { [gdb_compile "${objdir}/${subdir}/tmp-${srcfile}" "${binfile}" executable {debug}] != "" } {
+if  { [gdb_compile [standard_output_file tmp-${srcfile}] "${binfile}" executable {debug}] != "" } {
     return -1
 }
 
@@ -55,7 +53,7 @@ gdb_start
 gdb_load ${binfile}
 
 set msg "set breakpoint by full path before loading symbols - built absolute"
-if { [gdb_breakpoint ${objdir}/${subdir}/tmp-${srcfile}:${line} {no-message}] != 0 } {
+if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} {no-message}] != 0 } {
     pass $msg
 } else {
     fail $msg
@@ -65,7 +63,7 @@ gdb_test "break main" \
 	 "Breakpoint.*at.*line.*" "set breakpoint at main - built absolute"
 
 set msg "set breakpoint by full path after loading symbols - built absolute"
-if { [gdb_breakpoint ${objdir}/${subdir}/tmp-${srcfile}:${line} {no-message}] != 0 } {
+if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} {no-message}] != 0 } {
     pass $msg
 } else {
     fail $msg
@@ -81,7 +79,7 @@ gdb_start
 gdb_load ${binfile}
 
 set msg "set breakpoint by full path before loading symbols - built relative"
-if { [gdb_breakpoint ${objdir}/${subdir}/tmp-${srcfile}:${line} {no-message}] != 0 } {
+if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} {no-message}] != 0 } {
     pass $msg
 } else {
     fail $msg
@@ -91,7 +89,7 @@ gdb_test "break main" \
 	 "Breakpoint.*at.*line.*" "set breakpoint at main - built relative"
 
 set msg "set breakpoint by full path after loading symbols - built relative"
-if { [gdb_breakpoint ${objdir}/${subdir}/tmp-${srcfile}:${line} {no-message}] != 0 } {
+if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} {no-message}] != 0 } {
     pass $msg
 } else {
     fail $msg
@@ -102,7 +100,8 @@ if { [gdb_breakpoint ${objdir}/${subdir}/tmp-${srcfile}:${line} {no-message}] !=
 
 set save_pwd [pwd]
 cd ${subdir}
-if  { [gdb_compile "tmp-${srcfile}" "${testfile}" executable {debug}] != "" } {
+if  { [gdb_compile [standard_output_file tmp-${srcfile}] "${testfile}" \
+	   executable {debug}] != "" } {
     cd $save_pwd
     return -1
 }
@@ -113,7 +112,7 @@ gdb_start
 gdb_load ${binfile}
 
 set msg "set breakpoint by full path before loading symbols - built other"
-if { [gdb_breakpoint ${objdir}/${subdir}/tmp-${srcfile}:${line} {no-message}] != 0 } {
+if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} {no-message}] != 0 } {
     pass $msg
 } else {
     fail $msg
@@ -123,7 +122,7 @@ gdb_test "break main" \
 	 "Breakpoint.*at.*line.*" "set breakpoint at main - built other"
 
 set msg "set breakpoint by full path after loading symbols - built other"
-if { [gdb_breakpoint ${objdir}/${subdir}/tmp-${srcfile}:${line} {no-message}] != 0 } {
+if { [gdb_breakpoint [standard_output_file tmp-${srcfile}]:${line} {no-message}] != 0 } {
     pass $msg
 } else {
     fail $msg