From patchwork Thu Oct 26 17:42:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 23865 Received: (qmail 2414 invoked by alias); 26 Oct 2017 17:42:36 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 2388 invoked by uid 89); 26 Oct 2017 17:42:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 26 Oct 2017 17:42:34 +0000 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8DCF1806C6 for ; Thu, 26 Oct 2017 17:42:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8DCF1806C6 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=palves@redhat.com Received: from cascais.lan (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 188FB7F76E for ; Thu, 26 Oct 2017 17:42:32 +0000 (UTC) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 5/6] Fix racy output matching in gdb.base/multi-attach.exp, gdb.server/ext-{attach, restart, ext-run}.exp Date: Thu, 26 Oct 2017 18:42:26 +0100 Message-Id: <1509039747-15026-6-git-send-email-palves@redhat.com> In-Reply-To: <1509039747-15026-1-git-send-email-palves@redhat.com> References: <1509039747-15026-1-git-send-email-palves@redhat.com> This commit fixes this same problem in several places: (gdb) PASS: gdb.multi/multi-attach.exp: backtrace 2 kill Kill the program being debugged? (y or n) y (gdb) FAIL: gdb.multi/multi-attach.exp: kill inferior 2 (got interactive prompt) This is just another case of the gdb_test_multiple's internal "got interactive prompt" pattern matching because the testcase misses matching enough. gdb/testsuite/ChangeLog: yyyy-mm-dd Pedro Alves * gdb.multi/multi-attach.exp ("kill" test): Match the whole query output. * gdb.server/ext-attach.exp ("kill" test): Likewise. * gdb.server/ext-restart.exp ("kill" test): Likewise. * gdb.server/ext-run.exp ("kill" test): Likewise. * gdb.server/ext-wrapper.exp ("kill" test): Likewise. --- gdb/testsuite/gdb.multi/multi-attach.exp | 4 ++-- gdb/testsuite/gdb.server/ext-attach.exp | 2 +- gdb/testsuite/gdb.server/ext-restart.exp | 2 +- gdb/testsuite/gdb.server/ext-run.exp | 2 +- gdb/testsuite/gdb.server/ext-wrapper.exp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/gdb.multi/multi-attach.exp b/gdb/testsuite/gdb.multi/multi-attach.exp index 4240ff7..9397f85 100644 --- a/gdb/testsuite/gdb.multi/multi-attach.exp +++ b/gdb/testsuite/gdb.multi/multi-attach.exp @@ -51,9 +51,9 @@ gdb_test "attach $testpid2" \ "attach to program 2" gdb_test "backtrace" ".*main.*" "backtrace 2" -gdb_test "kill" "" "kill inferior 2" "Kill the program being debugged.*" "y" +gdb_test "kill" "" "kill inferior 2" "Kill the program being debugged. .y or n. " "y" gdb_test "inferior 1" ".*Switching to inferior 1.*" -gdb_test "kill" "" "kill inferior 1" "Kill the program being debugged.*" "y" +gdb_test "kill" "" "kill inferior 1" "Kill the program being debugged. .y or n. " "y" kill_wait_spawned_process $test_spawn_id1 kill_wait_spawned_process $test_spawn_id2 diff --git a/gdb/testsuite/gdb.server/ext-attach.exp b/gdb/testsuite/gdb.server/ext-attach.exp index f3e992a..881c636 100644 --- a/gdb/testsuite/gdb.server/ext-attach.exp +++ b/gdb/testsuite/gdb.server/ext-attach.exp @@ -68,7 +68,7 @@ gdb_test "attach $testpid" \ "attach to remote program 2" gdb_test "backtrace" ".*main.*" "backtrace 2" -gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y" +gdb_test "kill" "" "kill" "Kill the program being debugged. .y or n. " "y" gdb_test_no_output "monitor exit" kill_wait_spawned_process $test_spawn_id diff --git a/gdb/testsuite/gdb.server/ext-restart.exp b/gdb/testsuite/gdb.server/ext-restart.exp index 44c9b1f..d28ce47 100644 --- a/gdb/testsuite/gdb.server/ext-restart.exp +++ b/gdb/testsuite/gdb.server/ext-restart.exp @@ -60,6 +60,6 @@ with_test_prefix "restart" { } } -gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y" +gdb_test "kill" "" "kill" "Kill the program being debugged. .y or n. " "y" gdb_test_no_output "monitor exit" diff --git a/gdb/testsuite/gdb.server/ext-run.exp b/gdb/testsuite/gdb.server/ext-run.exp index cdb1695..d8b3e92 100644 --- a/gdb/testsuite/gdb.server/ext-run.exp +++ b/gdb/testsuite/gdb.server/ext-run.exp @@ -61,7 +61,7 @@ if { [istarget *-*-linux*] } { } } -gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y" +gdb_test "kill" "" "kill" "Kill the program being debugged. .y or n. " "y" gdb_load $binfile gdb_test "monitor help" "The following monitor commands.*" \ diff --git a/gdb/testsuite/gdb.server/ext-wrapper.exp b/gdb/testsuite/gdb.server/ext-wrapper.exp index 8b1af7b..b195ae7 100644 --- a/gdb/testsuite/gdb.server/ext-wrapper.exp +++ b/gdb/testsuite/gdb.server/ext-wrapper.exp @@ -65,6 +65,6 @@ with_test_prefix "restart" { gdb_test "print d" "\\$${decimal} = ${hex} \"1\".*" } -gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y" +gdb_test "kill" "" "kill" "Kill the program being debugged. .y or n. " "y" gdb_test_no_output "monitor exit"