From: Michael Snyder Date: Thu, 17 Feb 2011 22:08:12 +0000 (+0000) Subject: 2011-02-17 Michael Snyder X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e338d953a9b25c6d525e02e8df70f14479d7d215;p=binutils-gdb.git 2011-02-17 Michael Snyder * gdb.threads/thread-find.exp: Fix regular expressions. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 005b5802644..7aaf3700021 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2011-02-17 Michael Snyder + + * gdb.threads/thread-find.exp: Fix regular expressions. + 2011-02-17 Joel Brobecker * gdb.ada/packed_array: Expand testcase to test printing of diff --git a/gdb/testsuite/gdb.threads/thread-find.exp b/gdb/testsuite/gdb.threads/thread-find.exp index dd18a958535..e01b792bbb1 100644 --- a/gdb/testsuite/gdb.threads/thread-find.exp +++ b/gdb/testsuite/gdb.threads/thread-find.exp @@ -303,31 +303,31 @@ set see5 0 set see6 0 gdb_test_multiple "info threads 2 4 6" "info threads 2 4 6" { - -re ". 6 .*\"threadname_6.*\" \[\r\n\]*" { - set see6 1 + -re ". 1 \[^\r\n\]*\"threadname_1\" \[^\r\n\]*" { + set see1 1 exp_continue } - -re ". 5 .*\"threadname_5.*\" \[\r\n\]*" { - set see5 1 + -re ". 2 \[^\r\n\]*\"threadname_2\" \[^\r\n\]*" { + set see2 1 exp_continue } - -re ". 4 .*\"threadname_4.*\" \[\r\n\]*" { - set see4 1 + -re ". 3 \[^\r\n\]*\"threadname_3\" \[^\r\n\]*" { + set see3 1 exp_continue } - -re ". 3 .*\"threadname_3.*\" \[\r\n\]*" { - set see3 1 + -re ". 4 \[^\r\n\]*\"threadname_4\" \[^\r\n\]*" { + set see4 1 exp_continue } - -re ". 2 .*\"threadname_2.*\" \[\r\n\]*" { - set see2 1 + -re ". 5 \[^\r\n\]*\"threadname_5\" \[^\r\n\]*" { + set see5 1 exp_continue } - -re ". 1 .*\"threadname_1.*\" \[\r\n\]*" { - set see1 1 + -re ". 6 \[^\r\n\]*\"threadname_6\" \[^\r\n\]*" { + set see6 1 exp_continue } - -re ".*$gdb_prompt $" { + -re "$gdb_prompt $" { if { $see2 && $see4 && $see6 && !$see1 && !$see3 && !$see5 } then { pass "info threads 2 4 6" } else { @@ -348,31 +348,31 @@ set see5 0 set see6 0 gdb_test_multiple "info threads 3-5" "info threads 3-5" { - -re ". 6 .*\"threadname_6.*\" \[\r\n\]*" { - set see6 1 + -re ". 1 .*\"threadname_1\" \[^\r\n\]*" { + set see1 1 exp_continue } - -re ". 5 .*\"threadname_5.*\" \[\r\n\]*" { - set see5 1 + -re ". 2 .*\"threadname_2\" \[^\r\n\]*" { + set see2 1 exp_continue } - -re ". 4 .*\"threadname_4.*\" \[\r\n\]*" { - set see4 1 + -re ". 3 .*\"threadname_3\" \[^\r\n\]*" { + set see3 1 exp_continue } - -re ". 3 .*\"threadname_3.*\" \[\r\n\]*" { - set see3 1 + -re ". 4 .*\"threadname_4\" \[^\r\n\]*" { + set see4 1 exp_continue } - -re ". 2 .*\"threadname_2.*\" \[\r\n\]*" { - set see2 1 + -re ". 5 .*\"threadname_5\" \[^\r\n\]*" { + set see5 1 exp_continue } - -re ". 1 .*\"threadname_1.*\" \[\r\n\]*" { - set see1 1 + -re ". 6 .*\"threadname_6\" \[^\r\n\]*" { + set see6 1 exp_continue } - -re ".*$gdb_prompt $" { + -re "$gdb_prompt $" { if { $see3 && $see4 && $see5 && !$see1 && !$see2 && !$see6 } then { pass "info threads 3-5" } else { @@ -395,27 +395,27 @@ set see5 0 set see6 0 gdb_test_multiple "info threads 3-3" "info threads 3-3" { - -re ". 6 .*\"threadname_6.*\" \[\r\n\]*" { + -re ". 6 .*\"threadname_6\" \[^\r\n\]*" { set see6 1 exp_continue } - -re ". 5 .*\"threadname_5.*\" \[\r\n\]*" { + -re ". 5 .*\"threadname_5\" \[^\r\n\]*" { set see5 1 exp_continue } - -re ". 4 .*\"threadname_4.*\" \[\r\n\]*" { + -re ". 4 .*\"threadname_4\" \[^\r\n\]*" { set see4 1 exp_continue } - -re ". 3 .*\"threadname_3.*\" \[\r\n\]*" { + -re ". 3 .*\"threadname_3\" \[^\r\n\]*" { set see3 1 exp_continue } - -re ". 2 .*\"threadname_2.*\" \[\r\n\]*" { + -re ". 2 .*\"threadname_2\" \[^\r\n\]*" { set see2 1 exp_continue } - -re ". 1 .*\"threadname_1.*\" \[\r\n\]*" { + -re ". 1 .*\"threadname_1\" \[^\r\n\]*" { set see1 1 exp_continue }