From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18529 invoked by alias); 28 Oct 2011 17:36:30 -0000 Received: (qmail 17988 invoked by uid 22791); 28 Oct 2011 17:36:26 -0000 X-SWARE-Spam-Status: No, hits=-6.8 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,SPF_HELO_PASS 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, 28 Oct 2011 17:36:05 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9SHa060030560 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 28 Oct 2011 13:36:00 -0400 Received: from host1.jankratochvil.net (ovpn-116-23.ams2.redhat.com [10.36.116.23]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p9SHZwok022774 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 28 Oct 2011 13:36:00 -0400 Received: from host1.jankratochvil.net (localhost [127.0.0.1]) by host1.jankratochvil.net (8.14.4/8.14.4) with ESMTP id p9SHZvMJ026354; Fri, 28 Oct 2011 19:35:57 +0200 Received: (from jkratoch@localhost) by host1.jankratochvil.net (8.14.4/8.14.4/Submit) id p9SHZu1w026348; Fri, 28 Oct 2011 19:35:56 +0200 Date: Fri, 28 Oct 2011 17:40:00 -0000 From: Jan Kratochvil To: Pedro Alves Cc: gdb-patches@sourceware.org, Kevin Pouget , Tom Tromey Subject: [commit test fixes] [patch] Forbid "run" etc. for use_gdb_stub targets [Re: [patch] gdb.python/py-events.exp: Disable multi-inferior for gdbserver] Message-ID: <20111028173556.GA18885@host1.jankratochvil.net> References: <201110261448.58804.pedro@codesourcery.com> <20111027101700.GA21805@host1.jankratochvil.net> <201110271909.37066.pedro@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201110271909.37066.pedro@codesourcery.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes 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: 2011-10/txt/msg00769.txt.bz2 On Thu, 27 Oct 2011 20:09:36 +0200, Pedro Alves wrote: > > I am not sure what is the correct way to handle gdbserver_start_extended. > > gdb.server/ext-*.exp run gdbserver even in the default native run. They > > either should not run in the default native or they should not run in the > > non-extended gdbserver mode. Currently they run in both modes the same way. > > These tests were written to smoke test gdbserver on native test runs. Therefore shouldn't be the gdb.server/ext-*.exp testfiles skipped if the target board defined use_gdb_stub? (ext-attach.exp already is skipped, for the [is_remote target] reason) I have left it as is as the same duplicate run with different boards does not harm anything. > > --- a/gdb/testsuite/gdb.base/async-shell.exp > > +++ b/gdb/testsuite/gdb.base/async-shell.exp > > @@ -20,6 +20,10 @@ if { ![support_displaced_stepping] } { > > return -1 > > } > > > > +if [is_remote target] { > > + return -1 > > +} > > Shouldn't this be a check for use_gdb_stub instead? (I know > the bug was originally linux native.) Doesn't matter much though. Used now: # The testfile uses "run". The real bug happened only for ![is_remote target]. You are right the test can run everywhere !use_gdb_stub. But with remote.c in use the bug being tested cannot happen (there are no two child processes conflicting for wait(PID) result), so it just gives PASS not testing much. > The test fixes look right to me. IMO, you should put them > in upfront and separately from the new smart detection. Checked in those. Thanks, Jan http://sourceware.org/ml/gdb-cvs/2011-10/msg00208.html --- src/gdb/testsuite/ChangeLog 2011/10/28 14:49:18 1.2913 +++ src/gdb/testsuite/ChangeLog 2011/10/28 17:32:28 1.2914 @@ -1,15 +1,27 @@ +2011-10-28 Jan Kratochvil + + * gdb.base/async-shell.exp: Skip the testfile for use_gdb_stub. + * gdb.base/attach-pie-misread.exp: Likewise. + * gdb.base/break-interp.exp: Likewise. + * gdb.base/default.exp (attach, run "r" abbreviation, run): Skip these + testcases for use_gdb_stub. + * gdb.dwarf2/dw2-restore.exp: Fix the run for use_gdb_stub. + (continue): New testcase. + * gdb.python/py-events.exp: Skip the testfile for use_gdb_stub. + * gdb.threads/attach-into-signal.exp: Likewise. + * gdb.threads/attach-stopped.exp: Likewise. + * gdb.threads/attachstop-mt.exp: Likewise. + 2011-10-28 Paul Koning * gdb.python/lib-types.exp (deep_items): Rename from deepitems. - 2011-10-27 Jan Kratochvil * lib/mi-support.exp (breakpoint_re): Suppress match reporting. (mi_gdb_test): Import globals thread_selected_re and breakpoint_re. Expect them optionally at the regex start. - 2011-10-27 Doug Evans * gdb.python/python.exp: Test source -s. --- src/gdb/testsuite/gdb.base/async-shell.exp 2011/07/18 04:14:21 1.2 +++ src/gdb/testsuite/gdb.base/async-shell.exp 2011/10/28 17:32:29 1.3 @@ -20,6 +20,11 @@ return -1 } +# The testfile uses "run". The real bug happened only for ![is_remote target]. +if [target_info exists use_gdb_stub] { + return 0 +} + if { [prepare_for_testing ${testfile}.exp ${testfile}] } { return -1 } --- src/gdb/testsuite/gdb.base/attach-pie-misread.exp 2011/01/01 15:33:40 1.3 +++ src/gdb/testsuite/gdb.base/attach-pie-misread.exp 2011/10/28 17:32:30 1.4 @@ -14,7 +14,8 @@ # along with this program. If not, see . # This test only works on GNU/Linux. -if { ![isnative] || [is_remote host] || ![istarget *-linux*] || [skip_shlib_tests]} { +if { ![isnative] || [is_remote host] || [target_info exists use_gdb_stub] + || ![istarget *-linux*] || [skip_shlib_tests]} { continue } --- src/gdb/testsuite/gdb.base/break-interp.exp 2011/07/01 19:12:12 1.30 +++ src/gdb/testsuite/gdb.base/break-interp.exp 2011/10/28 17:32:30 1.31 @@ -14,7 +14,8 @@ # along with this program. If not, see . # This test only works on GNU/Linux. -if { ![isnative] || [is_remote host] || ![istarget *-linux*] || [skip_shlib_tests]} { +if { ![isnative] || [is_remote host] || [target_info exists use_gdb_stub] + || ![istarget *-linux*] || [skip_shlib_tests]} { continue } --- src/gdb/testsuite/gdb.base/default.exp 2011/05/20 14:37:20 1.49 +++ src/gdb/testsuite/gdb.base/default.exp 2011/10/28 17:32:30 1.50 @@ -39,23 +39,23 @@ gdb_test "append binary memory" "Missing filename\." gdb_test "append binary value" "Missing filename\." -setup_xfail "mips-idt-*" -gdb_test_multiple "attach" "attach" { - -re "Argument required .(process-id|program) to attach.*$gdb_prompt $"\ - { pass "attach" } - -re "You can't do that when your target is `None'.*$gdb_prompt $"\ - { pass "attach" } - -re "You can't do that without a process to debug.*$gdb_prompt $"\ - { pass "attach" } - -re "Don't know how to attach. Try \"help target\"..*$gdb_prompt $"\ - { pass "attach" } - -re "Kill it. .y or n." { - send_gdb "y\n" - exp_continue +if ![target_info exists use_gdb_stub] { + setup_xfail "mips-idt-*" + gdb_test_multiple "attach" "attach" { + -re "Argument required .(process-id|program) to attach.*$gdb_prompt $"\ + { pass "attach" } + -re "You can't do that when your target is `None'.*$gdb_prompt $"\ + { pass "attach" } + -re "You can't do that without a process to debug.*$gdb_prompt $"\ + { pass "attach" } + -re "Don't know how to attach. Try \"help target\"..*$gdb_prompt $"\ + { pass "attach" } + -re "Kill it. .y or n." { + send_gdb "y\n" + exp_continue + } } -} -if ![target_info exists use_gdb_stub] { gdb_test "break" "No default breakpoint address now." "break" foreach i "b br bre brea" { gdb_test $i "No default breakpoint address now." "break \"$i\" abbreviation" @@ -420,7 +420,9 @@ gdb_test "pwd" "Working directory .*" "pwd" #test run "r" abbreviation -if [istarget "*-*-vxworks*"] then { +if [target_info exists use_gdb_stub] { + # Only extended-remote supports "run". +} elseif [istarget "*-*-vxworks*"] then { gdb_test "set args" ".*" "" gdb_test "r" "Starting program: .* @@ -446,7 +448,9 @@ } #test run -if [istarget "*-*-vxworks*"] then { +if [target_info exists use_gdb_stub] { + # Only extended-remote supports "run". +} elseif [istarget "*-*-vxworks*"] then { gdb_test "set args" ".*" "" gdb_test "run" "Starting program: .* --- src/gdb/testsuite/gdb.dwarf2/dw2-restore.exp 2011/05/13 17:17:22 1.5 +++ src/gdb/testsuite/gdb.dwarf2/dw2-restore.exp 2011/10/28 17:32:30 1.6 @@ -33,5 +33,8 @@ gdb_reinitialize_dir $srcdir/$subdir gdb_load ${binfile} -gdb_test "run" ".*" -gdb_test "where" ".*$hex in foo ().+$hex in _start ().*" +if ![runto foo] { + return 0 +} +gdb_test "continue" "$hex in foo \\(\\)" +gdb_test "where" "#0 +$hex in foo \\(\\)\r\n#1 +$hex in _start \\(\\)" --- src/gdb/testsuite/gdb.python/py-events.exp 2011/10/07 07:38:30 1.5 +++ src/gdb/testsuite/gdb.python/py-events.exp 2011/10/28 17:32:30 1.6 @@ -13,6 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +if [target_info exists use_gdb_stub] { + return 0 +} + if $tracelevel then { strace $tracelevel } --- src/gdb/testsuite/gdb.threads/attach-into-signal.exp 2011/01/01 15:33:50 1.6 +++ src/gdb/testsuite/gdb.threads/attach-into-signal.exp 2011/10/28 17:32:30 1.7 @@ -17,7 +17,8 @@ # This file was created by Jan Kratochvil . # This test only works on Linux -if { ![isnative] || [is_remote host] || ![istarget *-linux*] } { +if { ![isnative] || [is_remote host] || [target_info exists use_gdb_stub] + || ![istarget *-linux*] } { continue } --- src/gdb/testsuite/gdb.threads/attach-stopped.exp 2011/10/14 16:05:05 1.7 +++ src/gdb/testsuite/gdb.threads/attach-stopped.exp 2011/10/28 17:32:30 1.8 @@ -18,7 +18,8 @@ # This file was updated by Jan Kratochvil . # This test only works on Linux -if { ![isnative] || [is_remote host] || ![istarget *-linux*] } { +if { ![isnative] || [is_remote host] || [target_info exists use_gdb_stub] + || ![istarget *-linux*] } { continue } --- src/gdb/testsuite/gdb.threads/attachstop-mt.exp 2011/10/14 16:05:05 1.8 +++ src/gdb/testsuite/gdb.threads/attachstop-mt.exp 2011/10/28 17:32:30 1.9 @@ -17,7 +17,8 @@ # and Jan Kratochvil . # This test only works on Linux -if { ![isnative] || [is_remote host] || ![istarget *-linux*] } { +if { ![isnative] || [is_remote host] || [target_info exists use_gdb_stub] + || ![istarget *-linux*] } { continue }