From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12143 invoked by alias); 17 Feb 2012 19:37:06 -0000 Received: (qmail 12135 invoked by uid 22791); 17 Feb 2012 19:37:05 -0000 X-SWARE-Spam-Status: No, hits=-6.8 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,TW_BJ,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 17 Feb 2012 19:36:50 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1HJanKn030388 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 17 Feb 2012 14:36:49 -0500 Received: from hit-nxdomain.opendns.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q1HJamlY014137; Fri, 17 Feb 2012 14:36:49 -0500 Subject: [PATCH 1/2] gdb.threads/attach-into-signal.exp: cleanup To: gdb-patches@sourceware.org From: Pedro Alves Cc: jan.kratochvil@redhat.com Date: Fri, 17 Feb 2012 19:38:00 -0000 Message-ID: <20120217193648.10029.26589.stgit@hit-nxdomain.opendns.com> In-Reply-To: <20120217193546.10029.74207.stgit@hit-nxdomain.opendns.com> References: <20120217193546.10029.74207.stgit@hit-nxdomain.opendns.com> User-Agent: StGit/0.15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-02/txt/msg00375.txt.bz2 This patch does a bit of general cleanup to gdb.threads/attach-into-signal.exp file. - build different executable files for the non-threaded and threaded cases. This was my motivation. I wanted to test the non-threaded case manually, but the threaded variant always clobbered the non-threaded executable. - unique-fy test messages (gdb.sum output) - Use build_executable/clean_restart. 2012-02-17 Pedro Alves General cleanup, make output test messages unique, and build different executable files for the non-threaded and threaded cases. * gdb.threads/attach-into-signal.exp (binfile, escapedbinfile): Delete. (executable_nothr, executable_thr): New globals. (top level): Adjust to delete both executables. (corefunc): New parameter $executable. Set $pf_prefix instead of hand writing a prefix in tests. Issue a clean_restart and enable lin-lwp debug output here. (top level): Adjust. Use build_executable. Don't start gdb here, and don't enable lin-lwp debug output here. * gdb.threads/Makefile.in (EXECUTABLES): Adjust. --- gdb/testsuite/gdb.threads/Makefile.in | 3 + gdb/testsuite/gdb.threads/attach-into-signal.exp | 50 +++++++++++----------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/gdb/testsuite/gdb.threads/Makefile.in b/gdb/testsuite/gdb.threads/Makefile.in index 954d547..79e4c4c 100644 --- a/gdb/testsuite/gdb.threads/Makefile.in +++ b/gdb/testsuite/gdb.threads/Makefile.in @@ -1,7 +1,8 @@ VPATH = @srcdir@ srcdir = @srcdir@ -EXECUTABLES = attach-into-signal attach-stopped attachstop-mt \ +EXECUTABLES = attach-into-signal-nothr attach-into-signal-thr \ + attach-stopped attachstop-mt \ bp_in_thread current-lwp-dead execl execl1 fork-child-threads \ fork-thread-pending gcore-pthreads hand-call-in-threads \ ia64-sigill interrupted-hand-call killed linux-dp \ diff --git a/gdb/testsuite/gdb.threads/attach-into-signal.exp b/gdb/testsuite/gdb.threads/attach-into-signal.exp index db88222..bf4b8a0 100644 --- a/gdb/testsuite/gdb.threads/attach-into-signal.exp +++ b/gdb/testsuite/gdb.threads/attach-into-signal.exp @@ -24,23 +24,36 @@ if { ![isnative] || [is_remote host] || [target_info exists use_gdb_stub] set testfile "attach-into-signal" set srcfile ${testfile}.c -set binfile ${objdir}/${subdir}/${testfile} -set escapedbinfile [string_to_regexp ${objdir}/${subdir}/${testfile}] +set executable_nothr ${testfile}-nothr +set executable_thr ${testfile}-thr -remote_exec build "rm -f ${binfile}" +remote_exec build "rm -f ${objdir}/${subdir}/${executable_nothr}" +remote_exec build "rm -f ${objdir}/${subdir}/${executable_thr}" # For debugging this test # #log_user 1 -proc corefunc { threadtype } { +proc corefunc { threadtype executable } { global srcfile global binfile global escapedbinfile global srcdir + global objdir global subdir global gdb_prompt + global pf_prefix + + set save_pf_prefix $pf_prefix + lappend pf_prefix "$threadtype:" + + clean_restart ${executable} + gdb_test_no_output "set debug lin-lwp 1" "" + + set binfile ${objdir}/${subdir}/${executable} + set escapedbinfile [string_to_regexp ${objdir}/${subdir}/${executable}] if [get_compiler_info ${binfile}] { + set pf_prefix $save_pf_prefix return -1 } @@ -79,12 +92,12 @@ proc corefunc { threadtype } { } if { $stoppedtry >= 10 } { verbose -log $line2 - set test "$threadtype: process is still running on the attempt # $attempt of $attempts" + set test "process is still running on the attempt # $attempt of $attempts" break } # Main test: - set test "$threadtype: attach (pass $passes), pending signal catch" + set test "attach (pass $passes), pending signal catch" if {[gdb_test_multiple "attach $testpid" $test { -re "Attaching to program.*`?$escapedbinfile'?, process $testpid.*Received Alarm clock.*$gdb_prompt $" { # nonthreaded: @@ -136,35 +149,24 @@ proc corefunc { threadtype } { remote_exec build "kill -s CONT ${testpid}" remote_exec build "kill -9 ${testpid}" -} -# Start with clean gdb -gdb_exit + set pf_prefix $save_pf_prefix +} # build the test case first without threads # -if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested "attach-into-signal.exp (unthreaded)" +if {[build_executable $testfile $executable_nothr $srcfile] == -1} { + untested "attach-into-signal.exp (nonthreaded)" return -1 } -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} -gdb_test_no_output "set debug lin-lwp 1" "" - -corefunc nonthreaded +corefunc nonthreaded ${executable_nothr} # build the test case also with threads # -if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DUSE_THREADS}] != "" } { +if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${objdir}/${subdir}/${executable_thr}" executable {debug additional_flags=-DUSE_THREADS}] != "" } { untested "attach-into-signal.exp (threaded)" return -1 } -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} -gdb_test_no_output "set debug lin-lwp 1" "" - -corefunc threaded +corefunc threaded ${executable_thr}