From patchwork Wed Nov 15 15:01:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 79954 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 248B33858C36 for ; Wed, 15 Nov 2023 15:01:38 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by sourceware.org (Postfix) with ESMTPS id 0EE603858D32 for ; Wed, 15 Nov 2023 15:01:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0EE603858D32 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 0EE603858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d34 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700060486; cv=none; b=OL+wVkBYnWe5vS2cCmhH8VmN8P546OsPn323Euben6V8jTxmP8CPM2/rZFr4dVcU575HSqjlWkSl/6e1XwPY4GzPJ2NEO1s3fP2lZfvPYF+3p3M8QdOy2Nw2SzKGQJLPnbjFl1CcfW15d/qxGmME0swnjru+26vmwyUo8bNX9Bc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700060486; c=relaxed/simple; bh=Rp0uP2NXl5o/660Px7Rxr4SF61qvbpS6W13YYJnrXks=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=hVjtfxHe9ZDCNV6RJMJztWwGyEMHmJQyKdUO0FcFW/3krpL/XthRlHj3A3K7oBtVo0NvgJFelUZa65O9o82YF9DS6Ar3mUxCbW0ZKa6mx4MQklMGz6YjGnTtEPamUxDnHlyM60uURgKO7s67vWNHxVV7KEokCB+V9Cm2IVxyrUk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-7a67f447bf0so271805839f.2 for ; Wed, 15 Nov 2023 07:01:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1700060484; x=1700665284; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UJFWd8PRt0AuXqIaamGsoVM0E0aX4MS7w0o5WC+dQVk=; b=L5iCTvbYcPm9GiPEOzn6s3WwB9XeVf8VQ94rEvSFhDqIjZPACYYbCcqRifPs8wakqb V/MQzOlCSEuRCPFUFawCSsXyGK6hEYu9Pxy+Xm7GBX/GRftKeltfSbYHjHP4BxgeQ/mo syIYci4Ttn0LTlyz7Q1b2fqMT4Rk9NL4hjWiIJ1f1LBcKyfZNWJ7JUMah1KL7qGAf2+c WtbD7vJTEr0s/A9P06Uqtbq7v925Xo1PfZ0Pcer5sYOyX5XRTM3ouCRTvlG5CsST9S1s JC7ZAUVxRx30vPK+NTR9sH/IFBzGi8Jg0iw9VHpV5jdGxAzhoXo+jkKRlAnFBJqj7jFR oCPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700060484; x=1700665284; 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=UJFWd8PRt0AuXqIaamGsoVM0E0aX4MS7w0o5WC+dQVk=; b=QiQqgduL2KJu7yxNke0tF9MTSq7cSQvOA+8lVZsezTMpnJ3CQAst7UAUolobDKlujS Pi7aipZPXZADTcsjly4WHH6QfqbjjKGkaoOkr1xz9/tcCLo8WgKx4tPUJRIH8mqhFDGj BygUq9tWUCGc+VHhifsX3TKPQpPJzsHOJqv4t/YgKDW7e8tpnAvC+SdFG0wQDGTo5q7p BApKo/Og0EUUMsdbbg75D0dJ4GIXXzK5sIAI0a7SH8nlBXwP9guZt1FpJ+P+skxbJi9e /EBVaWzgf2aAs2u0lZf+nHsLdq07lRcUteKDuiyb5dFhryyR2qfWpW6MmksNi5MOZRP8 UVTw== X-Gm-Message-State: AOJu0YwSuZ7MLxZDQlisWb6wAlF2OiLDLkb/7DwU1Bi/lFeo1kvTFAiN 30xujaBfBX1wSh2B0j1P/EYSAvJQ0tqU3sP95gbWqA== X-Google-Smtp-Source: AGHT+IHMJ6pnnPvDQ8l5C9+ogzSRM0v/cTQn1tgfrnsS4k9Pr50gPQzYmncMPFz95q6uaqPVrXQUWQ== X-Received: by 2002:a05:6602:4149:b0:783:4f8d:4484 with SMTP id bv9-20020a056602414900b007834f8d4484mr16216620iob.2.1700060484283; Wed, 15 Nov 2023 07:01:24 -0800 (PST) Received: from localhost.localdomain (97-122-77-73.hlrn.qwest.net. [97.122.77.73]) by smtp.gmail.com with ESMTPSA id z11-20020a6b0a0b000000b007926ee42341sm594193ioi.50.2023.11.15.07.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 07:01:23 -0800 (PST) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2] Minor cleanups in ada-nested.exp Date: Wed, 15 Nov 2023 08:01:13 -0700 Message-ID: <20231115150113.3751955-1-tromey@adacore.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 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 ada-nested.exp to fix a test name (the test expects three variables but is named "two"), and to iterate over all the variables that are found. It also adds a workaround to a problem Tom de Vries found with an older version of GNAT -- it emits a duplicate "x". --- gdb/testsuite/gdb.dap/ada-nested.exp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.dap/ada-nested.exp b/gdb/testsuite/gdb.dap/ada-nested.exp index 1a02f4f352e..1f425a73667 100644 --- a/gdb/testsuite/gdb.dap/ada-nested.exp +++ b/gdb/testsuite/gdb.dap/ada-nested.exp @@ -60,13 +60,15 @@ lassign $scopes args locals _ignore gdb_assert {[dict get $args name] == "Arguments"} "argument scope" gdb_assert {[dict get $locals name] == "Locals"} "local scope" -gdb_assert {[dict get $locals namedVariables] == 3} "two locals" +set num_vars [dict get $locals namedVariables] +# Some versions of GNAT emit an extra 'x' in scope. +gdb_assert {$num_vars == 3 || $num_vars == 4} "correct number of locals" set num [dict get $locals variablesReference] set refs [lindex [dap_check_request_and_response "fetch variables" \ "variables" \ - [format {o variablesReference [i %d] count [i 3]} \ - $num]] \ + [format {o variablesReference [i %d] count [i %d]} \ + $num $num_vars]] \ 0] foreach var [dict get $refs body variables] { @@ -76,7 +78,9 @@ foreach var [dict get $refs body variables] { "i" { gdb_assert {[dict get $var value] == "1"} "check value of i" } - "x" { + "x" - "x #2" { + # Some versions of GNAT erroneously emit a duplicate 'x'. + # Work around it here. gdb_assert {[dict get $var value] == "12"} "check value of x" } "outer_arg" {