diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e133fd821f..7ccee4640f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-02  Jim Blandy  <jimb@redhat.com>
+
+	* gdb.base/auxv.exp: Call 'untested' and return -1 instead of
+	calling gdb_suppress_entire_file.
+
 2005-04-30  Randolph Chung  <tausq@debian.org>
 
 	* gdb.threads/staticthreads.exp: Override signal to check for hppa.
diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index cb064f560a..5187dd9ed3 100644
--- a/gdb/testsuite/gdb.base/auxv.exp
+++ b/gdb/testsuite/gdb.base/auxv.exp
@@ -37,7 +37,8 @@ set corefile ${objdir}/${subdir}/${testfile}.corefile
 set gcorefile ${objdir}/${subdir}/${testfile}.gcore
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+    untested "couldn't compile ${srcdir}/${subdir}/${srcfile}"
+    return -1
 }
 
 # Use a fresh directory to confine the native core dumps.