diff mbox

[1/8] Fixup testcases outputting own name as a test name

Message ID 1480093744-13771-2-git-send-email-lgustavo@codesourcery.com
State New
Headers show

Commit Message

Luis Machado Nov. 25, 2016, 5:08 p.m. UTC
We have a number of tests that are not honoring the rule of not outputting
their own name as a test name.

I fixed up all the offenders i could find with a regular expression.

OK?

gdb/testsuite/ChangeLog:

2016-11-12  Luis Machado  <lgustavo@codesourcery.com>

	Fixup occurrences of tests outputting their own names as test names
	in the following files:

	* gdb/testsuite/gdb.ada/start.exp
	* gdb/testsuite/gdb.arch/gdb1291.exp
	* gdb/testsuite/gdb.arch/gdb1431.exp
	* gdb/testsuite/gdb.arch/gdb1558.exp
	* gdb/testsuite/gdb.base/annota1.exp
	* gdb/testsuite/gdb.base/annota3.exp
	* gdb/testsuite/gdb.base/assign.exp
	* gdb/testsuite/gdb.base/attach.exp
	* gdb/testsuite/gdb.base/bang.exp
	* gdb/testsuite/gdb.base/bigcore.exp
	* gdb/testsuite/gdb.base/bitfields2.exp
	* gdb/testsuite/gdb.base/callexit.exp
	* gdb/testsuite/gdb.base/charset.exp
	* gdb/testsuite/gdb.base/checkpoint.exp
	* gdb/testsuite/gdb.base/comprdebug.exp
	* gdb/testsuite/gdb.base/constvars.exp
	* gdb/testsuite/gdb.base/cvexpr.exp
	* gdb/testsuite/gdb.base/detach.exp
	* gdb/testsuite/gdb.base/display.exp
	* gdb/testsuite/gdb.base/dmsym.exp
	* gdb/testsuite/gdb.base/dump.exp
	* gdb/testsuite/gdb.base/exprs.exp
	* gdb/testsuite/gdb.base/fileio.exp
	* gdb/testsuite/gdb.base/find.exp
	* gdb/testsuite/gdb.base/finish.exp
	* gdb/testsuite/gdb.base/gcore.exp
	* gdb/testsuite/gdb.base/gdb1250.exp
	* gdb/testsuite/gdb.base/hashline1.exp
	* gdb/testsuite/gdb.base/hashline2.exp
	* gdb/testsuite/gdb.base/hashline3.exp
	* gdb/testsuite/gdb.base/huge.exp
	* gdb/testsuite/gdb.base/jit-so.exp
	* gdb/testsuite/gdb.base/jit.exp
	* gdb/testsuite/gdb.base/jump.exp
	* gdb/testsuite/gdb.base/label.exp
	* gdb/testsuite/gdb.base/lineinc.exp
	* gdb/testsuite/gdb.base/logical.exp
	* gdb/testsuite/gdb.base/longjmp.exp
	* gdb/testsuite/gdb.base/macscp.exp
	* gdb/testsuite/gdb.base/miscexprs.exp
	* gdb/testsuite/gdb.base/offsets.exp
	* gdb/testsuite/gdb.base/overlays.exp
	* gdb/testsuite/gdb.base/pointers.exp
	* gdb/testsuite/gdb.base/pr11022.exp
	* gdb/testsuite/gdb.base/printcmds.exp
	* gdb/testsuite/gdb.base/prologue.exp
	* gdb/testsuite/gdb.base/relocate.exp
	* gdb/testsuite/gdb.base/remote.exp
	* gdb/testsuite/gdb.base/reread.exp
	* gdb/testsuite/gdb.base/return2.exp
	* gdb/testsuite/gdb.base/sep.exp
	* gdb/testsuite/gdb.base/sepdebug.exp
	* gdb/testsuite/gdb.base/sepsymtab.exp
	* gdb/testsuite/gdb.base/setshow.exp
	* gdb/testsuite/gdb.base/signals.exp
	* gdb/testsuite/gdb.base/signull.exp
	* gdb/testsuite/gdb.base/structs.exp
	* gdb/testsuite/gdb.base/structs2.exp
	* gdb/testsuite/gdb.base/twice.exp
	* gdb/testsuite/gdb.base/varargs.exp
	* gdb/testsuite/gdb.base/watchpoint.exp
	* gdb/testsuite/gdb.base/whatis.exp
	* gdb/testsuite/gdb.cp/dispcxx.exp
	* gdb/testsuite/gdb.cp/gdb2384.exp
	* gdb/testsuite/gdb.cp/method2.exp
	* gdb/testsuite/gdb.cp/nextoverthrow.exp
	* gdb/testsuite/gdb.cp/pr10728.exp
	* gdb/testsuite/gdb.disasm/am33.exp
	* gdb/testsuite/gdb.disasm/h8300s.exp
	* gdb/testsuite/gdb.disasm/mn10300.exp
	* gdb/testsuite/gdb.disasm/sh3.exp
	* gdb/testsuite/gdb.linespec/linespec.exp
	* gdb/testsuite/gdb.mi/gdb701.exp
	* gdb/testsuite/gdb.mi/gdb792.exp
	* gdb/testsuite/gdb.mi/pr11022.exp
	* gdb/testsuite/gdb.stabs/weird.exp
	* gdb/testsuite/gdb.trace/actions.exp
	* gdb/testsuite/gdb.trace/ax.exp
	* gdb/testsuite/gdb.trace/backtrace.exp
	* gdb/testsuite/gdb.trace/deltrace.exp
	* gdb/testsuite/gdb.trace/infotrace.exp
	* gdb/testsuite/gdb.trace/packetlen.exp
	* gdb/testsuite/gdb.trace/passcount.exp
	* gdb/testsuite/gdb.trace/report.exp
	* gdb/testsuite/gdb.trace/tfind.exp
	* gdb/testsuite/gdb.trace/tracecmd.exp
	* gdb/testsuite/gdb.trace/tspeed.exp
	* gdb/testsuite/gdb.trace/tsv.exp
