diff options
Diffstat (limited to 'gdb/testsuite/gdb.base')
201 files changed, 237 insertions, 303 deletions
diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp index 49add80..6ef0900 100644 --- a/gdb/testsuite/gdb.base/a2-run.exp +++ b/gdb/testsuite/gdb.base/a2-run.exp @@ -26,7 +26,7 @@ if [gdb_skip_stdio_test "a2run.exp"] { standard_testfile run.c -if { [prepare_for_testing ${testfile}.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/advance.exp b/gdb/testsuite/gdb.base/advance.exp index ce8a98c..1ed48fa 100644 --- a/gdb/testsuite/gdb.base/advance.exp +++ b/gdb/testsuite/gdb.base/advance.exp @@ -17,8 +17,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/all-bin.exp b/gdb/testsuite/gdb.base/all-bin.exp index 18fc3c3..acd058e 100644 --- a/gdb/testsuite/gdb.base/all-bin.exp +++ b/gdb/testsuite/gdb.base/all-bin.exp @@ -33,8 +33,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/anon.exp b/gdb/testsuite/gdb.base/anon.exp index bf5054d..e6f3927 100644 --- a/gdb/testsuite/gdb.base/anon.exp +++ b/gdb/testsuite/gdb.base/anon.exp @@ -16,7 +16,7 @@ standard_testfile .c -if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug}] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/args.exp b/gdb/testsuite/gdb.base/args.exp index f0869df..6a99dc3 100644 --- a/gdb/testsuite/gdb.base/args.exp +++ b/gdb/testsuite/gdb.base/args.exp @@ -27,7 +27,7 @@ standard_testfile if {[build_executable $testfile.exp $testfile \ $srcfile {debug nowarnings}] == -1} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/arithmet.exp b/gdb/testsuite/gdb.base/arithmet.exp index 1915ef0..43adacd 100644 --- a/gdb/testsuite/gdb.base/arithmet.exp +++ b/gdb/testsuite/gdb.base/arithmet.exp @@ -28,8 +28,7 @@ standard_testfile int-type.c -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/async-shell.exp b/gdb/testsuite/gdb.base/async-shell.exp index 6b887c3..9c9f8b1 100644 --- a/gdb/testsuite/gdb.base/async-shell.exp +++ b/gdb/testsuite/gdb.base/async-shell.exp @@ -25,7 +25,7 @@ if [target_info exists use_gdb_stub] { return 0 } -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/async.exp b/gdb/testsuite/gdb.base/async.exp index 3adb156..0451373 100644 --- a/gdb/testsuite/gdb.base/async.exp +++ b/gdb/testsuite/gdb.base/async.exp @@ -20,8 +20,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/attach-pie-noexec.exp b/gdb/testsuite/gdb.base/attach-pie-noexec.exp index 1a51049..4ea302e 100644 --- a/gdb/testsuite/gdb.base/attach-pie-noexec.exp +++ b/gdb/testsuite/gdb.base/attach-pie-noexec.exp @@ -20,7 +20,7 @@ if {![can_spawn_for_attach]} { standard_testfile .c set executable ${testfile} -if { [prepare_for_testing ${testfile}.exp $executable "" [list debug "additional_flags=-fPIE -pie"]] } { +if { [prepare_for_testing "failed to prepare" $executable "" [list debug "additional_flags=-fPIE -pie"]] } { return -1 } @@ -42,13 +42,13 @@ gdb_test_multiple "info shared" $test { pass $test } -re "No shared libraries loaded at this time\\.\r\n$gdb_prompt $" { - untested ${testfile}.exp + untested "no shared libraries loaded" } } gdb_exit if {$arch == ""} { - untested ${testfile}.exp + untested "no architecture set" return 0 } diff --git a/gdb/testsuite/gdb.base/attach-twice.exp b/gdb/testsuite/gdb.base/attach-twice.exp index dc10c73..64f2e93 100644 --- a/gdb/testsuite/gdb.base/attach-twice.exp +++ b/gdb/testsuite/gdb.base/attach-twice.exp @@ -20,7 +20,7 @@ if {![can_spawn_for_attach]} { standard_testfile set executable ${testfile} -if { [prepare_for_testing ${testfile}.exp $executable] } { +if { [prepare_for_testing "failed to prepare" $executable] } { return -1 } diff --git a/gdb/testsuite/gdb.base/auto-load.exp b/gdb/testsuite/gdb.base/auto-load.exp index 1bd9f0b..b0a070c 100644 --- a/gdb/testsuite/gdb.base/auto-load.exp +++ b/gdb/testsuite/gdb.base/auto-load.exp @@ -26,7 +26,7 @@ set targetscript "${targetscriptdir}/${testfile}-gdb.gdb" remote_exec host "rm -rf ${targetdir}" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/bang.exp b/gdb/testsuite/gdb.base/bang.exp index d9949cf..2b70973 100644 --- a/gdb/testsuite/gdb.base/bang.exp +++ b/gdb/testsuite/gdb.base/bang.exp @@ -18,9 +18,8 @@ standard_testfile args.c -if {[prepare_for_testing $testfile.exp ${testfile}! $srcfile \ +if {[prepare_for_testing "failed to prepare" ${testfile}! $srcfile \ {debug nowarnings}]} { - untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/bitfields.exp b/gdb/testsuite/gdb.base/bitfields.exp index 7000070..af300f9 100644 --- a/gdb/testsuite/gdb.base/bitfields.exp +++ b/gdb/testsuite/gdb.base/bitfields.exp @@ -18,8 +18,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/break-always.exp b/gdb/testsuite/gdb.base/break-always.exp index a1a4165..068e331 100644 --- a/gdb/testsuite/gdb.base/break-always.exp +++ b/gdb/testsuite/gdb.base/break-always.exp @@ -17,7 +17,7 @@ # Also verifies that breakpoint enabling/disabling works properly # with duplicated breakpoints. -if { [prepare_for_testing break-always.exp break-always break-always.c] } { +if { [prepare_for_testing "failed to prepare" break-always break-always.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/break-caller-line.exp b/gdb/testsuite/gdb.base/break-caller-line.exp index f4a6d73..5254d1a 100644 --- a/gdb/testsuite/gdb.base/break-caller-line.exp +++ b/gdb/testsuite/gdb.base/break-caller-line.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/break-entry.exp b/gdb/testsuite/gdb.base/break-entry.exp index 6b18611..91fb73b 100644 --- a/gdb/testsuite/gdb.base/break-entry.exp +++ b/gdb/testsuite/gdb.base/break-entry.exp @@ -28,11 +28,11 @@ standard_testfile start.c if [target_info exists use_gdb_stub] { - untested ${testfile}.exp + untested "skipping tests due to use_gdb_stub" return } -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile {additional_flags=-static}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile {additional_flags=-static}] } { return -1 } @@ -45,7 +45,7 @@ gdb_test_multiple $test $test { } } if {$entry == ""} { - untested ${testfile}.exp + untested "no entrypoint" return } diff --git a/gdb/testsuite/gdb.base/break-inline.exp b/gdb/testsuite/gdb.base/break-inline.exp index e6162c5..3834e68 100644 --- a/gdb/testsuite/gdb.base/break-inline.exp +++ b/gdb/testsuite/gdb.base/break-inline.exp @@ -14,7 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -if { [prepare_for_testing break-inline.exp "break-inline" {} {debug nowarnings optimize=-O2}] } { +if { [prepare_for_testing "failed to prepare" "break-inline" {} {debug nowarnings optimize=-O2}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp index 65dab5a..06013ce 100644 --- a/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp +++ b/gdb/testsuite/gdb.base/break-on-linker-gcd-function.exp @@ -35,7 +35,7 @@ set additional_flags {-ffunction-sections -Wl,--gc-sections} if {[build_executable_from_specs $testfile.exp $testfile \ {c++ additional_flags=-Wl,--gc-sections} \ $srcfile {debug c++ additional_flags=-ffunction-sections}]} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/break-probes.exp b/gdb/testsuite/gdb.base/break-probes.exp index 6813043..7196ae7 100644 --- a/gdb/testsuite/gdb.base/break-probes.exp +++ b/gdb/testsuite/gdb.base/break-probes.exp @@ -32,7 +32,7 @@ if { [gdb_compile_shlib $srcfile_lib $binfile_lib \ return -1 } -if { [prepare_for_testing $testfile.exp $testfile $srcfile \ +if { [prepare_for_testing "failed to prepare" $testfile $srcfile \ [list additional_flags=-DSHLIB_NAME=\"$binfile_lib\" libs=-ldl]] } { return -1 } diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp index ef0a5d2..95d5bae 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -15,7 +15,7 @@ # This file was written by Rob Savoye. (rob@cygnus.com) -if { [prepare_for_testing break.exp "break" {break.c break1.c} {debug nowarnings}] } { +if { [prepare_for_testing "failed to prepare" "break" {break.c break1.c} {debug nowarnings}] } { return -1 } set srcfile break.c @@ -747,7 +747,7 @@ test_next_with_recursion # build a new file with optimization enabled so that we can try breakpoints # on targets with optimized prologues -if { [prepare_for_testing break.exp "breako2" {break.c break1.c} {debug nowarnings optimize=-O2}] } { +if { [prepare_for_testing "failed to prepare" "breako2" {break.c break1.c} {debug nowarnings optimize=-O2}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/breakpoint-shadow.exp b/gdb/testsuite/gdb.base/breakpoint-shadow.exp index edf4b3b..ac86157 100644 --- a/gdb/testsuite/gdb.base/breakpoint-shadow.exp +++ b/gdb/testsuite/gdb.base/breakpoint-shadow.exp @@ -15,8 +15,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp index 0e10453..de53dae 100644 --- a/gdb/testsuite/gdb.base/call-ar-st.exp +++ b/gdb/testsuite/gdb.base/call-ar-st.exp @@ -35,8 +35,7 @@ if [get_compiler_info] { set skip_float_test [gdb_skip_float_test] -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp index a5405df..32cfa81 100644 --- a/gdb/testsuite/gdb.base/call-sc.exp +++ b/gdb/testsuite/gdb.base/call-sc.exp @@ -59,7 +59,7 @@ proc start_scalars_test { type } { # built the second test case since we can't use prototypes warning "Prototypes not supported, rebuilding with -DNO_PROTOTYPES" if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "${flags} additional_flags=-DNO_PROTOTYPES"] != "" } { - untested call-sc.exp + untested "failed to compile" return -1 } } diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp index 5dd580c..a962a56 100644 --- a/gdb/testsuite/gdb.base/call-signal-resume.exp +++ b/gdb/testsuite/gdb.base/call-signal-resume.exp @@ -29,7 +29,7 @@ if [target_info exists gdb,nosignals] { standard_testfile call-signals.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested call-signal-resume.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp index ac1bf6d..b9ee3180 100644 --- a/gdb/testsuite/gdb.base/call-strs.exp +++ b/gdb/testsuite/gdb.base/call-strs.exp @@ -33,8 +33,7 @@ if [target_info exists gdb,cannot_call_functions] { } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp index 47c0b25..2878cdf 100644 --- a/gdb/testsuite/gdb.base/callfuncs.exp +++ b/gdb/testsuite/gdb.base/callfuncs.exp @@ -499,10 +499,10 @@ proc perform_all_tests {} { # Perform all tests with and without function prototypes. -if { ![prepare_for_testing ${testfile}.exp $testfile $srcfile "$compile_flags additional_flags=-DPROTOTYPES"] } { +if { ![prepare_for_testing "failed to prepare" $testfile $srcfile "$compile_flags additional_flags=-DPROTOTYPES"] } { perform_all_tests } -if { ![prepare_for_testing ${testfile}.exp $testfile $srcfile "$compile_flags additional_flags=-DNO_PROTOTYPES"] } { +if { ![prepare_for_testing "failed to prepare" $testfile $srcfile "$compile_flags additional_flags=-DNO_PROTOTYPES"] } { with_test_prefix "noproto" perform_all_tests } diff --git a/gdb/testsuite/gdb.base/catch-fork-static.exp b/gdb/testsuite/gdb.base/catch-fork-static.exp index 6d39a14..1ca596c 100644 --- a/gdb/testsuite/gdb.base/catch-fork-static.exp +++ b/gdb/testsuite/gdb.base/catch-fork-static.exp @@ -34,7 +34,7 @@ if { ![istarget "*-*-linux*"] && ![istarget "*-*-openbsd*"] } then { # Reusing foll-fork.c since it's a simple forking program. standard_testfile foll-fork.c -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile \ +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile \ {additional_flags=-static}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp index 63c3292..2414e43 100644 --- a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp +++ b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp @@ -31,7 +31,7 @@ if [target_info exists gdb,cannot_call_functions] { set dp_location [gdb_get_line_number "set dprintf here"] set bp_location [gdb_get_line_number "set breakpoint here"] -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/catch-load.exp b/gdb/testsuite/gdb.base/catch-load.exp index 5908e32..d37bc75 100644 --- a/gdb/testsuite/gdb.base/catch-load.exp +++ b/gdb/testsuite/gdb.base/catch-load.exp @@ -14,19 +14,19 @@ # if {[skip_shlib_tests]} { - untested catch-load.exp + untested "skipping shared library tests" return -1 } if {[get_compiler_info]} { warning "Could not get compiler info" - untested catch-load.exp + untested "no compiler info" return -1 } standard_testfile .c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug shlib_load}] != "" } { - untested catch-load.exp + untested "failed to compile" return -1 } @@ -35,7 +35,7 @@ set srcfile2 ${testfile2}.c set binfile2 [standard_output_file ${testfile2}.so] set binfile2_dlopen [shlib_target_file ${testfile2}.so] if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug}] != "" } { - untested catch-load.exp + untested "failed to compile shared library" return -1 } diff --git a/gdb/testsuite/gdb.base/catch-signal-fork.exp b/gdb/testsuite/gdb.base/catch-signal-fork.exp index d49e0cf..f6f5314 100644 --- a/gdb/testsuite/gdb.base/catch-signal-fork.exp +++ b/gdb/testsuite/gdb.base/catch-signal-fork.exp @@ -20,7 +20,7 @@ if [target_info exists gdb,nosignals] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/catch-signal.exp b/gdb/testsuite/gdb.base/catch-signal.exp index 3e2d1c5..d11e5cb 100644 --- a/gdb/testsuite/gdb.base/catch-signal.exp +++ b/gdb/testsuite/gdb.base/catch-signal.exp @@ -20,7 +20,7 @@ if [target_info exists gdb,nosignals] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp index 4bec7a6..d828c9c 100644 --- a/gdb/testsuite/gdb.base/catch-syscall.exp +++ b/gdb/testsuite/gdb.base/catch-syscall.exp @@ -21,8 +21,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp $testfile ${testfile}.c] } { - untested catch-syscall.exp +if { [prepare_for_testing "failed to prepare" $testfile ${testfile}.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp index 7662937..8205a26 100644 --- a/gdb/testsuite/gdb.base/charset.exp +++ b/gdb/testsuite/gdb.base/charset.exp @@ -23,7 +23,7 @@ standard_testfile .c charset-malloc.c -if { [prepare_for_testing ${testfile}.exp ${testfile} [list $srcfile $srcfile2]] } { +if { [prepare_for_testing "failed to prepare" ${testfile} [list $srcfile $srcfile2]] } { return -1 } diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp index 73ea08a..872a0bb 100644 --- a/gdb/testsuite/gdb.base/checkpoint.exp +++ b/gdb/testsuite/gdb.base/checkpoint.exp @@ -36,9 +36,8 @@ if {[is_remote host]} { set copy1_txt [standard_output_file copy1.txt] } -if {[prepare_for_testing ${testfile}.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ [list debug "additional_flags=-DPI_TXT=\"$pi_txt\" -DCOPY1_TXT=\"$copy1_txt\""]]} { - untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/chng-syms.exp b/gdb/testsuite/gdb.base/chng-syms.exp index f161ca3..bed9876 100644 --- a/gdb/testsuite/gdb.base/chng-syms.exp +++ b/gdb/testsuite/gdb.base/chng-syms.exp @@ -21,7 +21,7 @@ standard_testfile .c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DVARIABLE=var1}] != "" } { - untested chng-syms.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/code-expr.exp b/gdb/testsuite/gdb.base/code-expr.exp index 78b6c53..5f0ccae 100644 --- a/gdb/testsuite/gdb.base/code-expr.exp +++ b/gdb/testsuite/gdb.base/code-expr.exp @@ -25,7 +25,7 @@ standard_testfile cvexpr.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested code-expr.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/code_elim.exp b/gdb/testsuite/gdb.base/code_elim.exp index 9ace1df..7c72545 100644 --- a/gdb/testsuite/gdb.base/code_elim.exp +++ b/gdb/testsuite/gdb.base/code_elim.exp @@ -32,12 +32,12 @@ remote_exec build "rm -f ${binfile1}" remote_exec build "rm -f ${binfile2}" if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" executable $opts] != "" } { - untested code_elim.exp + untested "failed to compile" return -1 } if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable $opts] != "" } { - untested code_elim.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/commands.exp b/gdb/testsuite/gdb.base/commands.exp index 85b0bf7..3fbbdef 100644 --- a/gdb/testsuite/gdb.base/commands.exp +++ b/gdb/testsuite/gdb.base/commands.exp @@ -19,7 +19,7 @@ standard_testfile -if { [prepare_for_testing commands.exp commands run.c {debug additional_flags=-DFAKEARGV}] } { +if { [prepare_for_testing "failed to prepare" commands run.c {debug additional_flags=-DFAKEARGV}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp index b72ccf5..3f129ec 100644 --- a/gdb/testsuite/gdb.base/completion.exp +++ b/gdb/testsuite/gdb.base/completion.exp @@ -56,9 +56,8 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug nowarnings}]} { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/complex.exp b/gdb/testsuite/gdb.base/complex.exp index 5767af6..6252462 100644 --- a/gdb/testsuite/gdb.base/complex.exp +++ b/gdb/testsuite/gdb.base/complex.exp @@ -20,8 +20,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/cond-expr.exp b/gdb/testsuite/gdb.base/cond-expr.exp index be2ef24..9ba04db 100644 --- a/gdb/testsuite/gdb.base/cond-expr.exp +++ b/gdb/testsuite/gdb.base/cond-expr.exp @@ -34,7 +34,7 @@ standard_testfile int-type.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } { - untested cond-expr.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp index fb41f1b..d8c0c25 100644 --- a/gdb/testsuite/gdb.base/condbreak.exp +++ b/gdb/testsuite/gdb.base/condbreak.exp @@ -23,7 +23,7 @@ standard_testfile break.c break1.c -if {[prepare_for_testing ${testfile}.exp $testfile [list $srcfile $srcfile2] \ +if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile $srcfile2] \ {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/consecutive.exp b/gdb/testsuite/gdb.base/consecutive.exp index 505295e..512a629 100644 --- a/gdb/testsuite/gdb.base/consecutive.exp +++ b/gdb/testsuite/gdb.base/consecutive.exp @@ -26,8 +26,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/continue-all-already-running.exp b/gdb/testsuite/gdb.base/continue-all-already-running.exp index 9e8aff3..4e5e034 100644 --- a/gdb/testsuite/gdb.base/continue-all-already-running.exp +++ b/gdb/testsuite/gdb.base/continue-all-already-running.exp @@ -18,7 +18,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/coredump-filter.exp b/gdb/testsuite/gdb.base/coredump-filter.exp index 5749418..7d7ab85 100644 --- a/gdb/testsuite/gdb.base/coredump-filter.exp +++ b/gdb/testsuite/gdb.base/coredump-filter.exp @@ -22,7 +22,6 @@ if ![istarget *-*-linux*] then { } if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } { - untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp index a6f445d..b5f8ac4 100644 --- a/gdb/testsuite/gdb.base/corefile.exp +++ b/gdb/testsuite/gdb.base/corefile.exp @@ -30,7 +30,7 @@ if [get_compiler_info] { } if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp index 3d18d6f..c649400 100644 --- a/gdb/testsuite/gdb.base/dbx.exp +++ b/gdb/testsuite/gdb.base/dbx.exp @@ -18,7 +18,7 @@ standard_testfile average.c sum.c if {[build_executable $testfile.exp $testfile \ [list $srcfile $srcfile2] debug] == -1} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/debug-expr.exp b/gdb/testsuite/gdb.base/debug-expr.exp index f254d45..babe994 100644 --- a/gdb/testsuite/gdb.base/debug-expr.exp +++ b/gdb/testsuite/gdb.base/debug-expr.exp @@ -17,7 +17,7 @@ standard_testfile .c -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/define.exp b/gdb/testsuite/gdb.base/define.exp index 8177449..607a389 100644 --- a/gdb/testsuite/gdb.base/define.exp +++ b/gdb/testsuite/gdb.base/define.exp @@ -22,7 +22,7 @@ standard_testfile break.c break1.c -if {[prepare_for_testing ${testfile}.exp ${testfile} \ +if {[prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2] {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/del.exp b/gdb/testsuite/gdb.base/del.exp index 2d7e920..9efb0ca 100644 --- a/gdb/testsuite/gdb.base/del.exp +++ b/gdb/testsuite/gdb.base/del.exp @@ -19,8 +19,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/disabled-location.exp b/gdb/testsuite/gdb.base/disabled-location.exp index 10e5121..18da4ce 100644 --- a/gdb/testsuite/gdb.base/disabled-location.exp +++ b/gdb/testsuite/gdb.base/disabled-location.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/disasm-end-cu.exp b/gdb/testsuite/gdb.base/disasm-end-cu.exp index 38488f7..ca88a78 100644 --- a/gdb/testsuite/gdb.base/disasm-end-cu.exp +++ b/gdb/testsuite/gdb.base/disasm-end-cu.exp @@ -17,7 +17,7 @@ # units displaying source lines. This checks that the disassemble routine # can handle our use of line number 0 to mark the end of sequence. -if { [prepare_for_testing disasm-end-cu.exp "disasm-end-cu" {disasm-end-cu-1.c disasm-end-cu-2.c} {debug}] } { +if { [prepare_for_testing "failed to prepare" "disasm-end-cu" {disasm-end-cu-1.c disasm-end-cu-2.c} {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/disasm-optim.exp b/gdb/testsuite/gdb.base/disasm-optim.exp index 3a60f25..75ea170 100644 --- a/gdb/testsuite/gdb.base/disasm-optim.exp +++ b/gdb/testsuite/gdb.base/disasm-optim.exp @@ -21,7 +21,7 @@ if { ![istarget "x86_64-*-linux*"] } { standard_testfile .S -if { [prepare_for_testing ${testfile}.exp $testfile ${testfile}.S {nodebug}] } { +if { [prepare_for_testing "failed to prepare" $testfile ${testfile}.S {nodebug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp index c02fcf5..d1bcb8f 100644 --- a/gdb/testsuite/gdb.base/display.exp +++ b/gdb/testsuite/gdb.base/display.exp @@ -18,9 +18,8 @@ # standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile \ +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ {debug nowarnings}]} { - untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/duplicate-bp.exp b/gdb/testsuite/gdb.base/duplicate-bp.exp index 4142362..6ffd5da 100644 --- a/gdb/testsuite/gdb.base/duplicate-bp.exp +++ b/gdb/testsuite/gdb.base/duplicate-bp.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/ena-dis-br.exp b/gdb/testsuite/gdb.base/ena-dis-br.exp index ff3073d..c8e47e6 100644 --- a/gdb/testsuite/gdb.base/ena-dis-br.exp +++ b/gdb/testsuite/gdb.base/ena-dis-br.exp @@ -21,7 +21,7 @@ standard_testfile break.c break1.c -if {[prepare_for_testing ${testfile}.exp ${testfile} \ +if {[prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2] {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp index f94ee4b..48eac15 100644 --- a/gdb/testsuite/gdb.base/ending-run.exp +++ b/gdb/testsuite/gdb.base/ending-run.exp @@ -23,7 +23,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp $testfile] } { +if { [prepare_for_testing "failed to prepare" $testfile] } { return -1 } remote_exec build "rm -f core" diff --git a/gdb/testsuite/gdb.base/enumval.exp b/gdb/testsuite/gdb.base/enumval.exp index 78e5cef..698fc2c 100644 --- a/gdb/testsuite/gdb.base/enumval.exp +++ b/gdb/testsuite/gdb.base/enumval.exp @@ -17,8 +17,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/environ.exp b/gdb/testsuite/gdb.base/environ.exp index 5644339..0ee006f 100644 --- a/gdb/testsuite/gdb.base/environ.exp +++ b/gdb/testsuite/gdb.base/environ.exp @@ -26,9 +26,8 @@ if ![istarget "hppa*-*-hpux*"] then { standard_testfile break.c break1.c -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug nowarnings}]} { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/eu-strip-infcall.exp b/gdb/testsuite/gdb.base/eu-strip-infcall.exp index 75b05b4..7edb77c 100644 --- a/gdb/testsuite/gdb.base/eu-strip-infcall.exp +++ b/gdb/testsuite/gdb.base/eu-strip-infcall.exp @@ -22,7 +22,7 @@ if {[build_executable ${testfile}.exp $testfile] == -1} { set test "eu-strip" set status [remote_exec build "eu-strip -f ${binfile}.debug $binfile"] if {[lindex $status 0] != 0} { - untested ${testfile}.exp + untested "failed to compile" return 0 } diff --git a/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp b/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp index f6560b4..39bf104 100644 --- a/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp +++ b/gdb/testsuite/gdb.base/eval-avoid-side-effects.exp @@ -18,7 +18,7 @@ standard_testfile int-type.c -if { [prepare_for_testing ${testfile}.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/eval-skip.exp b/gdb/testsuite/gdb.base/eval-skip.exp index 8a4eb3f..eab4d01 100644 --- a/gdb/testsuite/gdb.base/eval-skip.exp +++ b/gdb/testsuite/gdb.base/eval-skip.exp @@ -35,7 +35,7 @@ standard_testfile int-type.c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } { - untested eval-skip.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/exitsignal.exp b/gdb/testsuite/gdb.base/exitsignal.exp index d7027d3..6ab500e 100644 --- a/gdb/testsuite/gdb.base/exitsignal.exp +++ b/gdb/testsuite/gdb.base/exitsignal.exp @@ -28,7 +28,7 @@ if { [target_info exists gdb,nosignals] } { standard_testfile segv.c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } @@ -78,7 +78,7 @@ gdb_test "print \$_exitcode" " = void" \ # inferior execution. standard_testfile normal.c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/expand-psymtabs.exp b/gdb/testsuite/gdb.base/expand-psymtabs.exp index 59b10d5..ff509fa 100644 --- a/gdb/testsuite/gdb.base/expand-psymtabs.exp +++ b/gdb/testsuite/gdb.base/expand-psymtabs.exp @@ -37,7 +37,7 @@ if [get_compiler_info] { } # We intentionally compile the source file in twice. -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile debug $srcfile {debug additional_flags=-DFIRST} \ $srcfile debug]]} { return -1 diff --git a/gdb/testsuite/gdb.base/filesym.exp b/gdb/testsuite/gdb.base/filesym.exp index a0037c0..4417714 100644 --- a/gdb/testsuite/gdb.base/filesym.exp +++ b/gdb/testsuite/gdb.base/filesym.exp @@ -18,7 +18,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/find-unmapped.exp b/gdb/testsuite/gdb.base/find-unmapped.exp index 2f3473f..2bc4f62 100644 --- a/gdb/testsuite/gdb.base/find-unmapped.exp +++ b/gdb/testsuite/gdb.base/find-unmapped.exp @@ -21,7 +21,7 @@ if {[is_remote target]} { standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/finish.exp index 35294cc..c5d8305 100644 --- a/gdb/testsuite/gdb.base/finish.exp +++ b/gdb/testsuite/gdb.base/finish.exp @@ -18,7 +18,7 @@ set skip_float_test [gdb_skip_float_test] # re-use the program from the "return2" test. -if { [prepare_for_testing finish.exp finish return2.c] } { +if { [prepare_for_testing "failed to prepare" finish return2.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/float.exp b/gdb/testsuite/gdb.base/float.exp index bc3e230..7ab30c9 100644 --- a/gdb/testsuite/gdb.base/float.exp +++ b/gdb/testsuite/gdb.base/float.exp @@ -23,7 +23,7 @@ # -if { [prepare_for_testing float.exp float float.c] } { +if { [prepare_for_testing "failed to prepare" float float.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/foll-exec-mode.exp b/gdb/testsuite/gdb.base/foll-exec-mode.exp index 2c6e379..5de3b03 100644 --- a/gdb/testsuite/gdb.base/foll-exec-mode.exp +++ b/gdb/testsuite/gdb.base/foll-exec-mode.exp @@ -49,12 +49,12 @@ set compile_options debug # build the first test case if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable $compile_options] != "" } { - untested foll-exec-mode.exp + untested "failed to compile" return -1 } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $compile_options] != "" } { - untested foll-exec-mode.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/foll-exec.exp b/gdb/testsuite/gdb.base/foll-exec.exp index ed86c0f..b56e23e 100644 --- a/gdb/testsuite/gdb.base/foll-exec.exp +++ b/gdb/testsuite/gdb.base/foll-exec.exp @@ -32,12 +32,12 @@ set compile_options debug # build the first test case if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable $compile_options] != "" } { - untested foll-exec.exp + untested "failed to compile" return -1 } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $compile_options] != "" } { - untested foll-exec.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp index 61aefc1..7c8a2de 100644 --- a/gdb/testsuite/gdb.base/foll-fork.exp +++ b/gdb/testsuite/gdb.base/foll-fork.exp @@ -22,8 +22,7 @@ if { ![istarget "*-*-linux*"] && ![istarget "*-*-openbsd*"] } then { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/fortran-sym-case.exp b/gdb/testsuite/gdb.base/fortran-sym-case.exp index 9aac96b..94884c6 100644 --- a/gdb/testsuite/gdb.base/fortran-sym-case.exp +++ b/gdb/testsuite/gdb.base/fortran-sym-case.exp @@ -15,7 +15,7 @@ standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/freebpcmd.exp b/gdb/testsuite/gdb.base/freebpcmd.exp index f4c4770..7a8334e 100644 --- a/gdb/testsuite/gdb.base/freebpcmd.exp +++ b/gdb/testsuite/gdb.base/freebpcmd.exp @@ -45,8 +45,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/func-ptr.exp b/gdb/testsuite/gdb.base/func-ptr.exp index cda2e9d..920e438 100644 --- a/gdb/testsuite/gdb.base/func-ptr.exp +++ b/gdb/testsuite/gdb.base/func-ptr.exp @@ -17,7 +17,7 @@ # Trying to print foo->bar if foo is a pointer to a typedef of a pointer # to a function will put gdb into an infinite loop. -if { [prepare_for_testing func-ptr.exp "func-ptr" {func-ptr.c} {debug}] } { +if { [prepare_for_testing "failed to prepare" "func-ptr" {func-ptr.c} {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/func-ptrs.exp b/gdb/testsuite/gdb.base/func-ptrs.exp index a3b55a8..ed6f8b1 100644 --- a/gdb/testsuite/gdb.base/func-ptrs.exp +++ b/gdb/testsuite/gdb.base/func-ptrs.exp @@ -15,12 +15,12 @@ set testname func-ptrs set srcfile ${testname}.c -if { [prepare_for_testing ${testname}.exp ${testname} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testname} ${srcfile}] } { return -1 } if { ![runto_main] } { - untested ${testname}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/funcargs.exp index fe04b2f..27e6a96 100644 --- a/gdb/testsuite/gdb.base/funcargs.exp +++ b/gdb/testsuite/gdb.base/funcargs.exp @@ -31,8 +31,7 @@ if [get_compiler_info] { set skip_float_test [gdb_skip_float_test] -if {[prepare_for_testing $testfile.exp $testfile $srcfile $compile_flags]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile $compile_flags]} { return -1 } diff --git a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp index 92df25f..30c45ee 100644 --- a/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp +++ b/gdb/testsuite/gdb.base/gcore-buffer-overflow.exp @@ -23,7 +23,7 @@ set pattern 0123456789012345678901234567890123456789012345678901234567890123456 append binfile -${pattern} if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } @@ -35,7 +35,7 @@ gdb_test_no_output "set args ${pattern}" \ "set buffer exceeding arguments" if { ! [ runto_main ] } then { - untested gcore-buffer-overflow.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/gcore-relro-pie.exp b/gdb/testsuite/gdb.base/gcore-relro-pie.exp index 5a22d5d..1876838 100644 --- a/gdb/testsuite/gdb.base/gcore-relro-pie.exp +++ b/gdb/testsuite/gdb.base/gcore-relro-pie.exp @@ -19,7 +19,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug additional_flags=-fpie "ldflags=-pie -Wl,-z,relro"}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug additional_flags=-fpie "ldflags=-pie -Wl,-z,relro"}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/gcore-relro.exp b/gdb/testsuite/gdb.base/gcore-relro.exp index 0467c90..abe7f80 100644 --- a/gdb/testsuite/gdb.base/gcore-relro.exp +++ b/gdb/testsuite/gdb.base/gcore-relro.exp @@ -26,7 +26,7 @@ set objfile [standard_output_file ${testfile}.o] if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} {debug}] != "" || [gdb_compile ${srcdir}/${subdir}/${srcfile} ${objfile} object {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } set opts [list debug shlib=${binfile_lib} additional_flags=-Wl,-z,relro] diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp index 9f27170..73c77b3 100644 --- a/gdb/testsuite/gdb.base/gcore.exp +++ b/gdb/testsuite/gdb.base/gcore.exp @@ -19,8 +19,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested "failed to compile" +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/gdb1090.exp b/gdb/testsuite/gdb.base/gdb1090.exp index 2bba93e..4acc2dc 100644 --- a/gdb/testsuite/gdb.base/gdb1090.exp +++ b/gdb/testsuite/gdb.base/gdb1090.exp @@ -24,8 +24,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/gdb11530.exp b/gdb/testsuite/gdb.base/gdb11530.exp index 16fdaaa..9ac54cc 100644 --- a/gdb/testsuite/gdb.base/gdb11530.exp +++ b/gdb/testsuite/gdb.base/gdb11530.exp @@ -31,7 +31,7 @@ if { ![test_compiler_info gcc*] } { return 0 } -if { [prepare_for_testing $testfile.exp $testfile $testfile.c {debug}] } { +if { [prepare_for_testing "failed to prepare" $testfile $testfile.c {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/gdb11531.exp b/gdb/testsuite/gdb.base/gdb11531.exp index 0aea181..efece25 100644 --- a/gdb/testsuite/gdb.base/gdb11531.exp +++ b/gdb/testsuite/gdb.base/gdb11531.exp @@ -22,7 +22,7 @@ standard_testfile -if { [prepare_for_testing $testfile.exp $testfile $testfile.c {debug}] } { +if { [prepare_for_testing "failed to prepare" $testfile $testfile.c {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/gdb1821.exp b/gdb/testsuite/gdb.base/gdb1821.exp index 07de3d6..1a13344 100644 --- a/gdb/testsuite/gdb.base/gdb1821.exp +++ b/gdb/testsuite/gdb.base/gdb1821.exp @@ -24,8 +24,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/gdbindex-stabs.exp b/gdb/testsuite/gdb.base/gdbindex-stabs.exp index 562d886..09855a8 100644 --- a/gdb/testsuite/gdb.base/gdbindex-stabs.exp +++ b/gdb/testsuite/gdb.base/gdbindex-stabs.exp @@ -24,7 +24,7 @@ set objfile_dwarf [standard_output_file ${testfile}-dwarf.o] if {[gdb_compile "${srcdir}/${subdir}/${srcfile_stabs}" ${objfile_stabs} object {additional_flags=-gstabs}] != "" || [gdb_compile "${srcdir}/${subdir}/${srcfile_dwarf}" ${objfile_dwarf} object {additional_flags=-gdwarf-2}] != "" || [gdb_compile "${objfile_stabs} ${objfile_dwarf}" ${binfile} executable {nodebug}] != ""} { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/gdbvars.exp b/gdb/testsuite/gdb.base/gdbvars.exp index 4722ea4..0a15056 100644 --- a/gdb/testsuite/gdb.base/gdbvars.exp +++ b/gdb/testsuite/gdb.base/gdbvars.exp @@ -18,8 +18,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/hbreak.exp b/gdb/testsuite/gdb.base/hbreak.exp index 82a03a7..5450f48 100644 --- a/gdb/testsuite/gdb.base/hbreak.exp +++ b/gdb/testsuite/gdb.base/hbreak.exp @@ -19,7 +19,7 @@ if {[skip_hw_breakpoint_tests]} { set test hbreak set srcfile ${test}.c -if { [prepare_for_testing ${test}.exp ${test} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${test} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/hbreak2.exp b/gdb/testsuite/gdb.base/hbreak2.exp index 3a303ec..5891154 100644 --- a/gdb/testsuite/gdb.base/hbreak2.exp +++ b/gdb/testsuite/gdb.base/hbreak2.exp @@ -19,7 +19,7 @@ # the number available. -if { [prepare_for_testing hbreak2.exp "hbreak2" {break.c break1.c} {debug nowarnings}] } { +if { [prepare_for_testing "failed to prepare" "hbreak2" {break.c break1.c} {debug nowarnings}] } { return -1 } set srcfile break.c @@ -510,7 +510,7 @@ test_next_with_recursion # Build a new file with optimization enabled so that we can try breakpoints # on targets with optimized prologues. -if { [prepare_for_testing hbreak2.exp "hbreak2o2" {break.c break1.c} {debug nowarnings optimize=-O2}] } { +if { [prepare_for_testing "failed to prepare" "hbreak2o2" {break.c break1.c} {debug nowarnings optimize=-O2}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/included.exp b/gdb/testsuite/gdb.base/included.exp index d884a80..cf3ff5e 100644 --- a/gdb/testsuite/gdb.base/included.exp +++ b/gdb/testsuite/gdb.base/included.exp @@ -14,8 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/infcall-input.exp b/gdb/testsuite/gdb.base/infcall-input.exp index 5e764f0..2bef9d2 100644 --- a/gdb/testsuite/gdb.base/infcall-input.exp +++ b/gdb/testsuite/gdb.base/infcall-input.exp @@ -23,8 +23,7 @@ if [target_info exists gdb,cannot_call_functions] { continue } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested "failed to compile" +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/inferior-died.exp b/gdb/testsuite/gdb.base/inferior-died.exp index ce68e5c..f855173 100644 --- a/gdb/testsuite/gdb.base/inferior-died.exp +++ b/gdb/testsuite/gdb.base/inferior-died.exp @@ -33,7 +33,7 @@ if { ![support_displaced_stepping] } { standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${testfile}.c] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${testfile}.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/infnan.exp b/gdb/testsuite/gdb.base/infnan.exp index 364bc91..77aee63 100644 --- a/gdb/testsuite/gdb.base/infnan.exp +++ b/gdb/testsuite/gdb.base/infnan.exp @@ -17,8 +17,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/info-macros.exp b/gdb/testsuite/gdb.base/info-macros.exp index a798b37..3457591 100644 --- a/gdb/testsuite/gdb.base/info-macros.exp +++ b/gdb/testsuite/gdb.base/info-macros.exp @@ -17,13 +17,13 @@ standard_testfile .c # Fission doesn't support macros yet. Bug 15954. if [using_fission] { - untested ${testfile}.exp + untested "fission does not support macros yet" return -1 } get_compiler_info if ![test_compiler_info gcc*] { - untested ${testfile}.exp + untested "no compiler info" return -1 } @@ -31,13 +31,12 @@ if ![test_compiler_info gcc*] { # command line, possibly overriding "-g3" (depending on gcc version). set options "additional_flags=-g3" -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $options] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $options] } { return -1 } if ![runto_main] { - untested ${testfile}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/info-os.exp b/gdb/testsuite/gdb.base/info-os.exp index 32a7b18..8bd7f23 100644 --- a/gdb/testsuite/gdb.base/info-os.exp +++ b/gdb/testsuite/gdb.base/info-os.exp @@ -28,7 +28,7 @@ if [gdb_skip_xml_test] then { } # Compile test program. -if { [prepare_for_testing ${testfile}.exp $testfile $srcfile {debug additional_flags=-lpthread}] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug additional_flags=-lpthread}] } { fail "cannot compile test program" return -1 } diff --git a/gdb/testsuite/gdb.base/info-proc.exp b/gdb/testsuite/gdb.base/info-proc.exp index 3f67752..d054a51 100644 --- a/gdb/testsuite/gdb.base/info-proc.exp +++ b/gdb/testsuite/gdb.base/info-proc.exp @@ -20,9 +20,8 @@ set ws "\[ \t\]+" standard_testfile break.c break1.c -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug nowarnings}]} { - untested $testfile.exp return -1 } @@ -40,7 +39,7 @@ gdb_test_multiple "info proc" "info proc without a process" { } if { ! [ runto_main ] } then { - untested info-proc.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/info-shared.exp b/gdb/testsuite/gdb.base/info-shared.exp index e80326a..3dc0cb3 100644 --- a/gdb/testsuite/gdb.base/info-shared.exp +++ b/gdb/testsuite/gdb.base/info-shared.exp @@ -42,7 +42,7 @@ if { [gdb_compile_shlib $srcfile_lib2 $binfile_lib2 \ } set cflags "$define1 $define2" -if { [prepare_for_testing $testfile.exp $testfile $srcfile \ +if { [prepare_for_testing "failed to prepare" $testfile $srcfile \ [list additional_flags=$cflags libs=-ldl]] } { return -1 } diff --git a/gdb/testsuite/gdb.base/info-target.exp b/gdb/testsuite/gdb.base/info-target.exp index 03111f3..6436cf1 100644 --- a/gdb/testsuite/gdb.base/info-target.exp +++ b/gdb/testsuite/gdb.base/info-target.exp @@ -16,7 +16,7 @@ standard_testfile start.c -if { [prepare_for_testing ${testfile}.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/infoline.exp b/gdb/testsuite/gdb.base/infoline.exp index 2a848f0..daf4d32 100644 --- a/gdb/testsuite/gdb.base/infoline.exp +++ b/gdb/testsuite/gdb.base/infoline.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/interp.exp b/gdb/testsuite/gdb.base/interp.exp index 0f3ec81..a9d0ce6 100644 --- a/gdb/testsuite/gdb.base/interp.exp +++ b/gdb/testsuite/gdb.base/interp.exp @@ -17,7 +17,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile {debug}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp index d5add42..cb0f238 100644 --- a/gdb/testsuite/gdb.base/interrupt.exp +++ b/gdb/testsuite/gdb.base/interrupt.exp @@ -31,7 +31,7 @@ if { ! [target_info exists gdb,nosignals] } { } if {[build_executable $testfile.exp $testfile $srcfile $options] == -1} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/jit-reader.exp b/gdb/testsuite/gdb.base/jit-reader.exp index 642c257..9871cc0 100644 --- a/gdb/testsuite/gdb.base/jit-reader.exp +++ b/gdb/testsuite/gdb.base/jit-reader.exp @@ -43,7 +43,7 @@ set jit_reader_flag "-DJIT_READER_H=\"$jit_reader_header\"" if { [gdb_compile "${srcdir}/${subdir}/${jit_host_src}" "${jit_host_bin}" \ executable [list debug additional_flags=$jit_reader_flag]] != "" } { - untested jit-reader.exp + untested "failed to compile" return -1 } @@ -53,7 +53,7 @@ set jit_reader_bin [standard_output_file ${jit_reader}.so] if { [gdb_compile_shlib "${srcdir}/${subdir}/${jit_reader_src}" "${jit_reader_bin}" \ [list debug additional_flags=$jit_reader_flag]] != "" } { - untested jit-reader.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/jit-simple.exp b/gdb/testsuite/gdb.base/jit-simple.exp index 30e41e1..c2bc6cd 100644 --- a/gdb/testsuite/gdb.base/jit-simple.exp +++ b/gdb/testsuite/gdb.base/jit-simple.exp @@ -25,7 +25,7 @@ # address between runs. if {[skip_shlib_tests]} { - untested jit-simple.exp + untested "skipping shared library tests" return -1 } @@ -79,7 +79,7 @@ set binfile_dl $binfile-dl set options [list debug shlib=${binfile_lib}] if {[gdb_compile ${srcdir}/${subdir}/${srcfile_dl} $binfile_dl executable \ [list debug shlib=$binfile_lib]] == -1 } { - untested jit-simple.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/kill-after-signal.exp b/gdb/testsuite/gdb.base/kill-after-signal.exp index 4181bec..c331a28 100644 --- a/gdb/testsuite/gdb.base/kill-after-signal.exp +++ b/gdb/testsuite/gdb.base/kill-after-signal.exp @@ -16,7 +16,7 @@ standard_testfile .c if { ![can_single_step_to_signal_handler] } { - untested ${testfile}.exp + untested "cannot single-step to signal handler" return } @@ -25,7 +25,7 @@ if [target_info exists gdb,nosignals] { continue } -if [prepare_for_testing ${testfile}.exp ${testfile}] { +if [prepare_for_testing "failed to prepare" ${testfile}] { return -1 } diff --git a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp index bdecbbd..4696825 100644 --- a/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp +++ b/gdb/testsuite/gdb.base/kill-detach-inferiors-cmd.exp @@ -25,7 +25,7 @@ if ![can_spawn_for_attach] { standard_testfile set executable $testfile -if [prepare_for_testing $testfile.exp $executable] { +if [prepare_for_testing "failed to prepare" $executable] { return -1 } diff --git a/gdb/testsuite/gdb.base/label.exp b/gdb/testsuite/gdb.base/label.exp index 2901c33..7b38582 100644 --- a/gdb/testsuite/gdb.base/label.exp +++ b/gdb/testsuite/gdb.base/label.exp @@ -25,8 +25,7 @@ if [is_remote target] then { standard_testfile .c -if { [prepare_for_testing ${testfile}.exp $testfile ${srcfile} debug] } { - untested "failed to compile" +if { [prepare_for_testing "failed to prepare" $testfile ${srcfile} debug] } { return -1 } diff --git a/gdb/testsuite/gdb.base/langs.exp b/gdb/testsuite/gdb.base/langs.exp index d2f4f2c..b5d8077 100644 --- a/gdb/testsuite/gdb.base/langs.exp +++ b/gdb/testsuite/gdb.base/langs.exp @@ -22,7 +22,7 @@ if [is_remote host] { } -if {[prepare_for_testing ${testfile}.exp ${testfile} \ +if {[prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2 $srcfile3] {debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/ldbl_e308.exp b/gdb/testsuite/gdb.base/ldbl_e308.exp index 3d211f1..d302682 100644 --- a/gdb/testsuite/gdb.base/ldbl_e308.exp +++ b/gdb/testsuite/gdb.base/ldbl_e308.exp @@ -15,12 +15,12 @@ set testfile ldbl_e308 set srcfile ${testfile}.c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } if ![runto_main] { - untested ${testfile}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/line-symtabs.exp b/gdb/testsuite/gdb.base/line-symtabs.exp index 85e9b2f..b8177b6 100644 --- a/gdb/testsuite/gdb.base/line-symtabs.exp +++ b/gdb/testsuite/gdb.base/line-symtabs.exp @@ -16,7 +16,7 @@ standard_testfile .c line-symtabs.h -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/linespecs.exp b/gdb/testsuite/gdb.base/linespecs.exp index c564495..2a005ee 100644 --- a/gdb/testsuite/gdb.base/linespecs.exp +++ b/gdb/testsuite/gdb.base/linespecs.exp @@ -18,7 +18,7 @@ # We don't currently need our own test case for testing, so grab # another one. -if {[prepare_for_testing linespecs.exp linespecs memattr.c]} { +if {[prepare_for_testing "failed to prepare" linespecs memattr.c]} { return -1 } diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp index a9e2965..ac64e43 100644 --- a/gdb/testsuite/gdb.base/list.exp +++ b/gdb/testsuite/gdb.base/list.exp @@ -21,7 +21,7 @@ standard_testfile list0.c list1.c # Need to download the header to the host. gdb_remote_download host ${srcdir}/${subdir}/list0.h -if {[prepare_for_testing $testfile.exp $testfile [list $srcfile $srcfile2] \ +if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile $srcfile2] \ {debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp index ab47374..39d1b3c 100644 --- a/gdb/testsuite/gdb.base/long_long.exp +++ b/gdb/testsuite/gdb.base/long_long.exp @@ -31,7 +31,7 @@ if [get_compiler_info] { } if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [concat debug nowarnings]] != "" } { - untested long_long.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/longest-types.exp b/gdb/testsuite/gdb.base/longest-types.exp index e94652f..3ee0d0e 100644 --- a/gdb/testsuite/gdb.base/longest-types.exp +++ b/gdb/testsuite/gdb.base/longest-types.exp @@ -17,7 +17,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile {debug quiet}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile {debug quiet}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp index df5525d..49be78d 100644 --- a/gdb/testsuite/gdb.base/maint.exp +++ b/gdb/testsuite/gdb.base/maint.exp @@ -48,9 +48,8 @@ standard_testfile break.c break1.c -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] {debug nowarnings}]} { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/max-value-size.exp b/gdb/testsuite/gdb.base/max-value-size.exp index 730e981..112fb4a 100644 --- a/gdb/testsuite/gdb.base/max-value-size.exp +++ b/gdb/testsuite/gdb.base/max-value-size.exp @@ -15,8 +15,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/memattr.exp b/gdb/testsuite/gdb.base/memattr.exp index 0f46b31..aa8229e 100644 --- a/gdb/testsuite/gdb.base/memattr.exp +++ b/gdb/testsuite/gdb.base/memattr.exp @@ -19,7 +19,7 @@ standard_testfile .c -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/mips_pro.exp b/gdb/testsuite/gdb.base/mips_pro.exp index ff131f7..5ad1ed7 100644 --- a/gdb/testsuite/gdb.base/mips_pro.exp +++ b/gdb/testsuite/gdb.base/mips_pro.exp @@ -30,8 +30,7 @@ if { [test_compiler_info gcc-*-*] } then { lappend options additional_flags=-O2 additional_flags=-fno-inline } -if {[prepare_for_testing $testfile.exp $testfile $srcfile $options]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile $options]} { return -1 } diff --git a/gdb/testsuite/gdb.base/morestack.exp b/gdb/testsuite/gdb.base/morestack.exp index fb9bbf3..2f07baa 100644 --- a/gdb/testsuite/gdb.base/morestack.exp +++ b/gdb/testsuite/gdb.base/morestack.exp @@ -26,8 +26,8 @@ standard_testfile # -fuse-ld=gold is used for calling printf code built without -fsplit-stack # which could crash otherwise. See GCC documentation of -fsplit-stack. set opts "additional_flags=-fsplit-stack" -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile [list $opts additional_flags=-fuse-ld=gold]] \ - && [prepare_for_testing ${testfile}.exp ${testfile} $srcfile $opts] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile [list $opts additional_flags=-fuse-ld=gold]] \ + && [prepare_for_testing "failed to prepare" ${testfile} $srcfile $opts] } { return -1 } diff --git a/gdb/testsuite/gdb.base/moribund-step.exp b/gdb/testsuite/gdb.base/moribund-step.exp index 65e7240..ea423cc 100644 --- a/gdb/testsuite/gdb.base/moribund-step.exp +++ b/gdb/testsuite/gdb.base/moribund-step.exp @@ -20,7 +20,7 @@ if { ![support_displaced_stepping] } { return -1 } -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp index d3f5700..811daef 100644 --- a/gdb/testsuite/gdb.base/multi-forks.exp +++ b/gdb/testsuite/gdb.base/multi-forks.exp @@ -24,7 +24,7 @@ if { ![istarget "*-*-linux*"] } then { standard_testfile .c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested multi-forks.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/nested-addr.exp b/gdb/testsuite/gdb.base/nested-addr.exp index 1c10567..1a6d2c2 100644 --- a/gdb/testsuite/gdb.base/nested-addr.exp +++ b/gdb/testsuite/gdb.base/nested-addr.exp @@ -15,7 +15,7 @@ standard_testfile -if {[prepare_for_testing "${testfile}.exp" "${testfile}" "${srcfile}"]} { +if {[prepare_for_testing "failed to prepare" "${testfile}" "${srcfile}"]} { return -1 } diff --git a/gdb/testsuite/gdb.base/nextoverexit.exp b/gdb/testsuite/gdb.base/nextoverexit.exp index c768451..4c8b844 100644 --- a/gdb/testsuite/gdb.base/nextoverexit.exp +++ b/gdb/testsuite/gdb.base/nextoverexit.exp @@ -14,7 +14,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $testfile.c]} { +if {[prepare_for_testing "failed to prepare" $testfile $testfile.c]} { return -1 } diff --git a/gdb/testsuite/gdb.base/noreturn-finish.exp b/gdb/testsuite/gdb.base/noreturn-finish.exp index 4affdcd..4ad30f6 100644 --- a/gdb/testsuite/gdb.base/noreturn-finish.exp +++ b/gdb/testsuite/gdb.base/noreturn-finish.exp @@ -23,7 +23,7 @@ proc noreturn_finish_test { } { global gdb_prompt if { ! [ runto_main ] } then { - untested ${testfile}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/noreturn-return.exp b/gdb/testsuite/gdb.base/noreturn-return.exp index 6c7bf07..d1635bd 100644 --- a/gdb/testsuite/gdb.base/noreturn-return.exp +++ b/gdb/testsuite/gdb.base/noreturn-return.exp @@ -23,7 +23,7 @@ proc noreturn_test { } { global gdb_prompt if { ! [ runto_main ] } then { - untested ${testfile}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/nostdlib.exp b/gdb/testsuite/gdb.base/nostdlib.exp index c0e1578..448410f 100644 --- a/gdb/testsuite/gdb.base/nostdlib.exp +++ b/gdb/testsuite/gdb.base/nostdlib.exp @@ -19,7 +19,7 @@ standard_testfile .c # See also the comment in break-entry.exp. if [target_info exists use_gdb_stub] { - untested ${testfile}.exp + untested "skipping tests due to use_gdb_stub" return } @@ -41,7 +41,7 @@ if [board_info $board exists mathlib] { unset_board_info mathlib } if {$err != ""} { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/offsets.exp b/gdb/testsuite/gdb.base/offsets.exp index 9637eab..e6943c2 100644 --- a/gdb/testsuite/gdb.base/offsets.exp +++ b/gdb/testsuite/gdb.base/offsets.exp @@ -19,7 +19,6 @@ standard_testfile offsets.c if { [prepare_for_testing "failed to prepare for testing large offsets" \ ${testfile} ${srcfile}] } { - untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/opaque.exp b/gdb/testsuite/gdb.base/opaque.exp index 3241171..5b06ffa 100644 --- a/gdb/testsuite/gdb.base/opaque.exp +++ b/gdb/testsuite/gdb.base/opaque.exp @@ -24,9 +24,8 @@ if [get_compiler_info] { standard_testfile opaque0.c opaque1.c -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] debug]} { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/pc-fp.exp b/gdb/testsuite/gdb.base/pc-fp.exp index e2b9228..dc44591 100644 --- a/gdb/testsuite/gdb.base/pc-fp.exp +++ b/gdb/testsuite/gdb.base/pc-fp.exp @@ -30,8 +30,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug nowarnings}]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/permissions.exp b/gdb/testsuite/gdb.base/permissions.exp index 19c3b04..0e962a3 100644 --- a/gdb/testsuite/gdb.base/permissions.exp +++ b/gdb/testsuite/gdb.base/permissions.exp @@ -22,7 +22,7 @@ standard_testfile start.c if {[build_executable $testfile.exp $testfile \ $srcfile {debug nowarnings}] == -1} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/print-symbol-loading.exp b/gdb/testsuite/gdb.base/print-symbol-loading.exp index ac7d67a..9e28e14 100644 --- a/gdb/testsuite/gdb.base/print-symbol-loading.exp +++ b/gdb/testsuite/gdb.base/print-symbol-loading.exp @@ -28,12 +28,12 @@ set objfile [standard_output_file ${testfile}.o] if { [gdb_compile_shlib ${srcdir}/${subdir}/${srcfile_lib} ${binfile_lib} {debug}] != "" || [gdb_compile ${srcdir}/${subdir}/${srcfile} ${objfile} object {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } set opts [list debug shlib=${binfile_lib}] if { [gdb_compile ${objfile} ${binfile} executable $opts] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/prologue-include.exp b/gdb/testsuite/gdb.base/prologue-include.exp index 08cc9e9..75cf175 100644 --- a/gdb/testsuite/gdb.base/prologue-include.exp +++ b/gdb/testsuite/gdb.base/prologue-include.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/psymtab.exp b/gdb/testsuite/gdb.base/psymtab.exp index d316d94..dc820bb 100644 --- a/gdb/testsuite/gdb.base/psymtab.exp +++ b/gdb/testsuite/gdb.base/psymtab.exp @@ -34,9 +34,8 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile \ +if {[prepare_for_testing "failed to prepare" $testfile \ [list $srcfile $srcfile2] debug]} { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/ptype.exp b/gdb/testsuite/gdb.base/ptype.exp index 296b67a..3f73121 100644 --- a/gdb/testsuite/gdb.base/ptype.exp +++ b/gdb/testsuite/gdb.base/ptype.exp @@ -21,7 +21,7 @@ standard_testfile .c ptype1.c -if {[prepare_for_testing ${testfile}.exp ${testfile} \ +if {[prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2] {debug nowarnings}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/random-signal.exp b/gdb/testsuite/gdb.base/random-signal.exp index b14662a..b666e08 100644 --- a/gdb/testsuite/gdb.base/random-signal.exp +++ b/gdb/testsuite/gdb.base/random-signal.exp @@ -26,7 +26,7 @@ if [target_info exists gdb,nointerrupts] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/randomize.exp b/gdb/testsuite/gdb.base/randomize.exp index 529e6d6..2c9d6d0 100644 --- a/gdb/testsuite/gdb.base/randomize.exp +++ b/gdb/testsuite/gdb.base/randomize.exp @@ -15,8 +15,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/range-stepping.exp b/gdb/testsuite/gdb.base/range-stepping.exp index 9ed92c7..ed16ae6 100644 --- a/gdb/testsuite/gdb.base/range-stepping.exp +++ b/gdb/testsuite/gdb.base/range-stepping.exp @@ -18,7 +18,7 @@ load_lib "range-stepping-support.exp" standard_testfile set executable $testfile -if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug}] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/readline-ask.exp b/gdb/testsuite/gdb.base/readline-ask.exp index 4897367..05d3e1f 100644 --- a/gdb/testsuite/gdb.base/readline-ask.exp +++ b/gdb/testsuite/gdb.base/readline-ask.exp @@ -17,7 +17,7 @@ standard_testfile .c set inputrc ${srcdir}/${subdir}/${testfile}.inputrc if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/recpar.exp b/gdb/testsuite/gdb.base/recpar.exp index cc1a46c..225f752 100644 --- a/gdb/testsuite/gdb.base/recpar.exp +++ b/gdb/testsuite/gdb.base/recpar.exp @@ -15,12 +15,12 @@ standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } if ![runto_main] { - untested ${testfile}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/recurse.exp b/gdb/testsuite/gdb.base/recurse.exp index d4c5a26..1ab4643 100644 --- a/gdb/testsuite/gdb.base/recurse.exp +++ b/gdb/testsuite/gdb.base/recurse.exp @@ -18,8 +18,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/relational.exp b/gdb/testsuite/gdb.base/relational.exp index cebd423..e2909a7 100644 --- a/gdb/testsuite/gdb.base/relational.exp +++ b/gdb/testsuite/gdb.base/relational.exp @@ -25,7 +25,7 @@ # test running programs # -if { [prepare_for_testing relational.exp relational int-type.c {debug nowarnings}] } { +if { [prepare_for_testing "failed to prepare" relational int-type.c {debug nowarnings}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/restore.exp b/gdb/testsuite/gdb.base/restore.exp index ece5df2..313efa3 100644 --- a/gdb/testsuite/gdb.base/restore.exp +++ b/gdb/testsuite/gdb.base/restore.exp @@ -24,7 +24,7 @@ standard_testfile set executable $testfile -if { [prepare_for_testing $testfile.exp $executable $srcfile] } { +if { [prepare_for_testing "failed to prepare" $executable $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/return-nodebug.exp b/gdb/testsuite/gdb.base/return-nodebug.exp index 0d58ba5..2e1111d 100644 --- a/gdb/testsuite/gdb.base/return-nodebug.exp +++ b/gdb/testsuite/gdb.base/return-nodebug.exp @@ -54,7 +54,7 @@ foreach type {{signed char} {short} {int} {long} {long long} {float} {double}} { set additional_flags "additional_flags=-DTYPE=$typeesc" - if {[prepare_for_testing_full $testfile.exp \ + if {[prepare_for_testing_full "failed to prepare" \ [list ${testfile}-${typenospace} debug \ $srcfile [list debug $additional_flags] \ $srcfile2 [list $additional_flags]]]} { diff --git a/gdb/testsuite/gdb.base/return.exp b/gdb/testsuite/gdb.base/return.exp index 63cccf2..f5fe3df 100644 --- a/gdb/testsuite/gdb.base/return.exp +++ b/gdb/testsuite/gdb.base/return.exp @@ -15,7 +15,7 @@ # This file was written by Jeff Law. (law@cs.utah.edu) -if { [prepare_for_testing return.exp "return"] } { +if { [prepare_for_testing "failed to prepare" "return"] } { return -1 } diff --git a/gdb/testsuite/gdb.base/run-after-attach.exp b/gdb/testsuite/gdb.base/run-after-attach.exp index c4551ab..1aaa97f 100644 --- a/gdb/testsuite/gdb.base/run-after-attach.exp +++ b/gdb/testsuite/gdb.base/run-after-attach.exp @@ -23,7 +23,7 @@ if ![can_spawn_for_attach] { standard_testfile set executable $testfile -if [prepare_for_testing $testfile.exp $executable] { +if [prepare_for_testing "failed to prepare" $executable] { return -1 } diff --git a/gdb/testsuite/gdb.base/save-bp.exp b/gdb/testsuite/gdb.base/save-bp.exp index 7eae013..cc71163 100644 --- a/gdb/testsuite/gdb.base/save-bp.exp +++ b/gdb/testsuite/gdb.base/save-bp.exp @@ -15,12 +15,12 @@ standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } { return -1 } if ![runto_main] { - untested ${testfile}.exp + untested "could not run to main" return -1 } # Delete all breakpoints so that the "runto_main" breakpoint above diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp index 37d0657..42987a1 100644 --- a/gdb/testsuite/gdb.base/scope.exp +++ b/gdb/testsuite/gdb.base/scope.exp @@ -18,7 +18,7 @@ standard_testfile scope0.c scope1.c -if {[prepare_for_testing ${testfile}.exp ${testfile} \ +if {[prepare_for_testing "failed to prepare" ${testfile} \ [list $srcfile $srcfile2] {debug}]} { return -1 } diff --git a/gdb/testsuite/gdb.base/sect-cmd.exp b/gdb/testsuite/gdb.base/sect-cmd.exp index 502e1b5..df469e5 100644 --- a/gdb/testsuite/gdb.base/sect-cmd.exp +++ b/gdb/testsuite/gdb.base/sect-cmd.exp @@ -32,17 +32,17 @@ set srcfile1 break1.c set binfile ${objdir}/${subdir}/${testfile} if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}0.o" object {debug nowarnings}] != "" } { - untested sect-cmd.exp + untested "failed to compile" return -1 } if { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile}1.o" object {debug nowarnings}] != "" } { - untested sect-cmd.exp + untested "failed to compile" return -1 } if { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug nowarnings}] != "" } { - untested sect-cmd.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/set-lang-auto.exp b/gdb/testsuite/gdb.base/set-lang-auto.exp index 6887e1e..f0eb1ca 100644 --- a/gdb/testsuite/gdb.base/set-lang-auto.exp +++ b/gdb/testsuite/gdb.base/set-lang-auto.exp @@ -16,8 +16,7 @@ standard_testfile start.c -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/set-noassign.exp b/gdb/testsuite/gdb.base/set-noassign.exp index fd9691d..b92a417 100644 --- a/gdb/testsuite/gdb.base/set-noassign.exp +++ b/gdb/testsuite/gdb.base/set-noassign.exp @@ -14,7 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. -if { [prepare_for_testing set-noassign.exp "set-noassign" start.c {debug nowarnings}] } { +if { [prepare_for_testing "failed to prepare" "set-noassign" start.c {debug nowarnings}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/setvar.exp b/gdb/testsuite/gdb.base/setvar.exp index bda9e73..426ec22 100644 --- a/gdb/testsuite/gdb.base/setvar.exp +++ b/gdb/testsuite/gdb.base/setvar.exp @@ -32,8 +32,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/sigall.exp b/gdb/testsuite/gdb.base/sigall.exp index fd593ff..78d3111 100644 --- a/gdb/testsuite/gdb.base/sigall.exp +++ b/gdb/testsuite/gdb.base/sigall.exp @@ -20,8 +20,7 @@ if [target_info exists gdb,nosignals] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sigbpt.exp index 012bd29..4b6452e 100644 --- a/gdb/testsuite/gdb.base/sigbpt.exp +++ b/gdb/testsuite/gdb.base/sigbpt.exp @@ -36,8 +36,7 @@ if [target_info exists gdb,nosignals] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.base/siginfo-addr.exp index 70900d4..a14c933 100644 --- a/gdb/testsuite/gdb.base/siginfo-addr.exp +++ b/gdb/testsuite/gdb.base/siginfo-addr.exp @@ -27,8 +27,7 @@ if [target_info exists gdb,nosignals] { } standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested "failed to compile" +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/siginfo-infcall.exp b/gdb/testsuite/gdb.base/siginfo-infcall.exp index 5977360..bd7dab7 100644 --- a/gdb/testsuite/gdb.base/siginfo-infcall.exp +++ b/gdb/testsuite/gdb.base/siginfo-infcall.exp @@ -20,7 +20,7 @@ if [target_info exists gdb,nosignals] { standard_testfile .c -if { [prepare_for_testing ${testfile}.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/siginfo-obj.exp b/gdb/testsuite/gdb.base/siginfo-obj.exp index ca40216..2f604bc 100644 --- a/gdb/testsuite/gdb.base/siginfo-obj.exp +++ b/gdb/testsuite/gdb.base/siginfo-obj.exp @@ -34,8 +34,7 @@ if { ![supports_get_siginfo_type] } { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/siginfo.exp index 9f54ac0..94cd748 100644 --- a/gdb/testsuite/gdb.base/siginfo.exp +++ b/gdb/testsuite/gdb.base/siginfo.exp @@ -31,8 +31,7 @@ if [target_info exists gdb,nosignals] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/signals-state-child.exp b/gdb/testsuite/gdb.base/signals-state-child.exp index cd6a9a5..2e6d033 100644 --- a/gdb/testsuite/gdb.base/signals-state-child.exp +++ b/gdb/testsuite/gdb.base/signals-state-child.exp @@ -46,13 +46,13 @@ remote_file target delete $standalone_txt set options [list debug "additional_flags=-DOUTPUT_TXT=\"$gdb_txt\""] if {[build_executable $testfile.exp $testfile $srcfile $options]} { - untested $testfile.exp + untested "failed to compile" return -1 } set options [list debug "additional_flags=-DOUTPUT_TXT=\"$standalone_txt\""] if {[build_executable $testfile.exp $testfile-standalone $srcfile $options]} { - untested $testfile.exp + untested "failed to compile" return -1 } @@ -80,7 +80,7 @@ remote_close target clean_restart $binfile if { ! [ runto_main ] } then { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/signest.exp b/gdb/testsuite/gdb.base/signest.exp index d53b1b0..f0d5562 100644 --- a/gdb/testsuite/gdb.base/signest.exp +++ b/gdb/testsuite/gdb.base/signest.exp @@ -22,13 +22,12 @@ if [target_info exists gdb,nosignals] { return -1 } -if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug}] { - untested ${testfile}.exp +if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}] { return -1 } if ![runto_main] then { - untested ${testfile}.exp + untested "could not run to main" return -1 } diff --git a/gdb/testsuite/gdb.base/sigstep.exp b/gdb/testsuite/gdb.base/sigstep.exp index 48d104b..7b2199f 100644 --- a/gdb/testsuite/gdb.base/sigstep.exp +++ b/gdb/testsuite/gdb.base/sigstep.exp @@ -30,7 +30,7 @@ if [target_info exists gdb,nosignals] { standard_testfile if {[build_executable $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/sizeof.exp b/gdb/testsuite/gdb.base/sizeof.exp index e6c7af6..0645d81 100644 --- a/gdb/testsuite/gdb.base/sizeof.exp +++ b/gdb/testsuite/gdb.base/sizeof.exp @@ -25,8 +25,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/skip.exp b/gdb/testsuite/gdb.base/skip.exp index 7eafd94..63f1fe1 100644 --- a/gdb/testsuite/gdb.base/skip.exp +++ b/gdb/testsuite/gdb.base/skip.exp @@ -16,7 +16,7 @@ # This file was written by Justin Lebar. (justin.lebar@gmail.com) # And further hacked on by Doug Evans. (dje@google.com) -if { [prepare_for_testing skip.exp "skip" \ +if { [prepare_for_testing "failed to prepare" "skip" \ {skip.c skip1.c } \ {debug nowarnings}] } { return -1 diff --git a/gdb/testsuite/gdb.base/solib-corrupted.exp b/gdb/testsuite/gdb.base/solib-corrupted.exp index 71a42ba..f0f02d7 100644 --- a/gdb/testsuite/gdb.base/solib-corrupted.exp +++ b/gdb/testsuite/gdb.base/solib-corrupted.exp @@ -26,8 +26,7 @@ if {[is_remote target]} { set testfile "solib-corrupted" set srcfile start.c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/solib-nodir.exp b/gdb/testsuite/gdb.base/solib-nodir.exp index e4f15d0..3d6083d 100644 --- a/gdb/testsuite/gdb.base/solib-nodir.exp +++ b/gdb/testsuite/gdb.base/solib-nodir.exp @@ -36,7 +36,7 @@ if { [get_compiler_info] || [gdb_gnu_strip_debug $binlibfile] || [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug}] != "" || [gdb_compile "${objfile} ${binlibfile}" "${binfile}" executable {}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/solib-search.exp b/gdb/testsuite/gdb.base/solib-search.exp index a080f2b..9018b48 100644 --- a/gdb/testsuite/gdb.base/solib-search.exp +++ b/gdb/testsuite/gdb.base/solib-search.exp @@ -17,14 +17,14 @@ # is properly reset when the path is changed. if {[is_remote target] || [skip_shlib_tests]} { - untested solib-search.exp + untested "skipping remote target and shared library tests" return -1 } # This is required by gdb_compile_shlib. if {[get_compiler_info]} { warning "Could not get compiler info" - untested solib-search.exp + untested "no compiler info" return 1 } diff --git a/gdb/testsuite/gdb.base/stack-checking.exp b/gdb/testsuite/gdb.base/stack-checking.exp index aa68575..c786edb 100644 --- a/gdb/testsuite/gdb.base/stack-checking.exp +++ b/gdb/testsuite/gdb.base/stack-checking.exp @@ -17,7 +17,7 @@ standard_testfile .c if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [concat debug additional_flags=-fstack-check nowarnings]] != "" } { - untested stack-checking.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/stale-infcall.exp b/gdb/testsuite/gdb.base/stale-infcall.exp index 67b42e5..bc8f9ac 100644 --- a/gdb/testsuite/gdb.base/stale-infcall.exp +++ b/gdb/testsuite/gdb.base/stale-infcall.exp @@ -15,7 +15,7 @@ standard_testfile .c -if { [prepare_for_testing $testfile.exp $testfile $srcfile] } { +if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/stap-probe.exp b/gdb/testsuite/gdb.base/stap-probe.exp index df46e80..c3726be 100644 --- a/gdb/testsuite/gdb.base/stap-probe.exp +++ b/gdb/testsuite/gdb.base/stap-probe.exp @@ -21,7 +21,7 @@ standard_testfile proc stap_test {exec_name {arg ""}} { global testfile hex srcfile - if {[prepare_for_testing ${testfile}.exp ${exec_name} $srcfile \ + if {[prepare_for_testing "failed to prepare" ${exec_name} $srcfile \ [concat $arg debug]]} { return -1 } @@ -96,7 +96,7 @@ proc stap_test {exec_name {arg ""}} { proc stap_test_no_debuginfo {exec_name {arg ""}} { global testfile hex - if {[prepare_for_testing ${testfile}.exp ${exec_name} ${testfile}.c \ + if {[prepare_for_testing "failed to prepare" ${exec_name} ${testfile}.c \ {$arg nodebug optimize=-O2}]} { return -1 } @@ -161,7 +161,7 @@ proc stap_test_no_debuginfo {exec_name {arg ""}} { with_test_prefix "without semaphore, not optimized" { if {[stap_test "stap-probe-nosem-noopt"] == -1} { - untested stap-probe.exp + untested "stap probe test failed" return -1 } } diff --git a/gdb/testsuite/gdb.base/start.exp b/gdb/testsuite/gdb.base/start.exp index c338a08..27959ba 100644 --- a/gdb/testsuite/gdb.base/start.exp +++ b/gdb/testsuite/gdb.base/start.exp @@ -16,8 +16,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/step-break.exp b/gdb/testsuite/gdb.base/step-break.exp index 19794cb..9496609 100644 --- a/gdb/testsuite/gdb.base/step-break.exp +++ b/gdb/testsuite/gdb.base/step-break.exp @@ -17,8 +17,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested step-break.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/step-bt.exp b/gdb/testsuite/gdb.base/step-bt.exp index 74d9708..a7008d1 100644 --- a/gdb/testsuite/gdb.base/step-bt.exp +++ b/gdb/testsuite/gdb.base/step-bt.exp @@ -19,8 +19,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/step-line.exp b/gdb/testsuite/gdb.base/step-line.exp index 292dc7c..ac8c920 100644 --- a/gdb/testsuite/gdb.base/step-line.exp +++ b/gdb/testsuite/gdb.base/step-line.exp @@ -23,8 +23,7 @@ standard_testfile set linefile ${testfile}.inp -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/step-over-exit.exp b/gdb/testsuite/gdb.base/step-over-exit.exp index 3cf5d0d..b42e578 100644 --- a/gdb/testsuite/gdb.base/step-over-exit.exp +++ b/gdb/testsuite/gdb.base/step-over-exit.exp @@ -31,8 +31,7 @@ if { [istarget "i\[34567\]86-*-linux*"] || [istarget "x86_64-*-linux*"] } { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/step-over-syscall.exp b/gdb/testsuite/gdb.base/step-over-syscall.exp index e1d5ba1..14e9971 100644 --- a/gdb/testsuite/gdb.base/step-over-syscall.exp +++ b/gdb/testsuite/gdb.base/step-over-syscall.exp @@ -115,7 +115,7 @@ proc step_over_syscall { syscall } { set testfile "step-over-$syscall" if [build_executable ${testfile}.exp ${testfile} ${testfile}.c {debug}] { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/step-resume-infcall.exp b/gdb/testsuite/gdb.base/step-resume-infcall.exp index ecd2024..72bd84b 100644 --- a/gdb/testsuite/gdb.base/step-resume-infcall.exp +++ b/gdb/testsuite/gdb.base/step-resume-infcall.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} $srcfile] } { +if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/step-test.exp b/gdb/testsuite/gdb.base/step-test.exp index 280b892..64bb2e3 100644 --- a/gdb/testsuite/gdb.base/step-test.exp +++ b/gdb/testsuite/gdb.base/step-test.exp @@ -20,7 +20,7 @@ standard_testfile .c remote_exec build "rm -f ${binfile}" if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested step-test.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/store.exp b/gdb/testsuite/gdb.base/store.exp index fed5c8a..658ee39 100644 --- a/gdb/testsuite/gdb.base/store.exp +++ b/gdb/testsuite/gdb.base/store.exp @@ -18,7 +18,7 @@ standard_testfile set executable $testfile -if { [prepare_for_testing $testfile.exp $executable $srcfile] } { +if { [prepare_for_testing "failed to prepare" $executable $srcfile] } { return -1 } diff --git a/gdb/testsuite/gdb.base/structs3.exp b/gdb/testsuite/gdb.base/structs3.exp index ea12f83..8325f47 100644 --- a/gdb/testsuite/gdb.base/structs3.exp +++ b/gdb/testsuite/gdb.base/structs3.exp @@ -17,7 +17,7 @@ standard_testfile .c -if { [prepare_for_testing structs3.exp "structs3" "" {debug}] } { +if { [prepare_for_testing "failed to prepare" "structs3" "" {debug}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/sym-file.exp b/gdb/testsuite/gdb.base/sym-file.exp index 996ba82..f2d34cf 100644 --- a/gdb/testsuite/gdb.base/sym-file.exp +++ b/gdb/testsuite/gdb.base/sym-file.exp @@ -65,11 +65,11 @@ if [get_compiler_info] { } if {[gdb_compile_shlib $libsrc $lib_so {debug}] != ""} { - untested ${testfile} + untested "failed to compile shared library" return } -if {[prepare_for_testing $testfile $binfile "$srcfile $srcfile2" $exec_opts]} { +if {[prepare_for_testing "failed to prepare" $binfile "$srcfile $srcfile2" $exec_opts]} { return } diff --git a/gdb/testsuite/gdb.base/symbol-without-target_section.exp b/gdb/testsuite/gdb.base/symbol-without-target_section.exp index 1a6403b..442739b 100644 --- a/gdb/testsuite/gdb.base/symbol-without-target_section.exp +++ b/gdb/testsuite/gdb.base/symbol-without-target_section.exp @@ -23,7 +23,7 @@ set binlibfile ${testfile}.x if { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" \ [standard_output_file ${binlibfile}] object {debug}] != "" } { - untested ${testfile}.exp + untested "failed to compile" return -1 } if {[build_executable ${testfile}.exp ${testfile} ${srcfile} {debug}] == -1} { diff --git a/gdb/testsuite/gdb.base/term.exp b/gdb/testsuite/gdb.base/term.exp index bb36977..6869cb9 100644 --- a/gdb/testsuite/gdb.base/term.exp +++ b/gdb/testsuite/gdb.base/term.exp @@ -18,7 +18,7 @@ if [is_remote target] then { continue } -if { [prepare_for_testing term.exp term term.c] } { +if { [prepare_for_testing "failed to prepare" term term.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/testenv.exp b/gdb/testsuite/gdb.base/testenv.exp index 9d03f91..850fd8a 100644 --- a/gdb/testsuite/gdb.base/testenv.exp +++ b/gdb/testsuite/gdb.base/testenv.exp @@ -28,7 +28,7 @@ standard_testfile .c # Compile binary # and start with a fresh gdb -if { [prepare_for_testing ${testfile}.exp ${binfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${binfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/ui-redirect.exp b/gdb/testsuite/gdb.base/ui-redirect.exp index 9fa28d7..8f5c296 100644 --- a/gdb/testsuite/gdb.base/ui-redirect.exp +++ b/gdb/testsuite/gdb.base/ui-redirect.exp @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -if { [prepare_for_testing ui-redirect.exp ui-redirect start.c] } { +if { [prepare_for_testing "failed to prepare" ui-redirect start.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/until.exp b/gdb/testsuite/gdb.base/until.exp index b9b986c..afad698 100644 --- a/gdb/testsuite/gdb.base/until.exp +++ b/gdb/testsuite/gdb.base/until.exp @@ -16,7 +16,7 @@ # until.exp -- Expect script to test 'until' in gdb set srcfile break.c -if { [prepare_for_testing until.exp "until" {break.c break1.c} {debug nowarnings}] } { +if { [prepare_for_testing "failed to prepare" "until" {break.c break1.c} {debug nowarnings}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/unwindonsignal.exp b/gdb/testsuite/gdb.base/unwindonsignal.exp index 1c0661d..602c746 100644 --- a/gdb/testsuite/gdb.base/unwindonsignal.exp +++ b/gdb/testsuite/gdb.base/unwindonsignal.exp @@ -28,8 +28,7 @@ if [target_info exists gdb,cannot_call_functions] { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/value-double-free.exp b/gdb/testsuite/gdb.base/value-double-free.exp index 0019a53..07ee905 100644 --- a/gdb/testsuite/gdb.base/value-double-free.exp +++ b/gdb/testsuite/gdb.base/value-double-free.exp @@ -15,8 +15,7 @@ standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/vla-datatypes.exp b/gdb/testsuite/gdb.base/vla-datatypes.exp index db81f9b..683cdd7 100644 --- a/gdb/testsuite/gdb.base/vla-datatypes.exp +++ b/gdb/testsuite/gdb.base/vla-datatypes.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/vla-ptr.exp b/gdb/testsuite/gdb.base/vla-ptr.exp index 6cdd00d..9792636 100644 --- a/gdb/testsuite/gdb.base/vla-ptr.exp +++ b/gdb/testsuite/gdb.base/vla-ptr.exp @@ -15,7 +15,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/vla-sideeffect.exp b/gdb/testsuite/gdb.base/vla-sideeffect.exp index 14f633e..a2665b0 100644 --- a/gdb/testsuite/gdb.base/vla-sideeffect.exp +++ b/gdb/testsuite/gdb.base/vla-sideeffect.exp @@ -18,7 +18,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp index dd01f7e..81510ab 100644 --- a/gdb/testsuite/gdb.base/volatile.exp +++ b/gdb/testsuite/gdb.base/volatile.exp @@ -35,7 +35,7 @@ # Use the same test program constvars.c. -if { [prepare_for_testing volatile.exp volatile constvars.c] } { +if { [prepare_for_testing "failed to prepare" volatile constvars.c] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watch-cond-infcall.exp b/gdb/testsuite/gdb.base/watch-cond-infcall.exp index e31a50b..2b20ff2 100644 --- a/gdb/testsuite/gdb.base/watch-cond-infcall.exp +++ b/gdb/testsuite/gdb.base/watch-cond-infcall.exp @@ -19,7 +19,7 @@ standard_testfile if { [build_executable ${testfile}.exp ${testfile} ${testfile}.c {debug}] } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/watch-cond.exp b/gdb/testsuite/gdb.base/watch-cond.exp index f26741f..46357eb 100644 --- a/gdb/testsuite/gdb.base/watch-cond.exp +++ b/gdb/testsuite/gdb.base/watch-cond.exp @@ -19,8 +19,7 @@ standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watch-non-mem.exp b/gdb/testsuite/gdb.base/watch-non-mem.exp index a773543..3c2f0dc 100644 --- a/gdb/testsuite/gdb.base/watch-non-mem.exp +++ b/gdb/testsuite/gdb.base/watch-non-mem.exp @@ -19,8 +19,7 @@ standard_testfile -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watch-read.exp b/gdb/testsuite/gdb.base/watch-read.exp index ed30ae8..e931040 100644 --- a/gdb/testsuite/gdb.base/watch-read.exp +++ b/gdb/testsuite/gdb.base/watch-read.exp @@ -28,8 +28,7 @@ if {[skip_hw_watchpoint_access_tests]} { return 0 } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watch-vfork.exp b/gdb/testsuite/gdb.base/watch-vfork.exp index 631eab8..0b57e86 100644 --- a/gdb/testsuite/gdb.base/watch-vfork.exp +++ b/gdb/testsuite/gdb.base/watch-vfork.exp @@ -18,7 +18,7 @@ standard_testfile .c if { [build_executable ${testfile}.exp ${testfile} $srcfile {debug}] } { - untested ${testfile}.exp + untested "failed to compile" return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp index d85a0ff..136453e 100644 --- a/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp +++ b/gdb/testsuite/gdb.base/watchpoint-cond-gone.exp @@ -19,9 +19,8 @@ standard_testfile .c watchpoint-cond-gone-stripped.c # Stepping into a dynamic function trampoline or stepping out of MAIN may work # but it is not a reliable FAIL case. -if {[prepare_for_testing_full $testfile.exp \ +if {[prepare_for_testing_full "failed to prepare" \ [list $testfile debug $srcfile debug $srcfile2 {}]]} { - untested $testfile.exp return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoint-delete.exp b/gdb/testsuite/gdb.base/watchpoint-delete.exp index 4d3c23a..2d89fea 100644 --- a/gdb/testsuite/gdb.base/watchpoint-delete.exp +++ b/gdb/testsuite/gdb.base/watchpoint-delete.exp @@ -15,8 +15,7 @@ standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp b/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp index 46d5c62..8c900ed 100644 --- a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp +++ b/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp @@ -19,7 +19,7 @@ if {[skip_hw_watchpoint_access_tests]} { set test watchpoint-hw-hit-once set srcfile ${test}.c -if { [prepare_for_testing ${test}.exp ${test} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${test} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.exp b/gdb/testsuite/gdb.base/watchpoint-hw.exp index a1b3a14..dfdf6f8 100644 --- a/gdb/testsuite/gdb.base/watchpoint-hw.exp +++ b/gdb/testsuite/gdb.base/watchpoint-hw.exp @@ -20,8 +20,7 @@ if {[skip_hw_watchpoint_tests]} { standard_testfile -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp b/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp index 4d158c3..7bb362d 100644 --- a/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp +++ b/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp @@ -75,8 +75,7 @@ if {[target_info exists gdb,no_hardware_watchpoints]} { return -1 } -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { - untested ${testfile}.exp +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/watchpoints.exp b/gdb/testsuite/gdb.base/watchpoints.exp index f6cf24d..795278e 100644 --- a/gdb/testsuite/gdb.base/watchpoints.exp +++ b/gdb/testsuite/gdb.base/watchpoints.exp @@ -24,8 +24,7 @@ if [get_compiler_info] { return -1 } -if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { - untested $testfile.exp +if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 } diff --git a/gdb/testsuite/gdb.base/wchar.exp b/gdb/testsuite/gdb.base/wchar.exp index fdc9d53..dcf8466 100644 --- a/gdb/testsuite/gdb.base/wchar.exp +++ b/gdb/testsuite/gdb.base/wchar.exp @@ -15,7 +15,7 @@ standard_testfile .c -if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/whatis-exp.exp b/gdb/testsuite/gdb.base/whatis-exp.exp index 511d490..61c7dfa 100644 --- a/gdb/testsuite/gdb.base/whatis-exp.exp +++ b/gdb/testsuite/gdb.base/whatis-exp.exp @@ -29,7 +29,7 @@ # test running programs # -if { [prepare_for_testing whatis-exp.exp whatis-exp int-type.c {debug nowarnings}] } { +if { [prepare_for_testing "failed to prepare" whatis-exp int-type.c {debug nowarnings}] } { return -1 } |