diff options
| author | Yao Qi <yao@codesourcery.com> | 2012-11-14 05:52:32 +0000 |
|---|---|---|
| committer | Yao Qi <yao@codesourcery.com> | 2012-11-14 05:52:32 +0000 |
| commit | e5d9816410384b2588c9b1972de031228a285444 (patch) | |
| tree | 3442fce0a442c094f1416a699deef346430587f1 /gdb | |
| parent | 2ae28aa91e6ac03b623e098900ea377ba47d9920 (diff) | |
| download | gdb-e5d9816410384b2588c9b1972de031228a285444.zip gdb-e5d9816410384b2588c9b1972de031228a285444.tar.gz gdb-e5d9816410384b2588c9b1972de031228a285444.tar.bz2 | |
gdb/testsuite/
2012-11-14 Yao Qi <yao@codesourcery.com>
* gdb.threads/manythreads.c [DEBUG]: Include "stdio.h".
(thread_function) [DEBUG]: Call 'printf'.
* gdb.threads/manythreads.exp: Pass '-DDEBUG' to compilation
command line if 'DEBUG=1' is passed to test.
Remove a pattern to match inferior's output.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/manythreads.c | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/manythreads.exp | 17 |
3 files changed, 19 insertions, 10 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 289f115..4ef9064 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2012-11-14 Yao Qi <yao@codesourcery.com> + + * gdb.threads/manythreads.c [DEBUG]: Include "stdio.h". + (thread_function) [DEBUG]: Call 'printf'. + * gdb.threads/manythreads.exp: Pass '-DDEBUG' to compilation + command line if 'DEBUG=1' is passed to test. + Remove a pattern to match inferior's output. + 2012-11-13 Giuseppe Montalto <giuseppe.montalto@st.com> * gdb.mi/mi-fill-memory.exp: New test. diff --git a/gdb/testsuite/gdb.threads/manythreads.c b/gdb/testsuite/gdb.threads/manythreads.c index a622d99..8cef148 100644 --- a/gdb/testsuite/gdb.threads/manythreads.c +++ b/gdb/testsuite/gdb.threads/manythreads.c @@ -20,7 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <pthread.h> +#ifdef DEBUG #include <stdio.h> +#endif #include <limits.h> void * @@ -28,7 +30,9 @@ thread_function (void *arg) { int x = * (int *) arg; +#ifdef DEBUG printf ("Thread <%d> executing\n", x); +#endif /* DEBUG */ return NULL; } diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp index c863ee1..b06a34a 100644 --- a/gdb/testsuite/gdb.threads/manythreads.exp +++ b/gdb/testsuite/gdb.threads/manythreads.exp @@ -19,7 +19,13 @@ standard_testfile -if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable debug] != "" } { +set opts { debug } +if [info exists DEBUG] { + # make check RUNTESTFLAGS='gdb.threads/manythreads.exp DEBUG=1' + lappend opts "additional_flags=-DDEBUG" +} + +if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable $opts] != "" } { return -1 } @@ -59,9 +65,6 @@ gdb_test_multiple "" "stop threads 1" { -re "\\\[\[^\]\]* exited\\\]\r\n" { exp_continue } - -re "Thread \[^\n\]* executing\r\n" { - exp_continue - } -re "Program received signal SIGINT.*$gdb_prompt $" { pass "$message" } @@ -113,9 +116,6 @@ remote_expect host 1 { -re "\\\[\[^\]\]* exited\\\]\r\n" { exp_continue -continue_timer } - -re "Thread \[^\n\]* executing\r\n" { - exp_continue -continue_timer - } -re "Program received signal SIGINT.*$gdb_prompt $" { if { $failed == 0 } { fail "check for duplicate SIGINT" @@ -141,9 +141,6 @@ gdb_test_multiple "" "stop threads 2" { -re "\\\[\[^\]\]* exited\\\]\r\n" { exp_continue } - -re "Thread \[^\n\]* executing\r\n" { - exp_continue - } -re "Program received signal SIGINT.*$gdb_prompt $" { pass "$message" } |