2011-02-17 Michael Snyder <msnyder@vmware.com>

* gdb.threads/thread-find.exp: Fix regular expressions.
This commit is contained in:
Michael Snyder
2011-02-17 22:08:12 +00:00
parent f65d55530c
commit e338d953a9
2 changed files with 54 additions and 50 deletions

View File

@ -1,3 +1,7 @@
2011-02-17 Michael Snyder <msnyder@vmware.com>
* gdb.threads/thread-find.exp: Fix regular expressions.
2011-02-17 Joel Brobecker <brobecker@adacore.com>
* gdb.ada/packed_array: Expand testcase to test printing of

View File

@ -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
exp_continue
}
-re ". 5 .*\"threadname_5.*\" \[\r\n\]*" {
set see5 1
exp_continue
}
-re ". 4 .*\"threadname_4.*\" \[\r\n\]*" {
set see4 1
exp_continue
}
-re ". 3 .*\"threadname_3.*\" \[\r\n\]*" {
set see3 1
exp_continue
}
-re ". 2 .*\"threadname_2.*\" \[\r\n\]*" {
set see2 1
exp_continue
}
-re ". 1 .*\"threadname_1.*\" \[\r\n\]*" {
-re ". 1 \[^\r\n\]*\"threadname_1\" \[^\r\n\]*" {
set see1 1
exp_continue
}
-re ".*$gdb_prompt $" {
-re ". 2 \[^\r\n\]*\"threadname_2\" \[^\r\n\]*" {
set see2 1
exp_continue
}
-re ". 3 \[^\r\n\]*\"threadname_3\" \[^\r\n\]*" {
set see3 1
exp_continue
}
-re ". 4 \[^\r\n\]*\"threadname_4\" \[^\r\n\]*" {
set see4 1
exp_continue
}
-re ". 5 \[^\r\n\]*\"threadname_5\" \[^\r\n\]*" {
set see5 1
exp_continue
}
-re ". 6 \[^\r\n\]*\"threadname_6\" \[^\r\n\]*" {
set see6 1
exp_continue
}
-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
exp_continue
}
-re ". 5 .*\"threadname_5.*\" \[\r\n\]*" {
set see5 1
exp_continue
}
-re ". 4 .*\"threadname_4.*\" \[\r\n\]*" {
set see4 1
exp_continue
}
-re ". 3 .*\"threadname_3.*\" \[\r\n\]*" {
set see3 1
exp_continue
}
-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
}
-re ".*$gdb_prompt $" {
-re ". 2 .*\"threadname_2\" \[^\r\n\]*" {
set see2 1
exp_continue
}
-re ". 3 .*\"threadname_3\" \[^\r\n\]*" {
set see3 1
exp_continue
}
-re ". 4 .*\"threadname_4\" \[^\r\n\]*" {
set see4 1
exp_continue
}
-re ". 5 .*\"threadname_5\" \[^\r\n\]*" {
set see5 1
exp_continue
}
-re ". 6 .*\"threadname_6\" \[^\r\n\]*" {
set see6 1
exp_continue
}
-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
}