Update expected info threads error messages in gdb.multi/tids.exp

We currently have these FAILs:
...
FAIL: gdb.multi/tids.exp: two inferiors: info threads -1
FAIL: gdb.multi/tids.exp: two inferiors: info threads -$one
...
because we're expecting:
...
Invalid thread ID: -1
...
but instead we have:
...
Unrecognized option at: -1
...

This error message for info threads has changed since commit 54d6600669
'Make "info threads" use the gdb::option framework'.

Update the test accordingly.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2019-07-24  Tom de Vries  <tdevries@suse.de>

	PR testsuite/24831
	* gdb.multi/tids.exp: Update error messages for info threads.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4199f5b..32f7ea1 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2019-07-24  Tom de Vries  <tdevries@suse.de>
 
+       PR testsuite/24831
+       * gdb.multi/tids.exp: Update error messages for info threads.
+
+2019-07-24  Tom de Vries  <tdevries@suse.de>
+
        * gdb.base/info-types.exp: Allow info types to print info for more than
        one file.
 

diff --git a/gdb/testsuite/gdb.multi/tids.exp b/gdb/testsuite/gdb.multi/tids.exp
index 3b0e1c1..477806b 100644 (file)
--- a/gdb/testsuite/gdb.multi/tids.exp
+++ b/gdb/testsuite/gdb.multi/tids.exp
@@ -84,14 +84,19 @@ proc thr_apply_info_thr {tid_list info_thr {thr_apply ""}} {
     thread_apply $tid_list $thr_apply
 }
 
-# Issue both "info threads TID_LIST" and "thread apply TID_LIST" and
-# expect both commands to error out with EXP_ERROR.
-proc thr_apply_info_thr_error {tid_list exp_error}  {
+# Issue both "thread apply TID_LIST" and "info threads TID_LIST" and
+# expect commands to error out with EXP_ERROR_APPLY and EXP_ERROR_INFO.
+# If EXP_ERROR_INFO is missing, default to EXP_ERROR_APPLY.
+proc thr_apply_info_thr_error {tid_list exp_error_apply {exp_error_info ""}} {
+    if { "$exp_error_info" == "" } {
+       set exp_error_info "$exp_error_apply"
+    }
+
     gdb_test "info threads $tid_list" \
-       $exp_error
+       $exp_error_info
 
     gdb_test "thread apply $tid_list" \
-       $exp_error \
+       $exp_error_apply \
        "thread apply $tid_list"
 }
 
@@ -351,8 +356,10 @@ with_test_prefix "two inferiors" {
        thr_apply_info_thr_error "${prefix}2-1" "inverted range"
        thr_apply_info_thr_error "${prefix}2-\$one" "inverted range"
        if {$prefix == ""} {
-           thr_apply_info_thr_error "${prefix}-1" "Invalid thread ID: -1"
-           thr_apply_info_thr_error "${prefix}-\$one" "Invalid thread ID: -\\\$one"
+           thr_apply_info_thr_error "${prefix}-1" "Invalid thread ID: -1" \
+               "Unrecognized option at: -1"
+           thr_apply_info_thr_error "${prefix}-\$one" \
+               "Invalid thread ID: -\\\$one" "Unrecognized option at: -\\\$one"
        } else {
            thr_apply_info_thr_error "${prefix}-1" "negative value"
            thr_apply_info_thr_error "${prefix}-\$one" "negative value"