2004-10-12 Jeff Johnston <jjohnstn@redhat.com>

        * gdb.threads/schedlock.c: Add comment markers to use to find
        line numbers.
        * gdb.threads/schedlock.exp: Adjust regex to handle the new
        comments.
        * gdb.threads/watchthreads.exp: Use gdb_get_line_number to find
        breakpoint lines.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index be36b0b1e489664942f34d1c3e80d92c03c985da..479c25fea88f9abfa24f96cc56629a978d48e459 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-12  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * gdb.threads/schedlock.c: Add comment markers to use to find
+       line numbers.
+       * gdb.threads/schedlock.exp: Adjust regex to handle the new
+       comments.
+       * gdb.threads/watchthreads.exp: Use gdb_get_line_number to find
+       breakpoint lines.
+
 2004-10-12  Daniel Jacobowitz  <dan@debian.org>
 
        * gdb.dwarf2/dw2-basic.exp: Run on Hurd also.

diff --git a/gdb/testsuite/gdb.threads/watchthreads.c b/gdb/testsuite/gdb.threads/watchthreads.c
new file mode 100644 (file)
index 0000000..e19fe07
--- /dev/null
+++ b/gdb/testsuite/gdb.threads/watchthreads.c
@@ -0,0 +1,66 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2002, 2003, 2004 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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  
+ 
+   This file is copied from schedlock.c.  */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <pthread.h>
+
+void *thread_function(void *arg); /* Pointer to function executed by each thread */
+
+#define NUM 5
+
+unsigned int args[NUM+1];
+
+int main() {
+    int res;
+    pthread_t threads[NUM];
+    void *thread_result;
+    long i;
+
+    for (i = 0; i < NUM; i++)
+      {
+       args[i] = 1; /* Init value.  */
+       res = pthread_create(&threads[i],
+                            NULL,
+                            thread_function,
+                            (void *) i);
+      }
+
+    args[i] = 1;
+    thread_function ((void *) i);
+
+    exit(EXIT_SUCCESS);
+}
+
+void *thread_function(void *arg) {
+    int my_number =  (long) arg;
+    int *myp = (int *) &args[my_number];
+
+    /* Don't run forever.  Run just short of it :)  */
+    while (*myp > 0)
+      {
+       (*myp) ++;  /* Loop increment.  */
+      }
+
+    pthread_exit(NULL);
+}
+

diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb.threads/watchthreads.exp
index d6e89d9382494c6c800fe317139b29763e321442..0bb940f6e317d58d8b4ee5ad551bf08fc1de0378 100644 (file)
--- a/gdb/testsuite/gdb.threads/watchthreads.exp
+++ b/gdb/testsuite/gdb.threads/watchthreads.exp
@@ -31,7 +31,7 @@ if [target_info exists gdb,no_hardware_watchpoints] {
     return 0;
 }
 
-set testfile "schedlock"
+set testfile "watchthreads"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "incdir=${objdir}"]] != "" } {
@@ -60,17 +60,20 @@ set args_1 0
 gdb_test "watch args\[0\]" "Hardware watchpoint 2: args\\\[0\\\]"
 gdb_test "watch args\[1\]" "Hardware watchpoint 3: args\\\[1\\\]"
 
+set init_line [expr [gdb_get_line_number "Init value"]+1]
+set inc_line [gdb_get_line_number "Loop increment"]
+
 # Loop and continue to allow both watchpoints to be triggered.
 for {set i 0} {$i < 30} {incr i} {
   set test_flag 0
   gdb_test_multiple "continue" "threaded watch loop" {
-    -re "Hardware watchpoint 2: args\\\[0\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*schedlock.c:21.*$gdb_prompt $"
+    -re "Hardware watchpoint 2: args\\\[0\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads.c:$init_line.*$gdb_prompt $"
        { set args_0 1; set test_flag 1 }
-    -re "Hardware watchpoint 3: args\\\[1\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*schedlock.c:21.*$gdb_prompt $"
+    -re "Hardware watchpoint 3: args\\\[1\\\].*Old value = 0.*New value = 1.*main \\\(\\\) at .*watchthreads.c:$init_line.*$gdb_prompt $"
        { set args_1 1; set test_flag 1 }
-    -re "Hardware watchpoint 2: args\\\[0\\\].*Old value = $args_0.*New value = [expr $args_0+1].*in thread_function \\\(arg=0x0\\\) at .*schedlock.c:42.*$gdb_prompt $"
+    -re "Hardware watchpoint 2: args\\\[0\\\].*Old value = $args_0.*New value = [expr $args_0+1].*in thread_function \\\(arg=0x0\\\) at .*watchthreads.c:$inc_line.*$gdb_prompt $"
        { set args_0 [expr $args_0+1]; set test_flag 1 }
-    -re "Hardware watchpoint 3: args\\\[1\\\].*Old value = $args_1.*New value = [expr $args_1+1].*in thread_function \\\(arg=0x1\\\) at .*schedlock.c:42.*$gdb_prompt $"
+    -re "Hardware watchpoint 3: args\\\[1\\\].*Old value = $args_1.*New value = [expr $args_1+1].*in thread_function \\\(arg=0x1\\\) at .*watchthreads.c:$inc_line.*$gdb_prompt $"
        { set args_1 [expr $args_1+1]; set test_flag 1 }
   }
   # If we fail above, don't bother continuing loop