From patchwork Mon Dec 11 16:02:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 81915 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 403A9385C308 for ; Mon, 11 Dec 2023 16:02:52 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by sourceware.org (Postfix) with ESMTPS id D751B3858C2A for ; Mon, 11 Dec 2023 16:02:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D751B3858C2A 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 D751B3858C2A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::133 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702310545; cv=none; b=WXOjYuRWl+A6lL4qpLtaXDQCA1vzUpgRB2I4JyMlpTHT4sqtfBWB/iicH0IBZILnCbhy+92wsuT9AaTfKCH8C13KBUhly5AvDvAJPM/Ms8kJl4QWThBMTTFvrDzjaiRALmP2HmspU9uPNPDyjpkuYtJoWoYRB8+/xBHfBYZSHog= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702310545; c=relaxed/simple; bh=hhU3KL+WvfCWEujAkbOEbySRFzqHm4ghidjg9LnygiU=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=Z8TJfp4PbEne3G4dOmVYIWkMZDLuWvQmrqlQBIGpxMLT7ZUDF9SB/QQX5kkqHpF7SsP6DORXX33qX/jn/YGm07cmG59dEv5freE1T9ymycz+ULFjACJYkIowqfk+w0o8lyZwTbr0qO+HeE//IUXzBovZZJPh1LALNmZNVpXgVTM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x133.google.com with SMTP id e9e14a558f8ab-35d5d54a8eeso11507485ab.1 for ; Mon, 11 Dec 2023 08:02:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1702310543; x=1702915343; darn=sourceware.org; h=cc: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=Erhl31MKHC9yxzJoj/MLLZhbGeH3VycW1sOYw3V6S1o=; b=X4qqok6utgGt4GzYlUguRFJILBCGRoT06hzugcKgaNLcuVrT+K6TDXW7+d3qtkVDYK Dww2VtcQTCNUaprCQH3fi0XJQhYzHk8N+b2DkMdj31noI7CqO5iVcaeZqz5ssH3by5zZ 9gz/A3wUpVRTpBRcud2qqy2hU/kpTHLo2K6A26lpHnn/ErG6XWXcebKWLW3x5fqdj5Xl gRocAhWT/SANJk9NLWAnVXTCp3kkOBsn9lLaHTxiEyIR4xU5zXbqDtEVr+00RYk45i0G gVu991Wg+6/gUS3Wye5AbuZ8uQfTT0mAs4/BrSXuhzrb8x4MQw/Wp8J2qRn4MIXbQZoV wZPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702310543; x=1702915343; h=cc: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=Erhl31MKHC9yxzJoj/MLLZhbGeH3VycW1sOYw3V6S1o=; b=OW9FzeZtZGIPOZXEGaXJ/rc9+/Svy3q28f7aTuq7Jump7onAYdpvIrsHfCsNcONdf7 vmxDH1U4bqkT982daNplx3lSfuKjsG++p98hzIamcIvE0ssH6xGySK3bq3ZMpsYrjJ8Q aIPY6mp+zcFQdfiIBFqPMd0fmji25IDR+WFPhWAaVYaX8Nq41ft2usUT21KLpW+niwvp KxydZPL2idhnZyZwDnbEhq5zWMl/K7C1KDn4PZPhWeQyfbdeEogXjXEfyB5HB7a2PKtY 7oadAiU613gtgzijFRMbQ7OdhRklmrVmAry8Gy58NEXVT7RJN+OAwArDeyymfyp5Birh YJgQ== X-Gm-Message-State: AOJu0YzS8XPVse0R+UEFdoTvXSU9lnGq8NP4n8E18n0XUvJ6psXq44Dm 88yhqGpqwp4/EDopzUl9rEa3i4LD5vmCGkhEcZM= X-Google-Smtp-Source: AGHT+IEjP0+S1Xlcbm1xFw2EfuDMt2ygl9E/XiOyygXMbhY7Oh7AtEfRvt+SNxZDFUdecMSn7Nc5Og== X-Received: by 2002:a05:6e02:1d81:b0:35d:5326:3618 with SMTP id h1-20020a056e021d8100b0035d53263618mr3394736ila.11.1702310543134; Mon, 11 Dec 2023 08:02:23 -0800 (PST) Received: from localhost.localdomain (71-211-161-25.hlrn.qwest.net. [71.211.161.25]) by smtp.gmail.com with ESMTPSA id h25-20020a02cd39000000b0042acf934cbasm1879113jaq.72.2023.12.11.08.02.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 08:02:22 -0800 (PST) From: Tom Tromey Date: Mon, 11 Dec 2023 09:02:21 -0700 Subject: [PATCH v2 4/6] Rename a couple of DAP procs in the testsuite MIME-Version: 1.0 Message-Id: <20231211-dap-cancel-v2-4-db7b52cf0329@adacore.com> References: <20231211-dap-cancel-v2-0-db7b52cf0329@adacore.com> In-Reply-To: <20231211-dap-cancel-v2-0-db7b52cf0329@adacore.com> To: gdb-patches@sourceware.org Cc: =?utf-8?q?K=C3=A9vin_Le_Gouguec?= X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_ABUSEAT, RCVD_IN_DNSWL_NONE, RCVD_IN_XBL, 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. Reviewed-By: Kévin Le Gouguec --- 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