diff options
Diffstat (limited to 'gdb/testsuite/gdb.compile/compile.exp')
| -rw-r--r-- | gdb/testsuite/gdb.compile/compile.exp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gdb/testsuite/gdb.compile/compile.exp b/gdb/testsuite/gdb.compile/compile.exp index ff20b2e..66ac182 100644 --- a/gdb/testsuite/gdb.compile/compile.exp +++ b/gdb/testsuite/gdb.compile/compile.exp @@ -32,7 +32,8 @@ if { $srcfile3 != "" } { lappend srcfilesoptions $srcfile3 ${options} } lappend srcfilesoptions $srcfile4 "nodebug" -if { [eval build_executable_from_specs ${testfile}.exp $testfile {$options} ${srcfilesoptions}] } { +if { [build_executable_from_specs $testfile.exp $testfile $options \ + {*}$srcfilesoptions] } { return -1 } @@ -53,7 +54,7 @@ gdb_test "compile file -r ${srcdir}/${subdir}/${testfile}-mod.c" \ "The program must be running for the compile command to work.*" \ "test compile file command without running inferior" -if ![runto_main] { +if {![runto_main]} { return -1 } @@ -378,8 +379,9 @@ if { $srcfile3 != "" } { require allow_shlib_tests -set libbin [standard_output_file ${testfile}-shlib.so] -set binfile [standard_output_file ${testfile}-shlib] +set testfile $testfile-shlib +set libbin [standard_output_file $testfile.so] +set binfile [standard_output_file $testfile] if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile2} $libbin {debug}] != "" || [gdb_compile ${srcdir}/${subdir}/${srcfile} $binfile executable \ @@ -387,10 +389,10 @@ if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile2} $libbin {debug}] != "" return -1 } -clean_restart $binfile +clean_restart $testfile gdb_load_shlib $libbin -if ![runto_main] { +if {![runto_main]} { return -1 } |