diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/manythreads.c | 9 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.threads/manythreads.exp | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 34fb073..440fde9 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2006-10-17 Daniel Jacobowitz <dan@codesourcery.com> + + * gdb.threads/manythreads.c (thread_function, main): Don't cast + int to pointer or pointer to int. + * gdb.threads/manythreads.exp: Don't expect the string "LWP". + 2006-10-12 Daniel Jacobowitz <dan@codesourcery.com> * gdb.base/annota1.exp, gdb.base/maint.exp: Use string_to_regexp. diff --git a/gdb/testsuite/gdb.threads/manythreads.c b/gdb/testsuite/gdb.threads/manythreads.c index e39412c..1c23567 100644 --- a/gdb/testsuite/gdb.threads/manythreads.c +++ b/gdb/testsuite/gdb.threads/manythreads.c @@ -1,5 +1,5 @@ /* Manythreads test program. - Copyright 2004 + Copyright 2004, 2006 Free Software Foundation, Inc. Written by Jeff Johnston <jjohnstn@redhat.com> @@ -29,7 +29,7 @@ void * thread_function (void *arg) { - int x = (int)arg; + int x = * (int *) arg; printf ("Thread <%d> executing\n", x); @@ -41,6 +41,7 @@ main (int argc, char **argv) { pthread_attr_t attr; pthread_t threads[256]; + int args[256]; int i, j; pthread_attr_init (&attr); @@ -52,8 +53,8 @@ main (int argc, char **argv) { for (j = 0; j < 256; ++j) { - pthread_create (&threads[j], &attr, thread_function, - (void *)(i * 1000 + j)); + args[j] = i * 1000 + j; + pthread_create (&threads[j], &attr, thread_function, &args[j]); } for (j = 0; j < 256; ++j) diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.threads/manythreads.exp index a2baf84..2a9721d 100644 --- a/gdb/testsuite/gdb.threads/manythreads.exp +++ b/gdb/testsuite/gdb.threads/manythreads.exp @@ -1,5 +1,5 @@ # manythreads.exp -- Expect script to test stopping many threads -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2006 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -81,7 +81,7 @@ gdb_test_multiple "" "stop threads 1" { } } -gdb_test "info threads" ".*1 Thread.*.LWP.*" +gdb_test "info threads" ".*1 Thread .*" set message "second continue" gdb_test_multiple "continue" "second continue" { |