summaryrefslogtreecommitdiff
path: root/gdb/testsuite/gdb.dwarf2
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/testsuite/gdb.dwarf2')
-rw-r--r--gdb/testsuite/gdb.dwarf2/arr-stride.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/arr-subrange.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/atomic-type.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/bad-regnum.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/callframecfa.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/clztest.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/corrupt.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/data-loc.exp5
-rw-r--r--gdb/testsuite/gdb.dwarf2/dup-psym.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-basic.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-common-block.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-compressed.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-const.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-icycle.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-intercu.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-intermix.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-noloc.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-op-call.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-param-error.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-producer.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-restore.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-restrict.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-strp.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dwz.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp5
-rw-r--r--gdb/testsuite/gdb.dwarf2/enum-type.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/gdb-index.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/implptr-64bit.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/implptr.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/implref-array.exp5
-rw-r--r--gdb/testsuite/gdb.dwarf2/implref-const.exp5
-rw-r--r--gdb/testsuite/gdb.dwarf2/implref-global.exp5
-rw-r--r--gdb/testsuite/gdb.dwarf2/implref-struct.exp5
-rw-r--r--gdb/testsuite/gdb.dwarf2/mac-fileno.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/main-subprogram.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/method-ptr.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/missing-sig-type.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/nonvar-access.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/pieces.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/pr10770.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/pr13961.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/staticvirtual.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/subrange.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/symtab-producer.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/trace-crash.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/typeddwarf.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/valop.exp2
-rw-r--r--gdb/testsuite/gdb.dwarf2/watch-notconst.exp2
81 files changed, 87 insertions, 93 deletions
diff --git a/gdb/testsuite/gdb.dwarf2/arr-stride.exp b/gdb/testsuite/gdb.dwarf2/arr-stride.exp
index 4d48b2409c0..f4404fc7ec2 100644
--- a/gdb/testsuite/gdb.dwarf2/arr-stride.exp
+++ b/gdb/testsuite/gdb.dwarf2/arr-stride.exp
@@ -83,7 +83,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/arr-subrange.exp b/gdb/testsuite/gdb.dwarf2/arr-subrange.exp
index 57e84ad9e03..aed93cd4fe9 100644
--- a/gdb/testsuite/gdb.dwarf2/arr-subrange.exp
+++ b/gdb/testsuite/gdb.dwarf2/arr-subrange.exp
@@ -77,7 +77,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/atomic-type.exp b/gdb/testsuite/gdb.dwarf2/atomic-type.exp
index 0addefea2e6..319f76faef6 100644
--- a/gdb/testsuite/gdb.dwarf2/atomic-type.exp
+++ b/gdb/testsuite/gdb.dwarf2/atomic-type.exp
@@ -87,7 +87,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/bad-regnum.exp b/gdb/testsuite/gdb.dwarf2/bad-regnum.exp
index 4635735ab41..3b2c71962b7 100644
--- a/gdb/testsuite/gdb.dwarf2/bad-regnum.exp
+++ b/gdb/testsuite/gdb.dwarf2/bad-regnum.exp
@@ -60,7 +60,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp b/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp
index b789970abaa..71dfd35aa7c 100644
--- a/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp
+++ b/gdb/testsuite/gdb.dwarf2/bitfield-parent-optimized-out.exp
@@ -73,7 +73,7 @@ Dwarf::assemble $asm_file {
}
}
-if [prepare_for_testing ${testfile}.exp $executable "${asm_file} ${srcfile}" {}] {
+if [prepare_for_testing "failed to prepare" $executable "${asm_file} ${srcfile}" {}] {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/callframecfa.exp b/gdb/testsuite/gdb.dwarf2/callframecfa.exp
index a04c13256bc..773fcffa1e1 100644
--- a/gdb/testsuite/gdb.dwarf2/callframecfa.exp
+++ b/gdb/testsuite/gdb.dwarf2/callframecfa.exp
@@ -27,7 +27,7 @@ if {![is_x86_like_target]} {
standard_testfile .S
-if {[prepare_for_testing $testfile.exp $testfile $srcfile \
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
[list {additional_flags=-nostdlib}]]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/clztest.exp b/gdb/testsuite/gdb.dwarf2/clztest.exp
index 17ed76d0e62..c09c9c6c3ce 100644
--- a/gdb/testsuite/gdb.dwarf2/clztest.exp
+++ b/gdb/testsuite/gdb.dwarf2/clztest.exp
@@ -28,7 +28,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} {
return 0
}
-if { [prepare_for_testing "${test}.exp" "${test}" ${test}.S {nodebug additional_flags=-nostdlib}] } {
+if { [prepare_for_testing "failed to prepare" "${test}" ${test}.S {nodebug additional_flags=-nostdlib}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/corrupt.exp b/gdb/testsuite/gdb.dwarf2/corrupt.exp
index fce378f69ac..c9fa59ee92a 100644
--- a/gdb/testsuite/gdb.dwarf2/corrupt.exp
+++ b/gdb/testsuite/gdb.dwarf2/corrupt.exp
@@ -69,7 +69,7 @@ Dwarf::assemble $asm_file {
}
}
-if {[prepare_for_testing $testfile.exp $testfile \
+if {[prepare_for_testing "failed to prepare" $testfile \
[list $srcfile $asm_file] {nodebug}]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/data-loc.exp b/gdb/testsuite/gdb.dwarf2/data-loc.exp
index 2e460ca3455..31804f09bea 100644
--- a/gdb/testsuite/gdb.dwarf2/data-loc.exp
+++ b/gdb/testsuite/gdb.dwarf2/data-loc.exp
@@ -28,8 +28,7 @@ standard_testfile data-loc.c data-loc-dw.S
# Any program would do, but since we already have data-loc.c
# specifically for this testcase, might as well use that.
-if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
- untested ${testfile}.exp
+if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
return -1
}
@@ -121,7 +120,7 @@ Dwarf::assemble $asm_file {
# program using our debug info instead of the info generated by
# the compiler.
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dup-psym.exp b/gdb/testsuite/gdb.dwarf2/dup-psym.exp
index 1c752852181..9ffb66e8840 100644
--- a/gdb/testsuite/gdb.dwarf2/dup-psym.exp
+++ b/gdb/testsuite/gdb.dwarf2/dup-psym.exp
@@ -23,7 +23,7 @@ if {![dwarf2_support]} {
standard_testfile .S
-if {[prepare_for_testing_full $testfile.exp \
+if {[prepare_for_testing_full "failed to prepare" \
[list $testfile {debug} main.c debug $srcfile nodebug]]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp b/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp
index d4a36d5a112..608d167c207 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-anon-mptr.exp
@@ -26,7 +26,7 @@ standard_testfile .S
if {[gdb_compile [file join $srcdir $subdir $srcfile] $binfile \
object {debug}] != "" } {
- untested ${testfile}.exp
+ untested "failed to compile"
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp
index 7b43eab5b10..6aff73785bd 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-anonymous-func.exp
@@ -24,7 +24,7 @@ if {![dwarf2_support]} {
standard_testfile .S
set dwarf_srcfile "file1.txt"
-if {[prepare_for_testing_full $testfile.exp \
+if {[prepare_for_testing_full "failed to prepare" \
[list $testfile debug main.c debug $srcfile nodebug]]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp
index 043c1dab29a..604d0d31efb 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-mips-linkage-name.exp
@@ -68,7 +68,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp b/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp
index a7000b12841..4bb3f3d7680 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-unresolved.exp
@@ -50,7 +50,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp
index 0b2c2c681fe..98213a267dd 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-basic.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-basic.exp
@@ -24,7 +24,7 @@ if {![dwarf2_support]} {
standard_testfile .S
set dwarf_srcfile "file1.txt"
-if {[prepare_for_testing_full $testfile.exp \
+if {[prepare_for_testing_full "failed to prepare" \
[list $testfile debug main.c debug $srcfile nodebug]]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp
index b628dd50164..bdc3ad9a97d 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp
@@ -25,7 +25,7 @@ set additional_flags [gdb_target_symbol_prefix_flags_asm]
standard_testfile .S
set executable ${testfile}
-if [prepare_for_testing $testfile.exp $testfile $srcfile \
+if [prepare_for_testing "failed to prepare" $testfile $srcfile \
[list nodebug $additional_flags]] {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp b/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp
index 844690a157c..4d60a337ad4 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-case-insensitive.exp
@@ -27,7 +27,7 @@ if [is_ilp32_target] {
set ptrbits 64
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $srcfile2] \
[list nodebug additional_flags=-DPTRBITS=$ptrbits]] } {
return -1
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
index cd209f245c2..39e450b0f54 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
@@ -32,7 +32,7 @@ if {[skip_fortran_tests]} {
standard_testfile .S
-if { [prepare_for_testing "${testfile}.exp" "${testfile}" $srcfile \
+if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile \
{nodebug f90}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp b/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp
index 4cb43cae102..1d81ae1c5cf 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-compdir-oldgcc.exp
@@ -23,7 +23,7 @@ if {![dwarf2_support]} {
set additional_flags [gdb_target_symbol_prefix_flags_asm]
standard_testfile .S
-if {[prepare_for_testing $testfile.exp $testfile $srcfile \
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
$additional_flags]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp
index a44325cba6c..fa0a629703f 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-compressed.exp
@@ -24,7 +24,7 @@ if {![dwarf2_support]} {
standard_testfile .S
set dwarf_srcfile "file1.txt"
-if {[prepare_for_testing_full $testfile.exp \
+if {[prepare_for_testing_full "failed to prepare" \
[list $testfile \
{debug additional_flags=-static additional_flags=-nostdlib} \
main.c -g0 $srcfile nodebug]]} {
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-const.exp b/gdb/testsuite/gdb.dwarf2/dw2-const.exp
index 865b67b42ad..ef8ce9fb45a 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-const.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-const.exp
@@ -21,7 +21,7 @@ if {![dwarf2_support]} {
standard_testfile .S
-if {[prepare_for_testing_full $testfile.exp \
+if {[prepare_for_testing_full "failed to prepare" \
[list $testfile debug main.c debug $srcfile nodebug]]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp b/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp
index 9022b80b093..6a9a4f2c2d1 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-cp-infcall-ref-static.exp
@@ -27,7 +27,7 @@ if {![dwarf2_support]} {
standard_testfile .S dw2-cp-infcall-ref-static-main.c
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile2 $srcfile] {}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp b/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp
index b96f5d3e0bb..f21875f2a29 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-cu-size.exp
@@ -26,7 +26,7 @@ if {![dwarf2_support]} {
standard_testfile .S
-if {[prepare_for_testing_full $testfile.exp \
+if {[prepare_for_testing_full "failed to prepare" \
[list $testfile debug main.c debug $srcfile nodebug]]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp b/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp
index e43f393301e..a7b4791c780 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dup-frame.exp
@@ -26,7 +26,7 @@ if {![istarget "x86_64-*-*"] || ![is_lp64_target]} {
standard_testfile .S
-if { [prepare_for_testing $testfile.exp $testfile $srcfile {nodebug}] } {
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp b/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp
index c01a50e99f6..b93a7ad89f9 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-entry-value.exp
@@ -19,7 +19,7 @@ if {![dwarf2_support]} {
return 0
}
-if { [prepare_for_testing dw2-entry-value.exp "dw2-entry-value" {dw2-entry-value-main.c dw2-entry-value.S} {nodebug}] } {
+if { [prepare_for_testing "failed to prepare" "dw2-entry-value" {dw2-entry-value-main.c dw2-entry-value.S} {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp b/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp
index a8a9eea2d6e..e4665ab6ee5 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-icycle.exp
@@ -24,7 +24,7 @@ if {![dwarf2_support]} {
standard_testfile .S .c
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $srcfile2] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp
index 0897d4ea186..b771b2d85d5 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ifort-parameter.exp
@@ -62,7 +62,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp
index 374ae3cbf38..dcfeeed9b86 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-break.exp
@@ -32,7 +32,7 @@ set basename "inline-break"
standard_testfile .S
-if { [prepare_for_testing $testfile.exp $testfile $srcfile {nodebug}] } {
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
index 93d30798cf0..725792cb969 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
@@ -21,7 +21,7 @@ if {![dwarf2_support]} {
standard_testfile .S dw2-inline-param-main.c
-if { [prepare_for_testing ${testfile}.exp "${testfile}" \
+if { [prepare_for_testing "failed to prepare" "${testfile}" \
[list $srcfile2 $srcfile] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp
index 44d5c8db9a9..4b7e3c6f0b3 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-intercu.exp
@@ -24,7 +24,7 @@ if {![dwarf2_support]} {
standard_testfile .S
set dwarf_srcfile "file1.txt"
-if {[prepare_for_testing_full $testfile.exp \
+if {[prepare_for_testing_full "failed to prepare" \
[list $testfile debug main.c debug $srcfile nodebug]]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp
index fce685e05ae..4b419d9d61e 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-intermix.exp
@@ -24,7 +24,7 @@ if {![dwarf2_support]} {
standard_testfile .S
set dwarf_srcfile "file1.txt"
-if {[prepare_for_testing_full $testfile.exp \
+if {[prepare_for_testing_full "failed to prepare" \
[list $testfile debug main.c debug $srcfile nodebug]]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp b/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp
index d09f56b75ea..eb9a8acc169 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-lexical-block-bare.exp
@@ -65,7 +65,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile2 $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp b/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp
index a4e22b49a69..1ca02eaa311 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-linkage-name-trust.exp
@@ -28,7 +28,7 @@ if {![dwarf2_support]} {
standard_testfile .S
set executable ${testfile}
-if {[prepare_for_testing_full $testfile.exp \
+if {[prepare_for_testing_full "failed to prepare" \
[list $testfile c++ $testfile-main.cc {c++ debug} \
$srcfile {}]]} {
return -1
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp b/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp
index 14eaba53e85..33e4d2112d1 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-minsym-in-cu.exp
@@ -26,7 +26,7 @@ set additional_flags [gdb_target_symbol_prefix_flags_asm]
standard_testfile .S
-if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
+if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
${additional_flags}] {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp
index 932de2e6e88..3aa62bd324f 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-noloc.exp
@@ -19,7 +19,7 @@ if {![dwarf2_support]} {
return 0
}
-if { [prepare_for_testing dw2-noloc.exp "dw2-noloc" {dw2-noloc-main.c dw2-noloc.S} {nodebug}] } {
+if { [prepare_for_testing "failed to prepare" "dw2-noloc" {dw2-noloc-main.c dw2-noloc.S} {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp b/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp
index 5c696a37e86..4756e9a5f72 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-op-call.exp
@@ -23,7 +23,7 @@ if {![dwarf2_support]} {
standard_testfile .S main.c
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $srcfile2] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
index 43f499268de..c07299aacbf 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-op-out-param.exp
@@ -27,7 +27,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} {
return 0
}
-if { [prepare_for_testing "${test}.exp" "${test}" ${test}.S {nodebug}] } {
+if { [prepare_for_testing "failed to prepare" "${test}" ${test}.S {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp b/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp
index 44f1df13a86..044fd6f4d32 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-opt-structptr.exp
@@ -124,7 +124,7 @@ proc build_test_program {} {
set sources "$srcfile $asm_file"
if {[build_executable $testfile.exp $testfile $sources {nodebug}]} {
- untested $testfile.exp
+ untested "failed to compile"
return -1
}
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp b/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp
index d2148e3343d..1f64f0c1259 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-param-error.exp
@@ -21,7 +21,7 @@ if {![dwarf2_support]} {
standard_testfile .S dw2-param-error-main.c
-if { [prepare_for_testing ${testfile}.exp "${testfile}" \
+if { [prepare_for_testing "failed to prepare" "${testfile}" \
[list $srcfile2 $srcfile] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp
index 1538949862d..bd899c268e4 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-producer.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-producer.exp
@@ -22,7 +22,7 @@ if {![dwarf2_support]} {
standard_testfile .S
set dwarf_srcfile "file1.txt"
-if {[prepare_for_testing_full $testfile.exp \
+if {[prepare_for_testing_full "failed to prepare" \
[list $testfile debug main.c debug $srcfile nodebug]]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp
index 3417a5c849c..4c34045682f 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp
@@ -125,7 +125,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp
index 5689d039dff..e0fad2b6c64 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp
@@ -24,7 +24,7 @@ set srcfuncfile ${testfile}-func.c
set srcmainfile ${testfile}-main.c
set executable ${testfile}
-if {[prepare_for_testing_full $testfile.exp \
+if {[prepare_for_testing_full "failed to prepare" \
[list $testfile {} $srcfile {} $srcfuncfile {} \
$srcmainfile debug]]} {
return -1
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
index f103198d35b..a33c49516ae 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-reg-undefined.exp
@@ -26,7 +26,7 @@ if {![istarget "x86_64-*-*"] || ![is_lp64_target]} {
standard_testfile .S
-if { [prepare_for_testing $testfile.exp $testfile $srcfile {nodebug}] } {
+if { [prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp b/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp
index e117c2ec8c8..7f634cfb593 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-regno-invalid.exp
@@ -59,7 +59,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile2 $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-restore.exp b/gdb/testsuite/gdb.dwarf2/dw2-restore.exp
index f1052c664e4..22820e78338 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-restore.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-restore.exp
@@ -21,7 +21,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} {
}
standard_testfile .S
-if {[prepare_for_testing $testfile.exp $testfile [list $srcfile] \
+if {[prepare_for_testing "failed to prepare" $testfile [list $srcfile] \
[list {additional_flags=-nostdlib}]]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp b/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp
index bbbfb802086..5b6ef49a1f4 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-restrict.exp
@@ -27,7 +27,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} {
standard_testfile .S
-if {[prepare_for_testing $testfile.exp $testfile $srcfile {nodebug}]} {
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile {nodebug}]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
index a10c5fa5a71..f0f86f820f5 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-single-line-discriminators.exp
@@ -31,7 +31,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} {
standard_testfile .S
set csrcfile ${testfile}.c
-if { [prepare_for_testing "${testfile}.exp" "${testfile}" $srcfile {nodebug}] } {
+if { [prepare_for_testing "failed to prepare" "${testfile}" $srcfile {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-strp.exp b/gdb/testsuite/gdb.dwarf2/dw2-strp.exp
index 045c9986619..62b5fbce624 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-strp.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-strp.exp
@@ -24,7 +24,7 @@ if {![dwarf2_support]} {
standard_testfile .S
-if {[prepare_for_testing_full $testfile.exp \
+if {[prepare_for_testing_full "failed to prepare" \
[list $testfile debug main.c debug $srcfile nodebug]]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp b/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp
index c666584e5fa..356286c2077 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-undefined-ret-addr.exp
@@ -26,7 +26,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} {
return 0
}
-if {[prepare_for_testing "$testfile.exp" "$testfile" $srcfile {nodebug}]} {
+if {[prepare_for_testing "failed to prepare" "$testfile" $srcfile {nodebug}]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp
index 84e2ee666f0..371f9f1eafb 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-unresolved.exp
@@ -22,7 +22,7 @@ if {![dwarf2_support]} {
# Some targets have leading underscores on assembly symbols.
set additional_flags [gdb_target_symbol_prefix_flags_asm]
-if { [prepare_for_testing dw2-unresolved.exp "dw2-unresolved" \
+if { [prepare_for_testing "failed to prepare" "dw2-unresolved" \
{dw2-unresolved-main.c dw2-unresolved.S} \
[list nodebug $additional_flags]] } {
return -1
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp b/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp
index 0e4bd743e20..a92f6bad730 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-var-zero-addr.exp
@@ -21,7 +21,7 @@ if {![dwarf2_support]} {
standard_testfile .S main.c
-if [prepare_for_testing ${testfile}.exp ${testfile} \
+if [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $srcfile2] {nodebug}] {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp b/gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp
index 225bfae8695..f87a9d6fa6b 100644
--- a/gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw4-sig-types.exp
@@ -21,7 +21,7 @@ standard_testfile .cc dw4-sig-types-b.cc
# Since we pass an explicit -gdwarf-4 -fdebug-types-section to the compiler,
# we let that be the test of whether the target supports it.
-if { [prepare_for_testing "${testfile}.exp" "${testfile}" \
+if { [prepare_for_testing "failed to prepare" "${testfile}" \
[list $srcfile $srcfile2] \
{debug c++ additional_flags=-gdwarf-4 additional_flags=-fdebug-types-section}] } {
return -1
diff --git a/gdb/testsuite/gdb.dwarf2/dwz.exp b/gdb/testsuite/gdb.dwarf2/dwz.exp
index 6f57eb6c18f..e0885536f26 100644
--- a/gdb/testsuite/gdb.dwarf2/dwz.exp
+++ b/gdb/testsuite/gdb.dwarf2/dwz.exp
@@ -81,7 +81,7 @@ Dwarf::assemble $asm_file {
}
}
-if [prepare_for_testing ${testfile}.exp $testfile "${asm_file} ${srcfile}" {}] {
+if [prepare_for_testing "failed to prepare" $testfile "${asm_file} ${srcfile}" {}] {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp b/gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp
index 94eed7c6204..8a05b2e3092 100644
--- a/gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp
+++ b/gdb/testsuite/gdb.dwarf2/dynarr-ptr.exp
@@ -28,8 +28,7 @@ standard_testfile dynarr-ptr.c dynarr-ptr-dw.S
# Any program would do, but since we already have dynarr-ptr.c
# specifically for this testcase, might as well use that.
-if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
- untested ${testfile}.exp
+if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
return -1
}
@@ -122,7 +121,7 @@ Dwarf::assemble $asm_file {
# program using our debug info instead of the info generated by
# the compiler.
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/enum-type.exp b/gdb/testsuite/gdb.dwarf2/enum-type.exp
index dee6e015fce..6c6e0543617 100644
--- a/gdb/testsuite/gdb.dwarf2/enum-type.exp
+++ b/gdb/testsuite/gdb.dwarf2/enum-type.exp
@@ -67,7 +67,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/gdb-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-index.exp
index 3f272d0fc23..fb14e4e9120 100644
--- a/gdb/testsuite/gdb.dwarf2/gdb-index.exp
+++ b/gdb/testsuite/gdb.dwarf2/gdb-index.exp
@@ -22,7 +22,7 @@ if {![dwarf2_support]} {
standard_testfile main.c
-if { [prepare_for_testing "${testfile}.exp" "${testfile}" \
+if { [prepare_for_testing "failed to prepare" "${testfile}" \
[list ${srcfile}]] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp b/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp
index 2f2f6f2f064..44768c704e8 100644
--- a/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp
+++ b/gdb/testsuite/gdb.dwarf2/implptr-64bit.exp
@@ -33,7 +33,7 @@ proc test { dwarf_version offset_size addr_size ref_addr_size two_cu } {
set name "d${dwarf_version}o${offset_size}a${addr_size}r${ref_addr_size}t${two_cu}"
set executable ${testfile}-${name}
- if [prepare_for_testing ${testfile}.exp $executable "${srcfile} ${mainfile}" $opts] {
+ if [prepare_for_testing "failed to prepare" $executable "${srcfile} ${mainfile}" $opts] {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp b/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp
index 5cbcdafa232..dc4c78ab674 100644
--- a/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp
+++ b/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp
@@ -80,7 +80,7 @@ Dwarf::assemble $asm_file {
}
}
-if [prepare_for_testing ${testfile}.exp $executable "${asm_file} ${srcfile}" {}] {
+if [prepare_for_testing "failed to prepare" $executable "${asm_file} ${srcfile}" {}] {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/implptr.exp b/gdb/testsuite/gdb.dwarf2/implptr.exp
index 5282143b72b..587587d0f4a 100644
--- a/gdb/testsuite/gdb.dwarf2/implptr.exp
+++ b/gdb/testsuite/gdb.dwarf2/implptr.exp
@@ -34,7 +34,7 @@ if [info exists COMPILE] {
return 0
}
-if {[prepare_for_testing ${testfile}.exp ${testfile} $srcfile $opts]} {
+if {[prepare_for_testing "failed to prepare" ${testfile} $srcfile $opts]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/implref-array.exp b/gdb/testsuite/gdb.dwarf2/implref-array.exp
index b6127636d97..7195502b940 100644
--- a/gdb/testsuite/gdb.dwarf2/implref-array.exp
+++ b/gdb/testsuite/gdb.dwarf2/implref-array.exp
@@ -40,8 +40,7 @@ set asm_file [standard_output_file ${srcfile2}]
# For that, we ask GDB by debugging our implref-array program.
# Any program would do, but since we already have implref-array
# specifically for this testcase, might as well use that.
-if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
- untested ${testfile}.exp
+if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } {
return -1
}
@@ -114,7 +113,7 @@ Dwarf::assemble ${asm_file} {
}
}
-if [prepare_for_testing ${testfile}.exp ${executable} [list ${asm_file} ${srcfile}] {}] {
+if [prepare_for_testing "failed to prepare" ${executable} [list ${asm_file} ${srcfile}] {}] {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/implref-const.exp b/gdb/testsuite/gdb.dwarf2/implref-const.exp
index 9b6d5fe6849..24fbed1b1fb 100644
--- a/gdb/testsuite/gdb.dwarf2/implref-const.exp
+++ b/gdb/testsuite/gdb.dwarf2/implref-const.exp
@@ -40,8 +40,7 @@ set asm_file [standard_output_file ${srcfile2}]
# For that, we ask GDB by debugging our implref-const program.
# Any program would do, but since we already have implref-const
# specifically for this testcase, might as well use that.
-if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] {
- untested ${testfile}.exp
+if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] {
return -1
}
@@ -97,7 +96,7 @@ Dwarf::assemble ${asm_file} {
}
}
-if [prepare_for_testing ${testfile}.exp ${executable} [list ${asm_file} ${srcfile}] {}] {
+if [prepare_for_testing "failed to prepare" ${executable} [list ${asm_file} ${srcfile}] {}] {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/implref-global.exp b/gdb/testsuite/gdb.dwarf2/implref-global.exp
index 1f4cc055e81..de635ce3227 100644
--- a/gdb/testsuite/gdb.dwarf2/implref-global.exp
+++ b/gdb/testsuite/gdb.dwarf2/implref-global.exp
@@ -40,8 +40,7 @@ set asm_file [standard_output_file ${srcfile2}]
# For that, we ask GDB by debugging our implref-global program.
# Any program would do, but since we already have implref-global
# specifically for this testcase, might as well use that.
-if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] {
- untested ${testfile}.exp
+if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] {
return -1
}
@@ -95,7 +94,7 @@ Dwarf::assemble ${asm_file} {
}
}
-if [prepare_for_testing ${testfile}.exp ${executable} [list ${asm_file} ${srcfile}] {}] {
+if [prepare_for_testing "failed to prepare" ${executable} [list ${asm_file} ${srcfile}] {}] {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/implref-struct.exp b/gdb/testsuite/gdb.dwarf2/implref-struct.exp
index 49967e37e6f..b82f5abda1c 100644
--- a/gdb/testsuite/gdb.dwarf2/implref-struct.exp
+++ b/gdb/testsuite/gdb.dwarf2/implref-struct.exp
@@ -40,8 +40,7 @@ set asm_file [standard_output_file ${srcfile2}]
# For that, we ask GDB by debugging our implref-struct program.
# Any program would do, but since we already have implref-struct
# specifically for this testcase, might as well use that.
-if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] {
- untested ${testfile}.exp
+if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug c++}] {
return -1
}
@@ -130,7 +129,7 @@ Dwarf::assemble ${asm_file} {
}
}
-if [prepare_for_testing ${testfile}.exp ${executable} [list ${asm_file} ${srcfile}] {}] {
+if [prepare_for_testing "failed to prepare" ${executable} [list ${asm_file} ${srcfile}] {}] {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/mac-fileno.exp b/gdb/testsuite/gdb.dwarf2/mac-fileno.exp
index 58623fc81ba..9bea4dc7cc0 100644
--- a/gdb/testsuite/gdb.dwarf2/mac-fileno.exp
+++ b/gdb/testsuite/gdb.dwarf2/mac-fileno.exp
@@ -25,7 +25,7 @@ if {![dwarf2_support]} {
standard_testfile .S
set dwarf_srcfile "file1.txt"
-if {[prepare_for_testing_full $testfile.exp \
+if {[prepare_for_testing_full "failed to prepare" \
[list $testfile debug main.c debug $srcfile nodebug]]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/main-subprogram.exp b/gdb/testsuite/gdb.dwarf2/main-subprogram.exp
index 08c076b1096..06b553649ff 100644
--- a/gdb/testsuite/gdb.dwarf2/main-subprogram.exp
+++ b/gdb/testsuite/gdb.dwarf2/main-subprogram.exp
@@ -56,7 +56,7 @@ Dwarf::assemble $asm_file {
}
}
-if {[prepare_for_testing ${testfile}.exp ${testfile} \
+if {[prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp
index 4c4d69cb752..5c0d07716f5 100644
--- a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp
+++ b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.exp
@@ -24,7 +24,7 @@ if { [skip_cplus_tests] } { continue }
standard_testfile .S
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" ${binfile} object {debug}] != "" } {
- untested ${testfile}.exp
+ untested "failed to compile"
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/method-ptr.exp b/gdb/testsuite/gdb.dwarf2/method-ptr.exp
index 66eb8965922..56ecd95ceb7 100644
--- a/gdb/testsuite/gdb.dwarf2/method-ptr.exp
+++ b/gdb/testsuite/gdb.dwarf2/method-ptr.exp
@@ -77,7 +77,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/missing-sig-type.exp b/gdb/testsuite/gdb.dwarf2/missing-sig-type.exp
index 3526f6dd3f6..716dd195424 100644
--- a/gdb/testsuite/gdb.dwarf2/missing-sig-type.exp
+++ b/gdb/testsuite/gdb.dwarf2/missing-sig-type.exp
@@ -49,7 +49,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/nonvar-access.exp b/gdb/testsuite/gdb.dwarf2/nonvar-access.exp
index 8910f6d7304..af431246e3f 100644
--- a/gdb/testsuite/gdb.dwarf2/nonvar-access.exp
+++ b/gdb/testsuite/gdb.dwarf2/nonvar-access.exp
@@ -119,7 +119,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp b/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp
index 46bd0b6ffff..d9d0bfa49d0 100644
--- a/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp
+++ b/gdb/testsuite/gdb.dwarf2/opaque-type-lookup.exp
@@ -188,7 +188,7 @@ Dwarf::assemble $asm_file {
}
}
-if [prepare_for_testing ${testfile}.exp $testfile "${asm_file} ${srcfile} ${srcfile3}" {nodebug}] {
+if [prepare_for_testing "failed to prepare" $testfile "${asm_file} ${srcfile} ${srcfile3}" {nodebug}] {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp b/gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp
index eba3205e0db..9c3f3527cfc 100644
--- a/gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp
+++ b/gdb/testsuite/gdb.dwarf2/pieces-optimized-out.exp
@@ -27,7 +27,7 @@ if {![is_x86_like_target]} {
standard_testfile .S
set csrcfile ${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.dwarf2/pieces.exp b/gdb/testsuite/gdb.dwarf2/pieces.exp
index 57de9d4dacb..bff864e500c 100644
--- a/gdb/testsuite/gdb.dwarf2/pieces.exp
+++ b/gdb/testsuite/gdb.dwarf2/pieces.exp
@@ -27,7 +27,7 @@ if {![is_x86_like_target]} {
standard_testfile .S
set csrcfile ${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.dwarf2/pr10770.exp b/gdb/testsuite/gdb.dwarf2/pr10770.exp
index 889b0b7b4b2..47f002ad239 100644
--- a/gdb/testsuite/gdb.dwarf2/pr10770.exp
+++ b/gdb/testsuite/gdb.dwarf2/pr10770.exp
@@ -17,7 +17,7 @@
standard_testfile
-if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}]} {
+if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} {
return 0
}
diff --git a/gdb/testsuite/gdb.dwarf2/pr13961.exp b/gdb/testsuite/gdb.dwarf2/pr13961.exp
index 635bceb4a94..a0c633b68ee 100644
--- a/gdb/testsuite/gdb.dwarf2/pr13961.exp
+++ b/gdb/testsuite/gdb.dwarf2/pr13961.exp
@@ -27,7 +27,7 @@ set additional_flags [gdb_target_symbol_prefix_flags_asm]
standard_testfile .S
-if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} \
${additional_flags}] == -1 } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/staticvirtual.exp b/gdb/testsuite/gdb.dwarf2/staticvirtual.exp
index c038a67bf25..4b034e17636 100644
--- a/gdb/testsuite/gdb.dwarf2/staticvirtual.exp
+++ b/gdb/testsuite/gdb.dwarf2/staticvirtual.exp
@@ -45,7 +45,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/subrange.exp b/gdb/testsuite/gdb.dwarf2/subrange.exp
index d5ba1142531..f94a4971b4c 100644
--- a/gdb/testsuite/gdb.dwarf2/subrange.exp
+++ b/gdb/testsuite/gdb.dwarf2/subrange.exp
@@ -60,7 +60,7 @@ Dwarf::assemble $asm_file {
}
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/symtab-producer.exp b/gdb/testsuite/gdb.dwarf2/symtab-producer.exp
index 66dc7705b3d..8cc5b4993f2 100644
--- a/gdb/testsuite/gdb.dwarf2/symtab-producer.exp
+++ b/gdb/testsuite/gdb.dwarf2/symtab-producer.exp
@@ -81,7 +81,7 @@ Dwarf::assemble $asm_file {
set saved_gdbflags $GDBFLAGS
set GDBFLAGS "$GDBFLAGS -readnow"
-if { [prepare_for_testing ${testfile}.exp ${testfile} \
+if { [prepare_for_testing "failed to prepare" ${testfile} \
[list $srcfile $asm_file] {nodebug}] } {
set GDBFLAGS $saved_gdbflags
return -1
diff --git a/gdb/testsuite/gdb.dwarf2/trace-crash.exp b/gdb/testsuite/gdb.dwarf2/trace-crash.exp
index 481208cf65f..393553e2d70 100644
--- a/gdb/testsuite/gdb.dwarf2/trace-crash.exp
+++ b/gdb/testsuite/gdb.dwarf2/trace-crash.exp
@@ -28,7 +28,7 @@ if {![istarget x86_64-*] || ![is_lp64_target]} {
standard_testfile .S
-if {[prepare_for_testing "${testfile}.exp" "${testfile}" ${testfile}.S \
+if {[prepare_for_testing "failed to prepare" "${testfile}" ${testfile}.S \
nodebug]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/typeddwarf.exp b/gdb/testsuite/gdb.dwarf2/typeddwarf.exp
index 7c39e390a8d..290c6da5d7c 100644
--- a/gdb/testsuite/gdb.dwarf2/typeddwarf.exp
+++ b/gdb/testsuite/gdb.dwarf2/typeddwarf.exp
@@ -31,7 +31,7 @@ if { [is_x86_like_target] } {
return 0
}
-if { [prepare_for_testing "${test}.exp" "${test}" ${sfile} {nodebug additional_flags=-nostdlib}] } {
+if { [prepare_for_testing "failed to prepare" "${test}" ${sfile} {nodebug additional_flags=-nostdlib}] } {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/valop.exp b/gdb/testsuite/gdb.dwarf2/valop.exp
index 373e4436e5c..13bc1e7dce1 100644
--- a/gdb/testsuite/gdb.dwarf2/valop.exp
+++ b/gdb/testsuite/gdb.dwarf2/valop.exp
@@ -27,7 +27,7 @@ if {![is_x86_like_target]} {
standard_testfile .S
-if {[prepare_for_testing $testfile.exp $testfile \
+if {[prepare_for_testing "failed to prepare" $testfile \
[list $srcfile] [list {additional_flags=-nostdlib}]]} {
return -1
}
diff --git a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp b/gdb/testsuite/gdb.dwarf2/watch-notconst.exp
index 56d220863c7..9a0aa90a0d9 100644
--- a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp
+++ b/gdb/testsuite/gdb.dwarf2/watch-notconst.exp
@@ -26,7 +26,7 @@ if { ![is_x86_like_target] } {
return 0
}
-if { [prepare_for_testing "${test}.exp" "${test}" \
+if { [prepare_for_testing "failed to prepare" "${test}" \
{watch-notconst.c watch-notconst2.S} {nodebug}] } {
return -1
}