* configure.in (configdirs): Add gdb.threads.

* configure: Regenerated with autoconf.
	* gdb.threads/{config.in, pthreads.c, pthreads.exp}: New.
	* gdb.threads/{Makefile.in, configure.in}: Complete rewrites.
	* gdb.threads/configure: New, generated with autoconf.

gdb/testsuite/ChangeLog

@@ -1,3 +1,11 @@
+Wed Aug  7 11:05:47 1996  Fred Fish  <fnf@cygnus.com>
+
+	* configure.in (configdirs): Add gdb.threads.
+	* configure: Regenerated with autoconf.
+	* gdb.threads/{config.in, pthreads.c, pthreads.exp}: New.
+	* gdb.threads/{Makefile.in, configure.in}: Complete rewrites.
+	* gdb.threads/configure: New, generated with autoconf.
+	
 Tue Aug  6 10:23:04 1996  Tom Tromey  <tromey@rtl.cygnus.com>
 
 	* lib/gdb.exp (gdb_test_exact): Turn \n in pattern into \r\n.

gdb/testsuite/configure.in

@@ -13,7 +13,7 @@ AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 AC_CANONICAL_SYSTEM
 
 # Directories to use in all configurations.
-configdirs="gdb.base gdb.c++ gdb.disasm gdb.chill"
+configdirs="gdb.base gdb.c++ gdb.disasm gdb.chill gdb.threads"
 
 # Directories to use for a configuration which uses stabs.
 stabsdirs="gdb.stabs"

gdb/testsuite/gdb.threads/.Sanitize

@@ -24,7 +24,11 @@ Do-first:
 Things-to-keep:
 
 Makefile.in
+config.in
+configure
 configure.in
+pthreads.c
+pthreads.exp
 step.c
 step.exp
 step2.exp

gdb/testsuite/gdb.threads/config.in

@@ -0,0 +1,4 @@
+/* config.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if you have the <pthread.h> header file.  */
+#undef HAVE_PTHREAD_H

gdb/testsuite/gdb.threads/configure.in

@@ -1,32 +1,18 @@
-# This file is a shell script fragment that supplies the information
-# necessary to tailor a template configure script into the configure
-# script appropriate for this directory.  For more information, check
-# any existing configure script.
+dnl Process this file file with autoconf to produce a configure script.
+dnl This file is a shell script fragment that supplies the information
+dnl necessary to tailor a template configure script into the configure
+dnl script appropriate for this directory.  For more information, check
+dnl any existing configure script.
 
-srctrigger="Makefile.in"
-srcname="gdb.threads"
+AC_PREREQ(2.5)
+AC_INIT(pthreads.exp)
+AC_CONFIG_HEADER(config.h:config.in)
 
-# per-host:
+CC=${CC-cc}
+AC_SUBST(CC)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../..)
+AC_CANONICAL_SYSTEM
 
-# per-target:
+AC_CHECK_HEADERS(pthread.h)
 
-	# everything defaults to unix for a target
-target_abbrev=unix
-target_makefile_frag=../config/mt-unix
-
-	# this section is for all targets
-case "${target}" in
-	hppa*-*-hpux*)	target_makefile_frag=../config/mt-hpux ;;
-	i[345]86-*-aout)	target_makefile_frag=../config/mt-i386-aout ;;
-	*-*-lynx*)	target_makefile_frag=../config/mt-lynx ;;
-	*-*-netware*)	target_makefile_frag=../config/mt-netware ;;
-	*-*-vxworks*)	target_makefile_frag=../config/mt-vxworks ;;
-	m68k-*-*)	target_makefile_frag=../config/mt-m68k ;;
-	i960-*-nindy)	target_makefile_frag=../config/mt-i960-nindy ;;
-	a29k-*-udi)	target_makefile_frag=../config/mt-a29k-udi ;;
-	sparclite-*-*)	target_makefile_frag=../config/mt-slite ;;
-	sparc-*-aout)	target_makefile_frag=../config/mt-sparc-aout ;;
-	mips-*-ecoff)	target_makefile_frag=../config/mt-mips-ecoff ;;
-esac
-
-# post-target:
+AC_OUTPUT(Makefile)

gdb/testsuite/gdb.threads/pthreads.exp

