From patchwork Wed May 24 16:29:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 69962 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 078953857722 for ; Wed, 24 May 2023 16:29:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 078953857722 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684945780; bh=uT77pRXBzMRbpHSYGfHRLdZ3s91cu9/xi4UzYtydPPo=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=iTNvayhYyYnPq2fQLGK59aRT45L/KEW9bU1DXS6jC5kosRl3PKxWijsE3sYr+YMNA +68PunM/tVLubNvt2O8K1EA6thzThSNiJOT/Xw1bl5nkvnr1OKrTP82FmlN9Op3HAT gyA/y+Es4s7kZVsWnMp9VGxyWtjlGhdrExa1KXfs= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 2166E3858414 for ; Wed, 24 May 2023 16:29:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2166E3858414 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-352-vu4ib5XOOwywtGvQeSKN8Q-1; Wed, 24 May 2023 12:29:13 -0400 X-MC-Unique: vu4ib5XOOwywtGvQeSKN8Q-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3f5fa06debcso7836975e9.0 for ; Wed, 24 May 2023 09:29:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684945752; x=1687537752; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=uT77pRXBzMRbpHSYGfHRLdZ3s91cu9/xi4UzYtydPPo=; b=cMQQE0pHhLUNsurMLAB9r4mfFzmZw8SuNPr3PjV8qle1PPRXtxFwID1JP718+Rjiul rvM/cuCMFuQ6awmcMTkmDMXczQp8kvWFIdrLg7fOWpq8mk4SSBMGsk9SQ26Yo10rasm2 qey2gm8PXYEIiahFlSFMrvEyvtyI3pGcJEzjemY38UTeEUvh4PxnO4ITnLyEaoK9Loee 0tNlEM4tvrtsqGrTbv2CI0kOV2xmn7okzeQNGcaaCW3CxiBbHPs+59D41J4XYMBf1kY0 LGcHYgO/go3EffWUG3IJSITb+lslmHa446YUEoveuto1Zu59oalhJQWykm3kvjwBjvjH w/6Q== X-Gm-Message-State: AC+VfDwiLckt9phQCkbs9c8IlNeCj4pE8Vh52WciLPzWurgAFPTGuqLC ZY316MIOFFaJ0nbSTEuX2PGRlf8LALflMQtx8sQGbOOf07rBDacEMky71kDUjTJ5lZ9UJGQmLwQ 2qR7KFys1zyYdbb/VbMm001FrIBLxm7f6/Z+JX9N54k/QrTRnF5xQa4e+ZeMa5PvbTXrxonGbd7 YgqCCH+Q== X-Received: by 2002:a05:600c:2904:b0:3f6:1526:de7 with SMTP id i4-20020a05600c290400b003f615260de7mr292836wmd.10.1684945752239; Wed, 24 May 2023 09:29:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6DvCtI0eEpsyjz+YANoz3r3gW856dHM66MnGaElieeJEbPY2txKMrsrQ3Ej9NwPfdhS6bxZQ== X-Received: by 2002:a05:600c:2904:b0:3f6:1526:de7 with SMTP id i4-20020a05600c290400b003f615260de7mr292822wmd.10.1684945751903; Wed, 24 May 2023 09:29:11 -0700 (PDT) Received: from localhost (11.72.115.87.dyn.plus.net. [87.115.72.11]) by smtp.gmail.com with ESMTPSA id f18-20020adfdb52000000b00307d20546e6sm15228668wrj.27.2023.05.24.09.29.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 May 2023 09:29:11 -0700 (PDT) To: gdb-patches@sourceware.org Cc: Andrew Burgess , Tom de Vries Subject: [PATCH] gdb/testsuite: fix race in gdb.server/multi-ui-errors.exp Date: Wed, 24 May 2023 17:29:06 +0100 Message-Id: <21d9b41b65c9215cc3fd387e20934ad174e57203.1684945721.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew Burgess via Gdb-patches From: Andrew Burgess Reply-To: Andrew Burgess Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" After this commit: commit ed32754a8c7919feffc6ddb66ff1c532e4a4d1cd Date: Thu Mar 9 10:45:03 2023 +0100 [gdb/testsuite] Fix gdb.server/multi-ui-errors.exp for remote target I noticed the occasional failure in gdb.server/multi-ui-errors.exp, which looked like this: (gdb) PASS: gdb.server/multi-ui-errors.exp: interact with GDB's main UI interrupt (gdb) Program received signal SIGINT, Interrupt. 0x00007ffff7d501e7 in nanosleep () from /lib64/libc.so.6 FAIL: gdb.server/multi-ui-errors.exp: interrupt (timeout) PASS: gdb.server/multi-ui-errors.exp: interrupt arrived p server_pid $1 = 718174 (gdb) PASS: gdb.server/multi-ui-errors.exp: p server_pid This is triggered by this code in gdb.server/multi-ui-errors.exp: gdb_test "interrupt" gdb_test_multiple "" "interrupt arrived" { -re "Program received signal SIGINT, Interrupt\\.\r\n" { pass $gdb_test_name } } The problem here is that the first interrupt will trigger the prompt to be printed, and then, after some time the inferior will be interrupted. However the default pattern for gdb_test includes a '$' end anchor. If expect see the prompt with nothing following it then everything is fine, and the test passes. However, if the interrupt is quick and so what expect sees is this: (gdb) Program received signal SIGINT, Interrupt. 0x00007ffff7d501e7 in nanosleep () from /lib64/libc.so.6 In this case the end anchor means that the gdb_test fails to match, and eventually times out. Fix this by passing -no-prompt-anchor to gdb_test. Reviewed-by: Tom de Vries --- gdb/testsuite/gdb.server/multi-ui-errors.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 389971df23ca74092314dbde1303310a33766ba7 diff --git a/gdb/testsuite/gdb.server/multi-ui-errors.exp b/gdb/testsuite/gdb.server/multi-ui-errors.exp index af83614fe55..47ded35bc86 100644 --- a/gdb/testsuite/gdb.server/multi-ui-errors.exp +++ b/gdb/testsuite/gdb.server/multi-ui-errors.exp @@ -106,7 +106,7 @@ with_spawn_id $gdb_main_spawn_id { # Get the gdbserver PID. set gdbserver_pid 0 with_spawn_id $gdb_main_spawn_id { - gdb_test "interrupt" + gdb_test -no-prompt-anchor "interrupt" gdb_test_multiple "" "interrupt arrived" { -re "Program received signal SIGINT, Interrupt\\.\r\n" {