From patchwork Wed Jan 24 15:48:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 84682 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 7B5EC385DC04 for ; Wed, 24 Jan 2024 15:49:32 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by sourceware.org (Postfix) with ESMTPS id C06633858D3C for ; Wed, 24 Jan 2024 15:48:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C06633858D3C Authentication-Results: sourceware.org; dmarc=pass (p=quarantine 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 C06633858D3C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706111337; cv=none; b=CoB2cD5BqbeG/mt+/5eDLWqkAr2vIova4nbn23L1GdR6E9FzDYPgzlRVqTI5wK6njcLIFjNEygiqCVHHv1iEZLQEMtMznYsPewAOCn6IXTUFNC/KvafL7nLEEGBb7j/jg+ioxpffQFTR9h/X5hSPQK30MU9KqO+u5vdZH5h3LoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706111337; c=relaxed/simple; bh=yi/VJsNLEv0/SOTUMwbT2PSVby1UYeSJT0JHLGexiPo=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=dtoM8FMqVk0MlNtQbiGzAR3+BihLIfySwrK4IVyiRZBn3ixLx6uHTQi7cCnfmEewL0/lngbAL671JlWZHo/rPm2nXT1aOCKdYPQBeW4nAExr4i09UZnZzYzRL1KvZoJ8aA4em5Yi8NJnffw0EI9VwDjM5h+ohGNFUX5URWkscC8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd2f.google.com with SMTP id ca18e2360f4ac-7bef44df5c6so153398939f.0 for ; Wed, 24 Jan 2024 07:48:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1706111335; x=1706716135; 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=zEeyXsksjMEvNzBMcQ9Hjn6bHz1lp5XA8gHhhsOT9mw=; b=BOYgrEyqutv6TxuLCeVLFE/d8dApq/zkqMZa3E64IiDoVmqf2++rocph11D+7hD8LC tGjJujJmt+QuBy4teu4WLM9+C/AqNim2dthI4ykoRLpSUWXA++kMEUOBcEEt7fM2AS32 MADjI7FXIqciqYJq1wM14JNn+qcvYxA9ttgCcO3g/U7MHpDK8Q59iw+2ytaIV03+ko76 gDivjG4+zcxqEPIaayl0rUQcuF8F6MCXSdoW7Ri4KnV8NoZmGS1QyK0vGVaYejE47zBy 6IRXJANsgJ/iVF60cG/eouE4qt8RRpTTbsiot96kgL4/9rGeZr8WNdIsyRopR6r4ZiGq Pe5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706111335; x=1706716135; 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=zEeyXsksjMEvNzBMcQ9Hjn6bHz1lp5XA8gHhhsOT9mw=; b=G8Kii+pjmPlljBA/awDAfOpqJ59bqtq25dkXspui+lNZK696P/UkiRNdEHEisXssKF EjNbaUvXn58i6h0q5rtmD3lM9wNvVUu0EqbS1QpdQ+7gZnMbRP/R2Otu9ROMcU9TztsT 8Xn7CRkyflfYU0/hlcus0Y75qKUFRNTTXeo0WFUdxDiGLSY0jxMuBRR7FMWD+bfZtPP/ evs8ngzlGC+yXiitGw41II6TgVGfecncrLmtBEiv7q/hkHh2wCpO72GUa2gayrGCrCtF /MZDWfGGb5REgg4ntE/TVzHk/8rFPs+QKhbmSb/IJthZpFc/2EZlZ6+vMGYJIdiygFd1 UEyw== X-Gm-Message-State: AOJu0Yxk/nQwVCgSkGost+PlGXDf2zY+vtNrRzf6tjCXtQOXHFaOHoK3 OL/qMf3oh2WwJ4FuMRmnLFmS2RNIWoINEv1mloT9ic4mp9jhXJOPtFZ9yKRKMgTfH7CDLxcTA2c = X-Google-Smtp-Source: AGHT+IH7qLtAONfIrRnNX9haq6y7+8bDoK95EJSAOpCW+0XEFsb+mPuZqZOzb3dygIsYJUFNWYZUDQ== X-Received: by 2002:a6b:7f4a:0:b0:7bf:47a9:4430 with SMTP id m10-20020a6b7f4a000000b007bf47a94430mr947971ioq.17.1706111334983; Wed, 24 Jan 2024 07:48:54 -0800 (PST) Received: from localhost.localdomain (97-122-68-157.hlrn.qwest.net. [97.122.68.157]) by smtp.gmail.com with ESMTPSA id h5-20020a6b7845000000b007ba783a27c3sm6972526iop.11.2024.01.24.07.48.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 07:48:54 -0800 (PST) From: Tom Tromey Date: Wed, 24 Jan 2024 08:48:53 -0700 Subject: [PATCH 1/3] Export dap_initialize MIME-Version: 1.0 Message-Id: <20240124-dap-launch-fix-v1-1-0d47f87fa9f0@adacore.com> References: <20240124-dap-launch-fix-v1-0-0d47f87fa9f0@adacore.com> In-Reply-To: <20240124-dap-launch-fix-v1-0-0d47f87fa9f0@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.6 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 changes the test suite to export dap_initialize. --- gdb/testsuite/lib/dap-support.exp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/lib/dap-support.exp b/gdb/testsuite/lib/dap-support.exp index 0bb413e4037..07259862b18 100644 --- a/gdb/testsuite/lib/dap-support.exp +++ b/gdb/testsuite/lib/dap-support.exp @@ -238,7 +238,7 @@ proc dap_check_request_and_response {name command {obj {}}} { # desired. Callers not caring about this should probably use # dap_launch. Returns the empty string on failure. NAME is used as # the test name. -proc _dap_initialize {name} { +proc dap_initialize {name} { if {[dap_gdb_start]} { return "" } @@ -266,7 +266,7 @@ proc _dap_initialize {name} { # After this proc is called, gdb will be ready to accept breakpoint # requests. proc dap_launch {file {args {}}} { - if {[_dap_initialize "startup - initialize"] == ""} { + if {[dap_initialize "startup - initialize"] == ""} { return "" } set params "o program" @@ -315,7 +315,7 @@ proc dap_launch {file {args {}}} { # specifying PID as the inferior process ID. Returns the empty string # on failure, or the response object from the attach request. proc dap_attach {pid {prog ""}} { - if {[_dap_initialize "startup - initialize"] == ""} { + if {[dap_initialize "startup - initialize"] == ""} { return "" } @@ -331,7 +331,7 @@ proc dap_attach {pid {prog ""}} { # specifying TARGET as the remote target. Returns the empty string on # failure, or the response object from the attach request. proc dap_target_remote {target} { - if {[_dap_initialize "startup - initialize"] == ""} { + if {[dap_initialize "startup - initialize"] == ""} { return "" } return [dap_check_request_and_response "startup - target" attach \