From patchwork Fri Dec 1 15:41:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 81126 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 3F0F8386186F for ; Fri, 1 Dec 2023 15:41:39 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) by sourceware.org (Postfix) with ESMTPS id 1B57C385E032 for ; Fri, 1 Dec 2023 15:41:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1B57C385E032 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1B57C385E032 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::12e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701445264; cv=none; b=vS6ucYWznciXeLm5TbfviRMvpFJ60nG4VBVdBezAQm5tjMfAzkejEAAeFdeDujgrM13qOLTCCy+0Rz0rdsu7bEtMp2aQDRsFcFhcFxl+qWRK09FZpjkBAZILvuKuc5aWAXtf3t60/EHuEJVfGQd9nkLK0TtvguprVRD6ih4oh94= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701445264; c=relaxed/simple; bh=CSvb6Mbu7or+IsTbdtOI1xeakIwYL9/03CISo/RguIY=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=r4OwNtwPJ4qZGVP8KivabfooV+bl1EZzHtWzw5stpiVdWgixL7LXVfmfF02yHuyGPbP1MO3CktRyGDiV80ls1cI4QJwKawI4uiKymq37VVz4Yzb/aERyGfD8KIS2hEfLeSCAucjd3lCyABW17fnJBcVpTOQaur+lEpU3oTzu1tQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x12e.google.com with SMTP id e9e14a558f8ab-35cb62e3905so7273595ab.3 for ; Fri, 01 Dec 2023 07:41:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1701445262; x=1702050062; darn=sourceware.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=mLGy+z8F3pKUx+O2IjrxHWPXgsv58vyysN5FyXcNdck=; b=VA8or02Mx8yViYRL8OoXkPwQ0rVKdIWeBMMdOXS/F2LMtLWnISLJ38cD7zwYlUxhzq Q4OFMhb3EXkNPfPOXWNiNC5zsT8qMAP6rybGa8JM0a14qaWHxL+RDe+DWTy4ctlgUirB veYLyqxL9sgQT6bRjehrP6dXRWHBZPl4Tz0EVdxI+aVaYnURnZdT/AcusLUzlgN1z4Jf KPPlEVeelYNhR26zMt3KlTo1VI/4GdcA3sasP8FX0Dx4WvKtjgJG340SgYBGJB0Hj4is UYNKdvyPLFNl2b3Pd+GyMuvkbB7Wca1jpMhIMHbWJo7d8a6h6CwMy4PTywnc7DHRuFT0 jTUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701445262; x=1702050062; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mLGy+z8F3pKUx+O2IjrxHWPXgsv58vyysN5FyXcNdck=; b=L62W86JLHy2WWDvZNOASVtK2ZwBYCiPpDQyNAxf9Fu0oPnfWgYqwbXsjiApCJj4HpG Gu5l8vPPBc9otQEWo14nrlx5gmtPEjgT5LcgFEgghO2buwkQWOrTYpa4vOomZR8j9RTS rsKcT21ThY35SaXY9hfTnrmhWbdNe8e+66R0vOqLhjNHxvgmHmGFIPVQq/+F2EuEkBSW VdgGgaY0RsxI74/G8DAK1O+6wGVv5eV1Yrbg2yz35clIYe0u20vgWfqdCBVpLkFlH/lw 0oDrTUuZSlgYMP9BggiIR5jyvJSyKXd81BNCvUGfe1U91B8RIp+/I8OefYp7cf0f1cay KYEw== X-Gm-Message-State: AOJu0YyM3VOvmUiZY2v0xBoBYPAK+/RHbVD4iK2BGQ6dvyqG7COFdcke TJK5ccktAnuW4EJnpuLu/adXIZNJY2mNZv01l0o= X-Google-Smtp-Source: AGHT+IFSiXUKBa4UL9oQMOy7BybgyKBUg3njwZZV28AMFNiz5plBGw8NZizvQu8xDS88onxl0XNXTQ== X-Received: by 2002:a05:6e02:2193:b0:359:6e32:70ae with SMTP id j19-20020a056e02219300b003596e3270aemr31931977ila.4.1701445262247; Fri, 01 Dec 2023 07:41:02 -0800 (PST) Received: from localhost.localdomain (97-122-77-73.hlrn.qwest.net. [97.122.77.73]) by smtp.gmail.com with ESMTPSA id f4-20020a02cac4000000b0046662226e54sm906829jap.168.2023.12.01.07.41.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 07:41:01 -0800 (PST) From: Tom Tromey Date: Fri, 01 Dec 2023 08:41:00 -0700 Subject: [PATCH 4/6] Rename a couple of DAP procs in the testsuite MIME-Version: 1.0 Message-Id: <20231201-dap-cancel-v1-4-872022fc328a@adacore.com> References: <20231201-dap-cancel-v1-0-872022fc328a@adacore.com> In-Reply-To: <20231201-dap-cancel-v1-0-872022fc328a@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, 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.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org This renames a couple of DAP procs in the testsuite, to clarify that they are now exported. The cancellation test will need these. --- gdb/testsuite/lib/dap-support.exp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/lib/dap-support.exp b/gdb/testsuite/lib/dap-support.exp index 82d83d95b9f..b9ac314fee5 100644 --- a/gdb/testsuite/lib/dap-support.exp +++ b/gdb/testsuite/lib/dap-support.exp @@ -111,7 +111,7 @@ proc _dap_send_ton {obj} { # omitted. The sequence number of the request is automatically added, # and this is also the return value. OBJ is assumed to already be in # TON form. -proc _dap_send_request {command {obj {}}} { +proc dap_send_request {command {obj {}}} { # We can construct this directly as a TON object. set result $::dap_seq incr ::dap_seq @@ -186,7 +186,7 @@ proc _dap_read_json {} { # response is seen, this leaves the global "last_ton" set to the TON # for the response. -proc _dap_read_response {cmd num} { +proc dap_read_response {cmd num} { set result {} while 1 { set d [_dap_read_json] @@ -204,11 +204,11 @@ proc _dap_read_response {cmd num} { } } -# A wrapper for _dap_send_request and _dap_read_response. This sends a +# A wrapper for dap_send_request and dap_read_response. This sends a # request to gdb and returns the response as a dict. proc dap_request_and_response {command {obj {}}} { - set seq [_dap_send_request $command $obj] - return [_dap_read_response $command $seq] + set seq [dap_send_request $command $obj] + return [dap_read_response $command $seq] } # Like dap_request_and_response, but also checks that the response