@@ -0,0 +1,263 @@
+# Copyright (C) 1996 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.  */
+
+# Please email any bugs, comments, and/or additions to this file to:
+# bug-gdb@prep.ai.mit.edu
+
+# This file was written by Fred Fish. (fnf@cygnus.com)
+
+if $tracelevel then {
+	strace $tracelevel
+}
+
+set prms_id 0
+set bug_id 0
+
+set testfile "pthreads"
+set srcfile ${testfile}.c
+set binfile ${objdir}/${subdir}/${testfile}
+set ccout [compile "${srcdir}/${subdir}/${srcfile} -I${objdir}/${subdir} -g -o ${binfile} -lpthread"]
+switch -regexp -- $ccout {
+	".*no posix threads support.*" { return 0 }
+	{^$} { pass "successfully compiled posix threads test case" }
+	default { perror "Couldn't compile ${srcfile}" ; return -1 }
+    }
+
+# Now we can proceed with the real testing.
+
+# Start with a fresh gdb.
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+send "set print sevenbit-strings\n" ; expect -re "$prompt $"
+#send "set print address off\n" ; expect -re "$prompt $"
+send "set width 0\n" ; expect -re "$prompt $"
+
+# We'll need this when we send a ^C to GDB.  Need to do it before we
+# run the program and gdb starts saving and restoring tty states.
+# On Ultrix, we don't need it and it is really slow (because shell_escape
+# doesn't use vfork).
+if ![istarget "*-*-ultrix*"] then {
+    send "shell stty intr '^C'\n" ; expect -re "$prompt $"
+}
+
+proc all_threads_running {} {
+    global prompt
+    global srcfile
+
+    # Reset all the counters to zero.
+    send "set var common_routine::hits=0\n" ; expect -re "$prompt $"
+    send "set var common_routine::from_thread1=0\n" ; expect -re "$prompt $"
+    send "set var common_routine::from_thread2=0\n" ; expect -re "$prompt $"
+    send "set var common_routine::from_main=0\n" ; expect -re "$prompt $"
+    send "set var common_routine::full_coverage=0\n" ; expect -re "$prompt $"
+
+    # Disable all breakpoints.
+    send "disable\n" ; expect -re "$prompt $"
+
+    # Set up a breakpoint that will cause us to stop when we have
+    # been called 15 times.  This should be plenty of time to allow
+    # every thread to run at least once, since each thread sleeps for
+    # one second between calls to common_routine.
+    send "tbreak common_routine if hits == 15\n"; expect -re "$prompt $"
+
+    # Start all the threads running again and wait for the inferior
+    # to stop.  Since no other breakpoints are set at this time
+    # we should stop only when we have been previously called 15 times.
+
+    send "continue\n"
+    expect {
+	-re "Continuing.*common_routine.*at.*$srcfile.*$prompt $" {}
+	default {
+	    fail "continue until common routine run 15 times"
+	    return 0
+	}
+	timeout {
+	    fail "continue until common routine run 15 times (timeout)"
+	    return 0
+	}
+    }
+
+    # Check that we stopped when we actually expected to stop, by
+    # verifying that there have been 15 previous hits.
+
+    send "p common_routine::hits\n"
+    expect {
+	-re ".*= 15\r\n$prompt $" {}
+	default {
+	    fail "stopped before calling common_routine 15 times"
+	    return 0
+	}
+	timeout {
+	    fail "stopped before calling common_routine 15 times (timeout)"
+	    return 0
+	}
+    }
+
+    # Also check that all of the threads have run, which will only be true
+    # if the full_coverage variable is set.
+
+    send "p common_routine::full_coverage\n"
+    expect {
+	-re ".*= 1\r\n$prompt $" {}
+	default {
+	    fail "some threads didn't run"
+	    return 0
+	}
+	timeout {
+	    fail "some threads didn't run (timeout)"
+	    return 0
+	}
+    }
+
+    # Looks fine, return success.
+    return 1
+}
+
+proc test_startup {} {
+    global srcdir srcfile prompt expect_out
+    global main_id thread1_id thread2_id
+
+    # We should be able to do an info threads before starting any others.
+    gdb_test "info threads" ".*Thread.*LWP.*main.*"
+
+    # Extract the thread id number of main thread from "info threads" output.
+    send "info threads\n" ; expect -re "(\[0-9\]+)(.*Thread.*main.*)($prompt $)"
+    set main_id $expect_out(1,string)
+
+    # Check that we can continue and create the first thread.
+    gdb_test "break thread1" "Breakpoint .* file .*$srcdir.*"
+    gdb_test "continue" \
+	    "Continuing.*Breakpoint .*, thread1 \\(arg=0xfeedface\\).*at.*$srcfile.*" \
+	    "Continue to creation of first thread"
+    send "disable\n" ; expect -re "$prompt $"
+
+    # Extract the thread id number of thread 1 from "info threads" output.
+    send "info threads\n" ; expect -re "(\[0-9\]+)(.*Thread.*thread1.*)($prompt $)"
+    set thread1_id $expect_out(1,string)
+
+    # Check that we can continue and create the second thread,
+    # ignoring the first thread for the moment.
+    gdb_test "break thread2" "Breakpoint .* file .*$srcdir.*"
+    gdb_test "continue" \
+	    "Continuing.*Breakpoint .*, thread2 \\(arg=0xdeadbeef\\).*at.*$srcfile.*" \
+	    "Continue to creation of second thread"
+
+    # Extract the thread id number of thread 2 from "info threads" output.
+    send "info threads\n" ; expect -re "(\[0-9\]+)(.*Thread.*thread2.*)($prompt $)"
+    set thread2_id $expect_out(1,string)
+}
+
+proc check_control_c {} {
+    global prompt
+
+    # Verify that all threads are running.
+    if [all_threads_running] then {
+	pass "All threads running after startup"
+    }
+
+    # Send a continue followed by ^C to the process to stop it.
+    send "continue\n"
+    set description "Stopped with a ^C"
+    after 1000 [send "\003"]
+    expect {
+	-re "Program received signal SIGINT.*$prompt $" {
+	    pass $description
+	}
+	-re "Quit.*$prompt $" {
+	    pass $description
+	}
+	timeout {
+	    fail "$description (timeout)"
+	}
+    }
+    send "bt\n" ; expect -re "$prompt $"
+
+    # Verify that all threads can be run again after a ^C stop.
+    if [all_threads_running] then {
+	pass "All threads running after continuing from ^C stop"
+    }
+}
+
+proc check_backtraces {} {
+    global prompt main_id thread1_id thread2_id
+
+    # Check that the "thread apply N backtrace" command works
+
+    gdb_test "thread apply $main_id backtrace" \
+	    ".* in main \\(argc=.*, argv=.*\\).*" \
+	    "check backtrace from main thread"
+    gdb_test "thread apply $thread1_id backtrace" \
+	    ".* in thread1 \\(arg=0xfeedface\\).*" \
+	    "check backtrace from thread 1"
+    gdb_test "thread apply $thread2_id backtrace" \
+	    ".* in thread2 \\(arg=0xdeadbeef\\).*" \
+	    "check backtrace from thread 2"
+
+    # Check that we can apply the backtrace command to all
+    # three threads with a single gdb command
+
+    gdb_test "thread apply $main_id $thread1_id $thread2_id bt" \
+	    ".* in main .* in thread1 .* in thread2.*" \
+	    "apply backtrace command to all three threads"
+
+    # Check that we can do thread specific backtraces
+    # This also tests that we can do thread specific breakpoints.
+
+    gdb_test "break common_routine thread $thread2_id" \
+	    "Breakpoint .* at 0x.* file .* line .*" \
+	    "set break at common_routine in thread 2"
+
+    send "continue\n"
+    expect {
+	-re "Breakpoint .* common_routine \\(arg=2\\).*" {
+	    send "backtrace\n"
+	    expect {
+		-re "#0.*common_routine \\(arg=2\\).*#1.*thread2.*" {
+		    pass "backtrace from thread 2 bkpt in common_routine"
+		}
+		default {
+		    fail "backtrace from thread 2 bkpt in common_routine"
+		}
+		timeout {
+		    fail "backtrace from thread 2 bkpt in common_routine (timeout)"
+		}
+	    }
+	}
+	-re "Breakpoint .* common_routine \\(arg=0\\).*" {
+	    fail "stopped in main thread at breakpoint for thread 2"
+	}
+	-re "Breakpoint .* common_routine \\(arg=1\\).*" {
+	    fail "stopped in main thread at breakpoint for thread 1"
+	}
+	default {
+	    fail "continue to bkpt at common_routine in thread 2"
+	}
+	timeout {
+	    fail "continue to bkpt at common_routine in thread 2 (timeout)"
+	}
+	
+    }
+}
+
+if [runto_main] then {
+    test_startup
+    check_control_c
+    check_backtraces
+}