diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fb960b336a5..2de922707f8 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-22  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* auxv.exp: Intercept undefined command messages before
+	gdb_test_multiple does.
+
 2006-06-22  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* Makefile.in (host_alias): Remove.
diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index 5187dd9ed3f..dd43d85cf99 100644
--- a/gdb/testsuite/gdb.base/auxv.exp
+++ b/gdb/testsuite/gdb.base/auxv.exp
@@ -139,6 +139,9 @@ gdb_test_multiple "gcore $gcorefile" "gcore" {
     -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
 	unsupported "gcore"
     }
+    -re "Undefined command: .*\[\r\n\]+$gdb_prompt $" {
+	unsupported "gcore"
+    }
 }
 
 # Let the program continue and die.