* lib/gdb.exp (gdb_test_list_exact): New function.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / default.exp

diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
index 283745abffba2005ae4c4bee8a18f33949e6f6e6..64d4c9da6c34ff020bb7147cabcb4ba5e7a25680 100644 (file)
--- a/gdb/testsuite/gdb.base/default.exp
+++ b/gdb/testsuite/gdb.base/default.exp
@@ -567,8 +567,19 @@ gdb_test "show commands" ".*" "show commands"
 gdb_test "show complaints" "Max number of complaints about incorrect symbols is 0." "show complaints"
 #test show confirm
 gdb_test "show confirm" "Whether to confirm potentially dangerous operations is o\[a-z\]*." "show confirm"
+
 #test show convenience
-gdb_test "show convenience" "\\\$_siginfo = void" "show convenience"
+# This is tricker as there are multiple internal convenience vars and we
+# can't assume any particular order.
+gdb_test_list_exact "show convenience" "show convenience" \
+    {[^\r\n]+[\r\n]+} \
+    {[^\r\n]+} \
+    { \
+       {$_sdata = void} \
+       {$_siginfo = void} \
+       {$_thread = 0} \
+    }
+
 #test show directories
 gdb_test "show directories" "Source directories searched: .cdir\[:;\].cwd" "show directories"
 #test show editing