---
 gdb/testsuite/gdb.ada/start.exp         |  4 ++--
 gdb/testsuite/gdb.arch/gdb1291.exp      |  2 +-
 gdb/testsuite/gdb.arch/gdb1431.exp      |  2 +-
 gdb/testsuite/gdb.arch/gdb1558.exp      |  2 +-
 gdb/testsuite/gdb.base/annota1.exp      |  2 +-
 gdb/testsuite/gdb.base/annota3.exp      |  2 +-
 gdb/testsuite/gdb.base/assign.exp       |  2 +-
 gdb/testsuite/gdb.base/attach.exp       |  4 ++--
 gdb/testsuite/gdb.base/bang.exp         |  2 +-
 gdb/testsuite/gdb.base/bigcore.exp      |  2 +-
 gdb/testsuite/gdb.base/bitfields2.exp   |  2 +-
 gdb/testsuite/gdb.base/callexit.exp     |  2 +-
 gdb/testsuite/gdb.base/charset.exp      |  2 +-
 gdb/testsuite/gdb.base/checkpoint.exp   |  2 +-
 gdb/testsuite/gdb.base/comprdebug.exp   |  4 ++--
 gdb/testsuite/gdb.base/constvars.exp    |  2 +-
 gdb/testsuite/gdb.base/cvexpr.exp       |  2 +-
 gdb/testsuite/gdb.base/detach.exp       |  2 +-
 gdb/testsuite/gdb.base/display.exp      |  2 +-
 gdb/testsuite/gdb.base/dmsym.exp        |  4 ++--
 gdb/testsuite/gdb.base/dump.exp         |  4 ++--
 gdb/testsuite/gdb.base/exprs.exp        |  2 +-
 gdb/testsuite/gdb.base/fileio.exp       |  2 +-
 gdb/testsuite/gdb.base/find.exp         |  2 +-
 gdb/testsuite/gdb.base/finish.exp       |  2 +-
 gdb/testsuite/gdb.base/gcore.exp        |  4 ++--
 gdb/testsuite/gdb.base/gdb1250.exp      |  2 +-
 gdb/testsuite/gdb.base/hashline1.exp    |  2 +-
 gdb/testsuite/gdb.base/hashline2.exp    |  2 +-
 gdb/testsuite/gdb.base/hashline3.exp    |  2 +-
 gdb/testsuite/gdb.base/huge.exp         |  4 ++--
 gdb/testsuite/gdb.base/jit-so.exp       | 11 +++++------
 gdb/testsuite/gdb.base/jit.exp          |  5 ++---
 gdb/testsuite/gdb.base/jump.exp         |  2 +-
 gdb/testsuite/gdb.base/label.exp        |  2 +-
 gdb/testsuite/gdb.base/lineinc.exp      |  2 +-
 gdb/testsuite/gdb.base/logical.exp      |  2 +-
 gdb/testsuite/gdb.base/longjmp.exp      |  2 +-
 gdb/testsuite/gdb.base/macscp.exp       |  2 +-
 gdb/testsuite/gdb.base/miscexprs.exp    |  2 +-
 gdb/testsuite/gdb.base/offsets.exp      |  2 +-
 gdb/testsuite/gdb.base/overlays.exp     |  2 +-
 gdb/testsuite/gdb.base/pointers.exp     |  2 +-
 gdb/testsuite/gdb.base/pr11022.exp      |  2 +-
 gdb/testsuite/gdb.base/printcmds.exp    |  2 +-
 gdb/testsuite/gdb.base/prologue.exp     |  2 +-
 gdb/testsuite/gdb.base/relocate.exp     |  2 +-
 gdb/testsuite/gdb.base/remote.exp       |  2 +-
 gdb/testsuite/gdb.base/reread.exp       |  4 ++--
 gdb/testsuite/gdb.base/return2.exp      |  4 ++--
 gdb/testsuite/gdb.base/sep.exp          |  2 +-
 gdb/testsuite/gdb.base/sepdebug.exp     |  2 +-
 gdb/testsuite/gdb.base/sepsymtab.exp    |  2 +-
 gdb/testsuite/gdb.base/setshow.exp      |  2 +-
 gdb/testsuite/gdb.base/signals.exp      |  2 +-
 gdb/testsuite/gdb.base/signull.exp      |  2 +-
 gdb/testsuite/gdb.base/structs.exp      |  2 +-
 gdb/testsuite/gdb.base/structs2.exp     |  2 +-
 gdb/testsuite/gdb.base/twice.exp        |  2 +-
 gdb/testsuite/gdb.base/varargs.exp      |  2 +-
 gdb/testsuite/gdb.base/watchpoint.exp   |  2 +-
 gdb/testsuite/gdb.base/whatis.exp       |  2 +-
 gdb/testsuite/gdb.cp/dispcxx.exp        |  2 +-
 gdb/testsuite/gdb.cp/gdb2384.exp        |  2 +-
 gdb/testsuite/gdb.cp/method2.exp        |  2 +-
 gdb/testsuite/gdb.cp/nextoverthrow.exp  |  2 +-
 gdb/testsuite/gdb.cp/pr10728.exp        |  6 +++---
 gdb/testsuite/gdb.disasm/am33.exp       |  2 +-
 gdb/testsuite/gdb.disasm/h8300s.exp     |  2 +-
 gdb/testsuite/gdb.disasm/mn10300.exp    |  2 +-
 gdb/testsuite/gdb.disasm/sh3.exp        |  2 +-
 gdb/testsuite/gdb.linespec/linespec.exp |  2 +-
 gdb/testsuite/gdb.mi/gdb701.exp         |  2 +-
 gdb/testsuite/gdb.mi/gdb792.exp         |  2 +-
 gdb/testsuite/gdb.mi/pr11022.exp        |  2 +-
 gdb/testsuite/gdb.stabs/weird.exp       |  2 +-
 gdb/testsuite/gdb.trace/actions.exp     |  2 +-
 gdb/testsuite/gdb.trace/ax.exp          |  2 +-
 gdb/testsuite/gdb.trace/backtrace.exp   |  4 ++--
 gdb/testsuite/gdb.trace/deltrace.exp    |  2 +-
 gdb/testsuite/gdb.trace/infotrace.exp   |  2 +-
 gdb/testsuite/gdb.trace/packetlen.exp   |  2 +-
 gdb/testsuite/gdb.trace/passcount.exp   |  2 +-
 gdb/testsuite/gdb.trace/report.exp      |  6 +++---
 gdb/testsuite/gdb.trace/tfind.exp       |  2 +-
 gdb/testsuite/gdb.trace/tracecmd.exp    |  2 +-
 gdb/testsuite/gdb.trace/tspeed.exp      |  2 +-
 gdb/testsuite/gdb.trace/tsv.exp         |  2 +-
 88 files changed, 107 insertions(+), 109 deletions(-)

Comments

Pedro Alves Nov. 25, 2016, 5:28 p.m. UTC | #1
On 11/25/2016 05:08 PM, Luis Machado wrote:

> diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
> index 44d5502..eb9b37a 100644
> --- a/gdb/testsuite/gdb.base/charset.exp
> +++ b/gdb/testsuite/gdb.base/charset.exp
> @@ -146,7 +146,7 @@ gdb_expect {
>  # sets: "auto" and the default.  In this situation, this set of tests
>  # is pointless.
>  if {[llength [array names charsets]] < 3} {
> -    untested charset.exp
> +    untested "less than 3 charsets"

"fewer than"

/me runs.

> +    untested "couldn't compile ${srcfile} to ${binfile}"

I think all these references to $binfile will put the full file
path on gdb.sum?  I think you want $testfile instead.

Thanks,
Pedro Alves
Luis Machado Nov. 25, 2016, 5:37 p.m. UTC | #2
On 11/25/2016 11:28 AM, Pedro Alves wrote:
> On 11/25/2016 05:08 PM, Luis Machado wrote:
>
>> diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
>> index 44d5502..eb9b37a 100644
>> --- a/gdb/testsuite/gdb.base/charset.exp
>> +++ b/gdb/testsuite/gdb.base/charset.exp
>> @@ -146,7 +146,7 @@ gdb_expect {
>>  # sets: "auto" and the default.  In this situation, this set of tests
>>  # is pointless.
>>  if {[llength [array names charsets]] < 3} {
>> -    untested charset.exp
>> +    untested "less than 3 charsets"
>
> "fewer than"
>
> /me runs.
>

:-)

>> +    untested "couldn't compile ${srcfile} to ${binfile}"
>
> I think all these references to $binfile will put the full file
> path on gdb.sum?  I think you want $testfile instead.
>
> Thanks,
> Pedro Alves
>

They will, which may make it easier to just build the files by hand with 
the output from the log file. But it has the potential to be a big path.

I'm fine with either approach.
Simon Marchi Nov. 25, 2016, 5:48 p.m. UTC | #3
On 2016-11-25 12:37, Luis Machado wrote:
>> I think all these references to $binfile will put the full file
>> path on gdb.sum?  I think you want $testfile instead.
>> 
>> Thanks,
>> Pedro Alves
>> 
> 
> They will, which may make it easier to just build the files by hand
> with the output from the log file. But it has the potential to be a
> big path.
> 
> I'm fine with either approach.

I think it's fine how you did in the patch.  Most of the time, binfile 
is based on testfile, so Pedro's suggestion would work.  But sometimes, 
we pass something else than binfile as the compilation destination (or 
binfile was overrident), so we would have to remember to use something 
else than testfile to build the error message, it seems easy to forget.  
I think that consistently using the same expression as is passed to 
gdb_compile's dest parameter is a good approach.  Or maybe the error 
should be handled in gdb_compile instead of in each individual test, 
that would be even less error-prone.

Of course, that doesn't hold if the issue about having the full paths in 
the test message is about the reproducibility (test names will have 
different names depending on the path where you build gdb).  But since 
it's only for error test names, I don't know if that's a real problem.
Luis Machado Nov. 25, 2016, 5:53 p.m. UTC | #4
On 11/25/2016 11:48 AM, Simon Marchi wrote:
> On 2016-11-25 12:37, Luis Machado wrote:
>>> I think all these references to $binfile will put the full file
>>> path on gdb.sum?  I think you want $testfile instead.
>>>
>>> Thanks,
>>> Pedro Alves
>>>
>>
>> They will, which may make it easier to just build the files by hand
>> with the output from the log file. But it has the potential to be a
>> big path.
>>
>> I'm fine with either approach.
>
> I think it's fine how you did in the patch.  Most of the time, binfile
> is based on testfile, so Pedro's suggestion would work.  But sometimes,
> we pass something else than binfile as the compilation destination (or
> binfile was overrident), so we would have to remember to use something
> else than testfile to build the error message, it seems easy to forget.
> I think that consistently using the same expression as is passed to
> gdb_compile's dest parameter is a good approach.  Or maybe the error
> should be handled in gdb_compile instead of in each individual test,
> that would be even less error-prone.
>
> Of course, that doesn't hold if the issue about having the full paths in
> the test message is about the reproducibility (test names will have
> different names depending on the path where you build gdb).  But since
> it's only for error test names, I don't know if that's a real problem.

That's good input.

Honestly i started with the idea of having a "try_gdb_compile" error out 
a standard message, but then i noticed gdb's testsuite is all over the 
place in terms of outputting compilation errors.

Some tests output messages, others don't (but could) and some others 
don't want to output because gdb_compile is part of a multi-condition 
conditional block.

I think it is another case where it would be nice to do a cleanup and 
have every testcase use a standard structure/skeleton.

I'll go with outputting $testfile then.
Pedro Alves Nov. 25, 2016, 5:55 p.m. UTC | #5
On 11/25/2016 05:48 PM, Simon Marchi wrote:
> On 2016-11-25 12:37, Luis Machado wrote:
>>> I think all these references to $binfile will put the full file
>>> path on gdb.sum?  I think you want $testfile instead.
>>>
>>> Thanks,
>>> Pedro Alves
>>>
>>
>> They will, which may make it easier to just build the files by hand
>> with the output from the log file. But it has the potential to be a
>> big path.
>>
>> I'm fine with either approach.
> 
> I think it's fine how you did in the patch.  Most of the time, binfile
> is based on testfile, so Pedro's suggestion would work.  But sometimes,
> we pass something else than binfile as the compilation destination (or
> binfile was overrident), so we would have to remember to use something
> else than testfile to build the error message, it seems easy to forget.

Or just not pass anything about the target file?
"failed to compile" works just as well, IMO.  If you need more detail,
it's in the gdb.log.

> I think that consistently using the same expression as is passed to
> gdb_compile's dest parameter is a good approach.  Or maybe the error
> should be handled in gdb_compile instead of in each individual test,
> that would be even less error-prone.
> 
> Of course, that doesn't hold if the issue about having the full paths in
> the test message is about the reproducibility (test names will have
> different names depending on the path where you build gdb).  

Yes, that's what I was thinking.  So that diffing test results
of builds done on different directories doesn't come out with spurious
hunks.

> But since
> it's only for error test names, I don't know if that's a real problem.

IMO, it is.  I'd rather if we aimed at not introducing more instances
of this problem.

Thanks,
Pedro Alves
Simon Marchi Nov. 25, 2016, 6:02 p.m. UTC | #6
On 2016-11-25 12:55, Pedro Alves wrote:
> Or just not pass anything about the target file?
> "failed to compile" works just as well, IMO.  If you need more detail,
> it's in the gdb.log.

Agreed, I think that's even better.  I was first thinking it would be 
useful to have the dest file, in the cases where the same source file is 
compiled multiple times to multiple destinations.  But you're right that 
if you want details, you'll go look at gdb.log.  It's enough for the 
test name to give a rough idea of what failed.
Luis Machado Nov. 25, 2016, 6:26 p.m. UTC | #7
On 11/25/2016 12:02 PM, Simon Marchi wrote:
> On 2016-11-25 12:55, Pedro Alves wrote:
>> Or just not pass anything about the target file?
>> "failed to compile" works just as well, IMO.  If you need more detail,
>> it's in the gdb.log.
>
> Agreed, I think that's even better.  I was first thinking it would be
> useful to have the dest file, in the cases where the same source file is
> compiled multiple times to multiple destinations.  But you're right that
> if you want details, you'll go look at gdb.log.  It's enough for the
> test name to give a rough idea of what failed.

Great. I'll adjust things.

Should i get the existing tests that already output srcfile paths on 
compilation failures fixed up and standardized with this patch as well 
or with a separate one?

I'd hate to fix some of these up and leave other offenders lying around.
Pedro Alves Nov. 25, 2016, 6:39 p.m. UTC | #8
On 11/25/2016 06:26 PM, Luis Machado wrote:
> On 11/25/2016 12:02 PM, Simon Marchi wrote:
>> On 2016-11-25 12:55, Pedro Alves wrote:
>>> Or just not pass anything about the target file?
>>> "failed to compile" works just as well, IMO.  If you need more detail,
>>> it's in the gdb.log.
>>
>> Agreed, I think that's even better.  I was first thinking it would be
>> useful to have the dest file, in the cases where the same source file is
>> compiled multiple times to multiple destinations.  But you're right that
>> if you want details, you'll go look at gdb.log.  It's enough for the
>> test name to give a rough idea of what failed.
> 
> Great. I'll adjust things.
> 
> Should i get the existing tests that already output srcfile paths on
> compilation failures fixed up and standardized with this patch as well
> or with a separate one?

IMO, whatever you prefer.  There's no harm in doing it incrementally.

It'd make a difference if the previous version of the patch was mostly
OK except some detail that only mattered in a few hunks.  Bundling
everything would force reviewers to waste time rereading what was already
OKed.  In such a case, I'd rather the OKed parts were pushed in and the
NAKed parts to be left for a separate follow up patch.
But in this patch's case, you'll end up retouching most hunks anyway.

Thanks,
Pedro Alves
diff mbox

Patch

diff --git a/gdb/testsuite/gdb.ada/start.exp b/gdb/testsuite/gdb.ada/start.exp
index 9a55f8f..b01731e 100644
--- a/gdb/testsuite/gdb.ada/start.exp
+++ b/gdb/testsuite/gdb.ada/start.exp
@@ -20,7 +20,7 @@  if { [skip_ada_tests] } { return -1 }
 # This testcase verifies the behavior of the `start' command, which
 # does not work when we use the gdb stub...
 if [target_info exists use_gdb_stub] {
-    untested start.exp
+    untested "skipping test due to gdb stub"
     return
 }
 
@@ -34,7 +34,7 @@  clean_restart ${testfile}
 
 # Verify that "start" lands inside the right procedure.
 if { [gdb_start_cmd] < 0 } {
-    untested start
+    untested "start failed to land inside the right procedure"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/gdb1291.exp b/gdb/testsuite/gdb.arch/gdb1291.exp
index 35c9ef0..784ba7a 100644
--- a/gdb/testsuite/gdb.arch/gdb1291.exp
+++ b/gdb/testsuite/gdb.arch/gdb1291.exp
@@ -33,7 +33,7 @@  set testfile "gdb1291"
 set srcfile ${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ""] != "" } {
-    untested gdb1291.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/gdb1431.exp b/gdb/testsuite/gdb.arch/gdb1431.exp
index c35cc5d..69f9cbb 100644
--- a/gdb/testsuite/gdb.arch/gdb1431.exp
+++ b/gdb/testsuite/gdb.arch/gdb1431.exp
@@ -35,7 +35,7 @@  set testfile "gdb1431"
 set srcfile ${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ""] != "" } {
-    untested gdb1431.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.arch/gdb1558.exp b/gdb/testsuite/gdb.arch/gdb1558.exp
index d96ad87..6c8bca8 100644
--- a/gdb/testsuite/gdb.arch/gdb1558.exp
+++ b/gdb/testsuite/gdb.arch/gdb1558.exp
@@ -32,7 +32,7 @@  set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 # Note we have to compile WITH optimization and WITHOUT debugging information to expose the bug.
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {"additional_flags=-O2"}] != "" } {
-    untested gdb1558.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
index 38b594c..7ba27d0 100644
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ b/gdb/testsuite/gdb.base/annota1.exp
@@ -34,7 +34,7 @@  set breakpoints_invalid "\r\n\032\032breakpoints-invalid\r\n"
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested annota1.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
index de11c4a..482cfb7 100644
--- a/gdb/testsuite/gdb.base/annota3.exp
+++ b/gdb/testsuite/gdb.base/annota3.exp
@@ -33,7 +33,7 @@  if [is_remote target] then {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested annota3.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/assign.exp b/gdb/testsuite/gdb.base/assign.exp
index 7f1484e..27b04e8 100644
--- a/gdb/testsuite/gdb.base/assign.exp
+++ b/gdb/testsuite/gdb.base/assign.exp
@@ -28,7 +28,7 @@ 
 standard_testfile all-types.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested assign.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/attach.exp b/gdb/testsuite/gdb.base/attach.exp
index bd0760c..dc2a001 100644
--- a/gdb/testsuite/gdb.base/attach.exp
+++ b/gdb/testsuite/gdb.base/attach.exp
@@ -30,14 +30,14 @@  remote_exec build "rm -f ${binfile} ${binfile2}"
 # build the first test case
 #
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested attach.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
 # Build the in-system-call test
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
-    untested attach.exp
+    untested "couldn't compile ${srcfile2} to ${binfile2}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/bang.exp b/gdb/testsuite/gdb.base/bang.exp
index 26a4156..dfce7e8 100644
--- a/gdb/testsuite/gdb.base/bang.exp
+++ b/gdb/testsuite/gdb.base/bang.exp
@@ -20,7 +20,7 @@  standard_testfile args.c
 
 if {[prepare_for_testing $testfile.exp ${testfile}! $srcfile \
 	 {debug nowarnings}]} {
-    untested bang.exp
+    untested "couldn't compile ${srcfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp
index ae00d0a..68f71e9 100644
--- a/gdb/testsuite/gdb.base/bigcore.exp
+++ b/gdb/testsuite/gdb.base/bigcore.exp
@@ -42,7 +42,7 @@  standard_testfile .c
 set corefile [standard_output_file ${binfile}.corefile]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested bigcore.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/bitfields2.exp b/gdb/testsuite/gdb.base/bitfields2.exp
index 0f7b7c7..4086809 100644
--- a/gdb/testsuite/gdb.base/bitfields2.exp
+++ b/gdb/testsuite/gdb.base/bitfields2.exp
@@ -26,7 +26,7 @@ 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested bitfields2.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/callexit.exp b/gdb/testsuite/gdb.base/callexit.exp
index 219c9a4..9bd858d 100644
--- a/gdb/testsuite/gdb.base/callexit.exp
+++ b/gdb/testsuite/gdb.base/callexit.exp
@@ -17,7 +17,7 @@ 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested callexit.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp
index 44d5502..eb9b37a 100644
--- a/gdb/testsuite/gdb.base/charset.exp
+++ b/gdb/testsuite/gdb.base/charset.exp
@@ -146,7 +146,7 @@  gdb_expect {
 # sets: "auto" and the default.  In this situation, this set of tests
 # is pointless.
 if {[llength [array names charsets]] < 3} {
-    untested charset.exp
+    untested "less than 3 charsets"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp
index ab18419..21184b8 100644
--- a/gdb/testsuite/gdb.base/checkpoint.exp
+++ b/gdb/testsuite/gdb.base/checkpoint.exp
@@ -38,7 +38,7 @@  if {[is_remote host]} {
 
 if {[prepare_for_testing ${testfile}.exp $testfile $srcfile \
 	 [list debug "additional_flags=-DPI_TXT=\"$pi_txt\" -DCOPY1_TXT=\"$copy1_txt\""]]} {
-     untested checkpoint.exp
+     untested "couldn't compile ${srcfile} to ${testfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/comprdebug.exp b/gdb/testsuite/gdb.base/comprdebug.exp
index 08d48ea..e89c211 100644
--- a/gdb/testsuite/gdb.base/comprdebug.exp
+++ b/gdb/testsuite/gdb.base/comprdebug.exp
@@ -18,7 +18,7 @@  standard_testfile average.c
 set ofile "${binfile}0.o"
 if {[gdb_compile $srcdir/$subdir/$srcfile $ofile \
 	 object {debug}] != ""} {
-    untested comprdebug.exp
+    untested "couldn't compile ${srcfile} to ${ofile}"
     return
 }
 
@@ -30,7 +30,7 @@  verbose "result is $result"
 verbose "output is $output"
 
 if {$result == 1} {
-    untested comprdebug.exp
+    untested "failed to execute objcopy"
     return
 }
 
diff --git a/gdb/testsuite/gdb.base/constvars.exp b/gdb/testsuite/gdb.base/constvars.exp
index d6bae74..a3c50d2 100644
--- a/gdb/testsuite/gdb.base/constvars.exp
+++ b/gdb/testsuite/gdb.base/constvars.exp
@@ -36,7 +36,7 @@  if [get_compiler_info] {
 }
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug ] != "" } {
-    untested constvars.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/cvexpr.exp b/gdb/testsuite/gdb.base/cvexpr.exp
index 4bdda762..6b5ba18 100644
--- a/gdb/testsuite/gdb.base/cvexpr.exp
+++ b/gdb/testsuite/gdb.base/cvexpr.exp
@@ -25,7 +25,7 @@ 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested cvexpr.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/detach.exp b/gdb/testsuite/gdb.base/detach.exp
index b9343ee..6c17729 100644
--- a/gdb/testsuite/gdb.base/detach.exp
+++ b/gdb/testsuite/gdb.base/detach.exp
@@ -26,7 +26,7 @@  standard_testfile attach.c
 set escapedbinfile  [string_to_regexp ${binfile}]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested detach.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index 040110a..2e9a7db 100644
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -20,7 +20,7 @@  standard_testfile
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile \
 	 {debug nowarnings}]} {
-    untested display.exp
+    untested "couldn't compile ${srcfile} to ${testfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/dmsym.exp b/gdb/testsuite/gdb.base/dmsym.exp
index 3e8d494..55308e9 100644
--- a/gdb/testsuite/gdb.base/dmsym.exp
+++ b/gdb/testsuite/gdb.base/dmsym.exp
@@ -26,7 +26,7 @@  set dmsym_o [standard_output_file dmsym.o]
 if {[gdb_compile "${srcdir}/${subdir}/dmsym.c" \
                  $dmsym_o \
                  object {}] != ""} {
-  untested dmsym.exp
+  untested "couldn't compile dmsym.c to ${dmsym_o}"
   return -1
 }
 
@@ -34,7 +34,7 @@  if {[gdb_compile \
       [list ${srcdir}/${subdir}/dmsym_main.c $dmsym_o] \
       [standard_output_file ${testfile}] \
       executable {debug}] != ""} {
-    untested dmsym.exp
+    untested "couldn't compile dmsym_main.c to ${dmsym_o}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp
index a38f9d1..e4a7bd6 100644
--- a/gdb/testsuite/gdb.base/dump.exp
+++ b/gdb/testsuite/gdb.base/dump.exp
@@ -37,7 +37,7 @@  if {[istarget "spu*-*-*"]} then {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ${options}] != "" } {
-     untested dump.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
@@ -95,7 +95,7 @@  remote_exec host "rm -f $filenames"
 # Run target program until data structs are initialized.
 
 if { ! [ runto checkpoint1 ] } then {
-    untested dump.exp
+    untested "couldn't run to checkpoint"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/exprs.exp b/gdb/testsuite/gdb.base/exprs.exp
index 446f8cc..0e86079 100644
--- a/gdb/testsuite/gdb.base/exprs.exp
+++ b/gdb/testsuite/gdb.base/exprs.exp
@@ -22,7 +22,7 @@ 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested exprs.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fileio.exp
index d83bbb4..788783f 100644
--- a/gdb/testsuite/gdb.base/fileio.exp
+++ b/gdb/testsuite/gdb.base/fileio.exp
@@ -32,7 +32,7 @@  if {[is_remote host]} {
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	   executable \
 	   [list debug "additional_flags=-DOUTDIR=\"$outdir/\""]] != "" } {
-    untested fileio.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/find.exp b/gdb/testsuite/gdb.base/find.exp
index c4bdfb7..7c8f526 100644
--- a/gdb/testsuite/gdb.base/find.exp
+++ b/gdb/testsuite/gdb.base/find.exp
@@ -18,7 +18,7 @@ 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested find.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/finish.exp
index c5387bb..35294cc 100644
--- a/gdb/testsuite/gdb.base/finish.exp
+++ b/gdb/testsuite/gdb.base/finish.exp
@@ -90,7 +90,7 @@  proc finish_tests { } {
     global gdb_prompt skip_float_test
 
     if { ! [ runto_main ] } then {
-	untested finish.exp
+	untested "couldn't run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp
index a41f8e5..a0ba6c4 100644
--- a/gdb/testsuite/gdb.base/gcore.exp
+++ b/gdb/testsuite/gdb.base/gcore.exp
@@ -20,12 +20,12 @@ 
 standard_testfile
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
-    untested $testfile.exp
+    untested "couldn't compile ${srcfile} to ${testfile}"
     return -1
 }
 
 if { ! [ runto_main ] } then {
-    untested gcore.exp
+    untested "couldn't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/gdb1250.exp b/gdb/testsuite/gdb.base/gdb1250.exp
index 1a7c8e4..c42138d 100644
--- a/gdb/testsuite/gdb.base/gdb1250.exp
+++ b/gdb/testsuite/gdb.base/gdb1250.exp
@@ -25,7 +25,7 @@ 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested gdb1250.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/hashline1.exp b/gdb/testsuite/gdb.base/hashline1.exp
index c57d4a6..ad67b08 100644
--- a/gdb/testsuite/gdb.base/hashline1.exp
+++ b/gdb/testsuite/gdb.base/hashline1.exp
@@ -33,7 +33,7 @@  close $fd
 # the bug.  Using $new_srcfile here won't trigger the bug.
 set compile_name [relative_filename $objdir $new_srcfile]
 if { [gdb_compile $compile_name "${binfile}" executable {debug}] != "" } {
-    untested hashline1.exp
+    untested "couldn't compile ${compile_name} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/hashline2.exp b/gdb/testsuite/gdb.base/hashline2.exp
index bbdb5bd..6db1225 100644
--- a/gdb/testsuite/gdb.base/hashline2.exp
+++ b/gdb/testsuite/gdb.base/hashline2.exp
@@ -30,7 +30,7 @@  puts $fd "int main () { return 0; } /* set breakpoint here */"
 close $fd
 
 if { [gdb_compile $new_srcfile "${binfile}" executable {debug}] != "" } {
-    untested hashline2.exp
+    untested "couldn't compile ${new_srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/hashline3.exp b/gdb/testsuite/gdb.base/hashline3.exp
index a2a9b3d..55f641b 100644
--- a/gdb/testsuite/gdb.base/hashline3.exp
+++ b/gdb/testsuite/gdb.base/hashline3.exp
@@ -31,7 +31,7 @@  puts $fd "int main () { return 0; } /* set breakpoint here */"
 close $fd
 
 if { [gdb_compile $new_srcfile "${binfile}" executable {debug}] != "" } {
-    untested hashline3.exp
+    untested "couldn't compile ${new_srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/huge.exp b/gdb/testsuite/gdb.base/huge.exp
index 4dca89b..e95acd5 100644
--- a/gdb/testsuite/gdb.base/huge.exp
+++ b/gdb/testsuite/gdb.base/huge.exp
@@ -31,7 +31,7 @@  for { set size [expr 2 * 1024 * 1024] } { $size > 10 } { set size [expr $size /
       == "" } break
 }
 if { $size < 10 } {
-     untested huge.exp
+     untested "size less than 10"
      return -1
 }
 
@@ -43,7 +43,7 @@  set prev_timeout $timeout
 set timeout 30
 
 if { ! [ runto_main ] } then {
-    untested huge.exp
+    untested "couldn't run to main"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/jit-so.exp b/gdb/testsuite/gdb.base/jit-so.exp
index 9fadd86..34d5bd2 100644
--- a/gdb/testsuite/gdb.base/jit-so.exp
+++ b/gdb/testsuite/gdb.base/jit-so.exp
@@ -17,13 +17,12 @@ 
 # library.
 
 if {[skip_shlib_tests]} {
-    untested jit-so.exp
+    untested "skipping shared library tests"
     return -1
 }
 
 if {[get_compiler_info]} {
-    warning "Could not get compiler info"
-    untested jit-so.exp
+    untested "could not get compiler info"
     return 1
 }
 
@@ -35,7 +34,7 @@  set testfile jit-dlmain
 set srcfile ${testfile}.c
 set binfile [standard_output_file ${testfile}]
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug shlib_load}] != "" } {
-    untested jit-so.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
@@ -44,7 +43,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 additional_flags="-DMAIN=jit_dl_main"}] != "" } {
-    untested jit.exp
+    untested "couldn't compile ${srcfile2} to ${binfile2}"
     return -1
 }
 
@@ -57,7 +56,7 @@  set solib_binfile_test_msg "SHLIBDIR/${solib_testfile}.so"
 # renaming by munging on its symbol table, and that wouldn't work for .debug
 # sections.  Also, output for "info function" changes when debug info is resent.
 if { [gdb_compile_shlib ${solib_srcfile} ${solib_binfile} {}] != "" } {
-    untested jit-so.exp
+    untested "couldn't compile solib ${solib_srcfile} to ${solib_binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/jit.exp b/gdb/testsuite/gdb.base/jit.exp
index 17024e4..4f253ad 100644
--- a/gdb/testsuite/gdb.base/jit.exp
+++ b/gdb/testsuite/gdb.base/jit.exp
@@ -14,13 +14,12 @@ 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if {[skip_shlib_tests]} {
-    untested jit.exp
+    untested "skipping shared library tests"
     return -1
 }
 
 if {[get_compiler_info]} {
-    warning "Could not get compiler info"
-    untested jit.exp
+    untested "could not get compiler info"
     return 1
 }
 
diff --git a/gdb/testsuite/gdb.base/jump.exp b/gdb/testsuite/gdb.base/jump.exp
index 7e03d90..b447975 100644
--- a/gdb/testsuite/gdb.base/jump.exp
+++ b/gdb/testsuite/gdb.base/jump.exp
@@ -20,7 +20,7 @@  standard_testfile .c
 
 # Build the test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested jump.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/label.exp b/gdb/testsuite/gdb.base/label.exp
index 18b6f83..813dabbc 100644
--- a/gdb/testsuite/gdb.base/label.exp
+++ b/gdb/testsuite/gdb.base/label.exp
@@ -26,7 +26,7 @@  if [is_remote target] then {
 standard_testfile .c
 
 if { [prepare_for_testing ${testfile}.exp $testfile ${srcfile} debug] } {
-    untested label.exp
+    untested "couldn't compile ${srcfile} to ${testfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/lineinc.exp b/gdb/testsuite/gdb.base/lineinc.exp
index 4070f4e..9c6966d 100644
--- a/gdb/testsuite/gdb.base/lineinc.exp
+++ b/gdb/testsuite/gdb.base/lineinc.exp
@@ -81,7 +81,7 @@ 
 standard_testfile .c
 
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" ${binfile} executable {debug}] != ""} {
-    untested lineinc.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/logical.exp b/gdb/testsuite/gdb.base/logical.exp
index 1efc5f6..e900460 100644
--- a/gdb/testsuite/gdb.base/logical.exp
+++ b/gdb/testsuite/gdb.base/logical.exp
@@ -28,7 +28,7 @@ 
 standard_testfile int-type.c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested logical.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/longjmp.exp b/gdb/testsuite/gdb.base/longjmp.exp
index 2c3401c..b3f8aee 100644
--- a/gdb/testsuite/gdb.base/longjmp.exp
+++ b/gdb/testsuite/gdb.base/longjmp.exp
@@ -21,7 +21,7 @@ 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested longjmp.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index 4e03553..ed34e96 100644
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -30,7 +30,7 @@  if [test_compiler_info gcc*] {
 if  {[gdb_compile "${srcdir}/${subdir}/macscp1.c" "${objfile}" \
 	  object $options] != "" 
      || [gdb_compile "${objfile}" "${binfile}" executable $options] != "" } {
-    untested macscp.exp
+    untested "couldn't compile macscp1.c to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/miscexprs.exp b/gdb/testsuite/gdb.base/miscexprs.exp
index 059c434..c291c9f 100644
--- a/gdb/testsuite/gdb.base/miscexprs.exp
+++ b/gdb/testsuite/gdb.base/miscexprs.exp
@@ -40,7 +40,7 @@  set additional_flags "additional_flags=${storage}"
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ${additional_flags} nowarnings]] != "" } {
-    untested miscexprs.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/offsets.exp b/gdb/testsuite/gdb.base/offsets.exp
index b65fac7..04f6d19 100644
--- a/gdb/testsuite/gdb.base/offsets.exp
+++ b/gdb/testsuite/gdb.base/offsets.exp
@@ -19,7 +19,7 @@  standard_testfile offsets.c
 
 if { [prepare_for_testing "failed to prepare for testing large offsets" \
 	  ${testfile} ${srcfile}] } {
-    untested offsets.exp
+    untested "couldn't compile ${srcfile} to ${testfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/overlays.exp b/gdb/testsuite/gdb.base/overlays.exp
index cf4213a..dac419a 100644
--- a/gdb/testsuite/gdb.base/overlays.exp
+++ b/gdb/testsuite/gdb.base/overlays.exp
@@ -42,7 +42,7 @@  standard_testfile overlays.c ovlymgr.c foo.c bar.c baz.c grbx.c
 if {[build_executable $testfile.exp $testfile \
 	 [list $srcfile $srcfile2 $srcfile3 $srcfile4 $srcfile5 $srcfile6] \
 	 {debug ldscript=-Wl,-T$linker_script}] == -1} {
-     untested overlays.exp
+     untested "couldn't compile ${srcfile} ${srcfile2} ${srcfile3} ${srcfile4} ${srcfile5} ${srcfile6} to ${testfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp
index fa1fe3e..ac7c984 100644
--- a/gdb/testsuite/gdb.base/pointers.exp
+++ b/gdb/testsuite/gdb.base/pointers.exp
@@ -28,7 +28,7 @@ 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-     untested pointers.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/pr11022.exp b/gdb/testsuite/gdb.base/pr11022.exp
index 2a650d6..b8031e0 100644
--- a/gdb/testsuite/gdb.base/pr11022.exp
+++ b/gdb/testsuite/gdb.base/pr11022.exp
@@ -20,7 +20,7 @@  if {[skip_hw_watchpoint_tests]} {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested pr11022.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp
index 7937fe7..e2dc8cc 100644
--- a/gdb/testsuite/gdb.base/printcmds.exp
+++ b/gdb/testsuite/gdb.base/printcmds.exp
@@ -23,7 +23,7 @@ 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested printcmds.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/prologue.exp b/gdb/testsuite/gdb.base/prologue.exp
index efd7e0c..1818053 100644
--- a/gdb/testsuite/gdb.base/prologue.exp
+++ b/gdb/testsuite/gdb.base/prologue.exp
@@ -19,7 +19,7 @@  if { [skip_cplus_tests] } { continue }
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested prologue.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/relocate.exp b/gdb/testsuite/gdb.base/relocate.exp
index 52fc3ce..5784661 100644
--- a/gdb/testsuite/gdb.base/relocate.exp
+++ b/gdb/testsuite/gdb.base/relocate.exp
@@ -21,7 +21,7 @@  append binfile .o
 
 remote_exec build "rm -f ${binfile}"
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug}] != "" } {
-     untested relocate.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp
index a3c34eb..f61567b 100644
--- a/gdb/testsuite/gdb.base/remote.exp
+++ b/gdb/testsuite/gdb.base/remote.exp
@@ -26,7 +26,7 @@  gdb_start
 
 set result [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}]
 if {$result != "" } then {
-    untested remote.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/reread.exp b/gdb/testsuite/gdb.base/reread.exp
index 3116dbf..93d949a 100644
--- a/gdb/testsuite/gdb.base/reread.exp
+++ b/gdb/testsuite/gdb.base/reread.exp
@@ -23,7 +23,7 @@  set srcfile1 ${testfile1}.c
 set binfile1 [standard_output_file ${testfile1}$EXEEXT]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile1}" "${binfile1}" executable {debug nowarnings}] != "" } {
-    untested reread.exp
+    untested "couldn't compile ${srcfile1} to ${binfile1}"
     return -1
 }
 
@@ -35,7 +35,7 @@  set binfile2 [standard_output_file ${testfile2}$EXEEXT]
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug nowarnings}] != ""
       && [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug nowarnings additional_flags=-DNO_SECTIONS}] != ""} {
-    untested reread.exp
+    untested "couldn't compile ${srcfile2} to ${binfile2}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/return2.exp b/gdb/testsuite/gdb.base/return2.exp
index 77be75e..e0b0bfa 100644
--- a/gdb/testsuite/gdb.base/return2.exp
+++ b/gdb/testsuite/gdb.base/return2.exp
@@ -19,7 +19,7 @@ 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested return2.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
@@ -82,7 +82,7 @@  proc return2_tests { } {
     global gdb_prompt skip_float_test
 
     if { ! [ runto_main ] } then {
-	untested return2.exp
+	untested "couldn't run to main"
 	return -1
     }
 
diff --git a/gdb/testsuite/gdb.base/sep.exp b/gdb/testsuite/gdb.base/sep.exp
index dc860f6..9baded0 100644
--- a/gdb/testsuite/gdb.base/sep.exp
+++ b/gdb/testsuite/gdb.base/sep.exp
@@ -16,7 +16,7 @@ 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested sep.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/sepdebug.exp b/gdb/testsuite/gdb.base/sepdebug.exp
index 3ad3669..23f533b 100644
--- a/gdb/testsuite/gdb.base/sepdebug.exp
+++ b/gdb/testsuite/gdb.base/sepdebug.exp
@@ -32,7 +32,7 @@ 
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
-    untested sepdebug.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/sepsymtab.exp b/gdb/testsuite/gdb.base/sepsymtab.exp
index 4f9a682..41c40a4 100644
--- a/gdb/testsuite/gdb.base/sepsymtab.exp
+++ b/gdb/testsuite/gdb.base/sepsymtab.exp
@@ -21,7 +21,7 @@  standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	  executable {debug}] != "" } {
-    untested sepsymtab.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp
index 93dd926..93512d0 100644
--- a/gdb/testsuite/gdb.base/setshow.exp
+++ b/gdb/testsuite/gdb.base/setshow.exp
@@ -19,7 +19,7 @@ 
 standard_testfile .c
 
 if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable {debug}] != "" } {
-     untested setshow.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp
index 677e77f..7a16afc 100644
--- a/gdb/testsuite/gdb.base/signals.exp
+++ b/gdb/testsuite/gdb.base/signals.exp
@@ -22,7 +22,7 @@  if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested signals.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/signull.exp
index a10c83e..7c52c1b 100644
--- a/gdb/testsuite/gdb.base/signull.exp
+++ b/gdb/testsuite/gdb.base/signull.exp
@@ -36,7 +36,7 @@  if [target_info exists gdb,nosignals] {
 standard_testfile .c
 
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested signull.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp
index 4fcef52..c94d7ca 100644
--- a/gdb/testsuite/gdb.base/structs.exp
+++ b/gdb/testsuite/gdb.base/structs.exp
@@ -70,7 +70,7 @@  proc start_structs_test { types } {
 	# 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 structs.exp
+	    untested "couldn't compile ${srcfile} to ${binfile}"
 	    return -1
 	}
     }
diff --git a/gdb/testsuite/gdb.base/structs2.exp b/gdb/testsuite/gdb.base/structs2.exp
index 5eaf936..f74ca97 100644
--- a/gdb/testsuite/gdb.base/structs2.exp
+++ b/gdb/testsuite/gdb.base/structs2.exp
@@ -27,7 +27,7 @@  if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     # 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 {debug additional_flags=-DNO_PROTOTYPES}] != "" } {
-	untested structs2.exp
+	untested "couldn't compile ${srcfile} to ${binfile}"
 	return -1
     }
     set prototypes 0
diff --git a/gdb/testsuite/gdb.base/twice.exp b/gdb/testsuite/gdb.base/twice.exp
index c0e8318..e87a747 100644
--- a/gdb/testsuite/gdb.base/twice.exp
+++ b/gdb/testsuite/gdb.base/twice.exp
@@ -26,7 +26,7 @@  close $fileid
 gdb_remote_download host ${srcdir}/${subdir}/twice.c
 
 if  { [gdb_compile $local_srcfile "${binfile}" executable $options] != "" } {
-     untested twice.exp
+     untested "couldn't compile ${local_srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/varargs.exp b/gdb/testsuite/gdb.base/varargs.exp
index 36b0107..0064159 100644
--- a/gdb/testsuite/gdb.base/varargs.exp
+++ b/gdb/testsuite/gdb.base/varargs.exp
@@ -47,7 +47,7 @@  if [support_complex_tests] {
 # build the first test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
 	   executable ${additional_flags}] != "" } {
-     untested varargs.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index e4eab3d..08ef00f 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -23,7 +23,7 @@  if [get_compiler_info] {
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested watchpoint.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.base/whatis.exp b/gdb/testsuite/gdb.base/whatis.exp
index 0cdcf5b..991b63f 100644
--- a/gdb/testsuite/gdb.base/whatis.exp
+++ b/gdb/testsuite/gdb.base/whatis.exp
@@ -28,7 +28,7 @@  if [target_info exists no_long_long] {
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $exec_opts] != "" } {
-     untested whatis.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/dispcxx.exp b/gdb/testsuite/gdb.cp/dispcxx.exp
index 3ca4c2b..0be6b78 100644
--- a/gdb/testsuite/gdb.cp/dispcxx.exp
+++ b/gdb/testsuite/gdb.cp/dispcxx.exp
@@ -18,7 +18,7 @@  if { [skip_cplus_tests] } { continue }
 standard_testfile .cc
 
 if [get_compiler_info "c++"] {
-    untested dispcxx.exp
+    untested "couldn't find a valid c++ compiler"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/gdb2384.exp b/gdb/testsuite/gdb.cp/gdb2384.exp
index 66c6cb1..69b2542 100644
--- a/gdb/testsuite/gdb.cp/gdb2384.exp
+++ b/gdb/testsuite/gdb.cp/gdb2384.exp
@@ -36,7 +36,7 @@  if [get_compiler_info "c++"] {
 
 if { [gdb_compile_shlib $srcdir/$subdir/$srcfile2 $sofile {debug c++}] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable [list debug "c++" shlib=${sofile}]] != ""} {
-    untested gdb2384.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/method2.exp b/gdb/testsuite/gdb.cp/method2.exp
index a163b0c..de719c8 100644
--- a/gdb/testsuite/gdb.cp/method2.exp
+++ b/gdb/testsuite/gdb.cp/method2.exp
@@ -23,7 +23,7 @@  if { [skip_cplus_tests] } { continue }
 standard_testfile .cc
 
 if  {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
-     untested method2.exp
+     untested "couldn't compile ${srcfile} to ${testfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.exp b/gdb/testsuite/gdb.cp/nextoverthrow.exp
index 0a9973d..6d36c3f 100644
--- a/gdb/testsuite/gdb.cp/nextoverthrow.exp
+++ b/gdb/testsuite/gdb.cp/nextoverthrow.exp
@@ -21,7 +21,7 @@  standard_testfile .cc
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
 if [get_compiler_info "c++"] {
-    untested nextoverthrow.exp
+    untested "couldn't find a valid c++ compiler"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.cp/pr10728.exp b/gdb/testsuite/gdb.cp/pr10728.exp
index 39d1140..f776a6b 100644
--- a/gdb/testsuite/gdb.cp/pr10728.exp
+++ b/gdb/testsuite/gdb.cp/pr10728.exp
@@ -26,17 +26,17 @@  set tfx [standard_output_file pr10728-x.o]
 set tfy [standard_output_file pr10728-y.o]
 
 if  { [gdb_compile "${srcdir}/${subdir}/$srcfile2" "${tfy}.o" object {c++}] != "" } {
-     untested pr10728.exp
+     untested "couldn't compile ${srcfile2} to ${tfy}.o"
      return -1
 }
 
 if  { [gdb_compile "${srcdir}/${subdir}/$srcfile" "${tfx}.o" object {debug c++}] != "" } {
-     untested pr10728.exp
+     untested "couldn't compile ${srcfile} to ${tfx}.o"
      return -1
 }
 
 if  { [gdb_compile "${tfx}.o ${tfy}.o" ${binfile} executable {debug c++}] != "" } {
-     untested pr10728.exp
+     untested "couldn't compile ${tfx}.o and ${tfy}.o to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.disasm/am33.exp b/gdb/testsuite/gdb.disasm/am33.exp
index 73ad07f..bb01f6c 100644
--- a/gdb/testsuite/gdb.disasm/am33.exp
+++ b/gdb/testsuite/gdb.disasm/am33.exp
@@ -27,7 +27,7 @@  set testfile "am33"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
-     untested am33.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.disasm/h8300s.exp b/gdb/testsuite/gdb.disasm/h8300s.exp
index 2d2c3d5..603641e 100644
--- a/gdb/testsuite/gdb.disasm/h8300s.exp
+++ b/gdb/testsuite/gdb.disasm/h8300s.exp
@@ -25,7 +25,7 @@  set testfile "h8300s"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable {debug additional_flags=-ms}] != "" } {
-     untested h8300s.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.disasm/mn10300.exp b/gdb/testsuite/gdb.disasm/mn10300.exp
index 477211b..b2268bf 100644
--- a/gdb/testsuite/gdb.disasm/mn10300.exp
+++ b/gdb/testsuite/gdb.disasm/mn10300.exp
@@ -27,7 +27,7 @@  set testfile "mn10300"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] != "" } {
-     untested mn10300.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.disasm/sh3.exp b/gdb/testsuite/gdb.disasm/sh3.exp
index 9e6e9f1..d456683 100644
--- a/gdb/testsuite/gdb.disasm/sh3.exp
+++ b/gdb/testsuite/gdb.disasm/sh3.exp
@@ -25,7 +25,7 @@  set testfile "sh3"
 set srcfile ${srcdir}/${subdir}/${testfile}.s
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcfile}" "${binfile}" executable ""] != "" } {
-     untested sh3.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.linespec/linespec.exp b/gdb/testsuite/gdb.linespec/linespec.exp
index 2fe4312..223d7d7 100644
--- a/gdb/testsuite/gdb.linespec/linespec.exp
+++ b/gdb/testsuite/gdb.linespec/linespec.exp
@@ -23,7 +23,7 @@  set baseone base/one/thefile.cc
 set basetwo base/two/thefile.cc
 
 if {[skip_cplus_tests]} {
-    unsupported linespec.exp
+    unsupported "skipping c++ tests"
     return
 }
 
diff --git a/gdb/testsuite/gdb.mi/gdb701.exp b/gdb/testsuite/gdb.mi/gdb701.exp
index be1fb85..73d8a47 100644
--- a/gdb/testsuite/gdb.mi/gdb701.exp
+++ b/gdb/testsuite/gdb.mi/gdb701.exp
@@ -28,7 +28,7 @@  if [mi_gdb_start] {
 standard_testfile
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable debug] != ""} {
-  untested gdb701.exp
+  untested "couldn't compile ${srcfile} to ${binfile}"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/gdb792.exp b/gdb/testsuite/gdb.mi/gdb792.exp
index 7dfd08a..05f6a84 100644
--- a/gdb/testsuite/gdb.mi/gdb792.exp
+++ b/gdb/testsuite/gdb.mi/gdb792.exp
@@ -34,7 +34,7 @@  if [get_compiler_info "c++"] {
 }
 
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable {debug c++}] != ""} {
-  untested gdb792.exp
+  untested "couldn't compile ${srcfile} to ${binfile}"
   return -1
 }
 
diff --git a/gdb/testsuite/gdb.mi/pr11022.exp b/gdb/testsuite/gdb.mi/pr11022.exp
index 6f6902b..b2ebf79 100644
--- a/gdb/testsuite/gdb.mi/pr11022.exp
+++ b/gdb/testsuite/gdb.mi/pr11022.exp
@@ -23,7 +23,7 @@  set MIFLAGS "-i=mi"
 standard_testfile .c
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     untested pr11022.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return
 }
 
diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index 2a8ef3e..aecf0b8 100644
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -271,7 +271,7 @@  if { [lindex $exec_output 0] != 0 } {
 }
 
 if  { [gdb_compile "${srcfile}" "${binfile}" object ""] != "" } {
-     untested weird.exp
+     untested "couldn't compile ${srcfile} to ${binfile}"
      return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index c4d1605..121efc3 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -24,7 +24,7 @@  gdb_start
 standard_testfile
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested actions.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/ax.exp b/gdb/testsuite/gdb.trace/ax.exp
index 5e9783f..97c8f25 100644
--- a/gdb/testsuite/gdb.trace/ax.exp
+++ b/gdb/testsuite/gdb.trace/ax.exp
@@ -26,7 +26,7 @@  gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested ax.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
index 881a798..c4b439d 100644
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ b/gdb/testsuite/gdb.trace/backtrace.exp
@@ -91,13 +91,13 @@  gdb_test_multiple "list $baseline, +12" "all tests in this module will fail" {
     }
     -re ".*$gdb_prompt $" {
 	if { ($testline1 == 0) || ($testline2 == 0) || ($testline3 == 0) || ($testline4 == 0) || ($testline5 == 0) || ($testline6 == 0) } {
-	    untested backtrace.exp
+	    untested "unexpected testline values"
 	    set return_me 1
 all tests in this module will fail."
 	}
     }
     default {
-	    untested backtrace.exp
+	    untested "couldn't match pattern"
 	    set return_me 1
 all tests in this module will fail."
     }
diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp
index 652b6c1..f2404e0 100644
--- a/gdb/testsuite/gdb.trace/deltrace.exp
+++ b/gdb/testsuite/gdb.trace/deltrace.exp
@@ -24,7 +24,7 @@  gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested deltrace.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
index 7ba212a..f932fa7 100644
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ b/gdb/testsuite/gdb.trace/infotrace.exp
@@ -24,7 +24,7 @@  gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested infotrace.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index 93bfc79..3553ba5 100644
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -24,7 +24,7 @@  gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested packetlen.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 gdb_load $binfile
diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp
index 2ec858a..e0855dd 100644
--- a/gdb/testsuite/gdb.trace/passcount.exp
+++ b/gdb/testsuite/gdb.trace/passcount.exp
@@ -23,7 +23,7 @@  gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested passcount.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index 7d89627..0ce5be0 100644
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -24,7 +24,7 @@  gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested report.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 gdb_load $binfile
@@ -97,13 +97,13 @@  gdb_test_multiple "list $gdb_recursion_test_baseline, +12" "" {
     }
     -re ".*$gdb_prompt $" {
 	if { ($testline1 == 0) || ($testline2 == 0) || ($testline3 == 0) || ($testline4 == 0) || ($testline5 == 0) || ($testline6 == 0) } {
-	    untested report.exp
+	    untested "unexpected testline values"
 	    set return_me 1
 all tests in this module will fail."
 	}
     }
     default {
-	    untested report.exp
+	    untested "couldn't match pattern"
 	    set return_me 1
 all tests in this module will fail."
     } 
diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index d78547d..3e260a1 100644
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -25,7 +25,7 @@  standard_testfile actions.c
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
 	  executable {debug nowarnings}] != "" } {
-    untested tfind.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 gdb_load $binfile
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index 11ef691..2fb591b 100644
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -23,7 +23,7 @@  gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested tracecmd.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
diff --git a/gdb/testsuite/gdb.trace/tspeed.exp b/gdb/testsuite/gdb.trace/tspeed.exp
index e638839..df92a2e 100644
--- a/gdb/testsuite/gdb.trace/tspeed.exp
+++ b/gdb/testsuite/gdb.trace/tspeed.exp
@@ -22,7 +22,7 @@  set ipalib [get_in_proc_agent]
 
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable [concat {debug nowarnings c} shlib=$ipalib]] != "" } {
-    untested tspeed.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 
diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index f146745..3325c93 100644
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -21,7 +21,7 @@  gdb_start
 standard_testfile actions.c
 if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	  executable {debug nowarnings}] != "" } {
-    untested tsv.exp
+    untested "couldn't compile ${srcfile} to ${binfile}"
     return -1
 }
 gdb_load $binfile