From patchwork Thu Jan 9 20:24:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 104435 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 4984C3858C54 for ; Thu, 9 Jan 2025 20:25:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4984C3858C54 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=iSAGB1bo X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by sourceware.org (Postfix) with ESMTPS id 45C223858D34 for ; Thu, 9 Jan 2025 20:24:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 45C223858D34 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 45C223858D34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::135 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736454271; cv=none; b=fbDLXVsHGWNblRCYMxF8eI99IPLjqcqCdmltwnSW2t5OLNjS5ugKvf1A09jp09p4vC+cKiGTjl26HjFswMws8WjK5Lo9Lw+8sEDqa4PILrBz5EIVRECswblnUHQUXRH6sZh45IXPz1lzI3pUok5uCRRy4F3TLImZ84wk8svZoZk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736454271; c=relaxed/simple; bh=rnhvd6dr5+do8lWjKsylNK1X8HLYJBJXWnb+KuxHIoA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=LReBqBXCeiU/q4D1VPJ6RKim1qwCUbDsFUrh2aA1RNfLpS0V6vVpnIlfv8jJU7F3ZnRfjNgu6rNBiXim2zCsxSyZY70KwGymrerrru3uJzcS61e2Nc+w50OYeg0rUmlCT3xuIGwi2Uf2kR5dd6XtVx0NtsjxZ+/08SEuKy9PMk4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 45C223858D34 Received: by mail-il1-x135.google.com with SMTP id e9e14a558f8ab-3a8146a8ddaso3771675ab.1 for ; Thu, 09 Jan 2025 12:24:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1736454270; x=1737059070; 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=cgpCSP3oY+6gQltOp7hLWeijVa6jjVP2hsKDJuqGyJ8=; b=iSAGB1bo0m5EnZjVUGAp4z9Ob09ToQ0W65cFaYzqZHzV1mh+/pa90dgAeHhGTIeHl7 NVBFUjOhGXe6iM2S0cUbpBbYpQXmOAbzkk/UTVf8wtRVYzXuSY9zMrbQKZ13lxbNd52q Brn41yfvbWgLkgkgEf1omnbDAZvy6/cyycT/uHbX4JI6Sj2f7727365EHl4BxzeX/xbe 5xYXjdkoODGB5EEpZSoTNxPC+roMMqRjqH3AcQo6XgHAVno/NMHZ9ZcHNknLGp6D9yyI N9BvUj4kHlosTjGt7rC+nylQXvqSexyJDTv/0fobKmZTu2qOe7p/AL7E5XFejKUKskC4 EoDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736454270; x=1737059070; 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=cgpCSP3oY+6gQltOp7hLWeijVa6jjVP2hsKDJuqGyJ8=; b=AlOWYpYzodULH+c46CJtxgCwDrTI4Nv/Z2p1qu1nm0qk7DqzHx/IRUuDUOHY8kNiq/ IR1VW5S+qQG3/zaZe3xN7lkZJHx2u9mFg9KfmPiVNg+TQJd6Mddy1iDCxCqHws7xlbX7 cWXxU+/OM6b/oE8gyCNU2rJCXYImivjsGP26Z5h/yrBlpjlp1LnlfJhUX3eMKedWldFM zmjAho3BeAkKUULTj/k4y1rslQmAJNOB68GANNvfqbxcfuHz1pzA3yJq+ddNhaHsWTrN ezHkrwm00unqg6GCsawUmjpbpup7/UQ7qyIYNp/CqWwSsn7Ve7DqxvAMaUzPDGgnY/Vb +Aqw== X-Gm-Message-State: AOJu0Yy+kYJ1Q9B7Q0ulCkEIj5+OuzsTNuex9Pe5UXiMiIGfp1uICbRk HL+3nUT8fZ6wyomKkKTJgs+qe586h4bSYKxb79Q19AEbo9CyESXrEi92qAlUQ4q85z+rw0Q8d4M = X-Gm-Gg: ASbGncuS6rpB0Atfc68XjGK1sgkS/WhjEnVtHT3fYJXeGFNiQFAvsSUEkP8YOZ2sE4h +/cZ/k4ZqR94+Rlgm0ra3aSzGh+9vC9WjxnS4q69oRMjiJowsAqxMLvBG01JHdBrPCiEARJC5Nd xPfJ2eN0J1Tl5djBP23sQMHyT3hBMuV9GXeJm9CmW+xGNP9xg3fgqIXgIszzdAXMDuscMSb57CY 7NR1GoQe/g71R3xgfyUjo1rnZCca3WJprx83fIVo+sQDgNiIaXUDZmscX/qBreuxlnRfmHWS3ty A0bcbR6LeNA9V5FXwgsF X-Google-Smtp-Source: AGHT+IEMgrdWBt/EJAmc+zCrLkiQYjhbXLYY5PDePVn9Abnp28+jGCX+n5+zzqe0FUM72VJHOZVVXQ== X-Received: by 2002:a05:6e02:152d:b0:3a7:fe8c:b014 with SMTP id e9e14a558f8ab-3ce3aa763a6mr65279435ab.21.1736454270463; Thu, 09 Jan 2025 12:24:30 -0800 (PST) Received: from localhost.localdomain (97-118-36-154.hlrn.qwest.net. [97.118.36.154]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4ea1b74f57csm489085173.143.2025.01.09.12.24.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2025 12:24:30 -0800 (PST) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Remove gnatmake_version_at_least Date: Thu, 9 Jan 2025 13:24:07 -0700 Message-ID: <20250109202407.4163030-1-tromey@adacore.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.5 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 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 removes gnatmake_version_at_least in favor of using the more flexible gnat_version_compare. I think these two version numbers should be the same, as gnatmake is shipped with the compiler. --- gdb/testsuite/gdb.ada/mi_prot.exp | 2 +- .../gdb.ada/rename_subscript_param.exp | 2 +- gdb/testsuite/gdb.ada/scalar_storage.exp | 2 +- gdb/testsuite/gdb.ada/verylong.exp | 2 +- gdb/testsuite/lib/ada.exp | 21 ------------------- 5 files changed, 4 insertions(+), 25 deletions(-) diff --git a/gdb/testsuite/gdb.ada/mi_prot.exp b/gdb/testsuite/gdb.ada/mi_prot.exp index 5a3ab10b16c..8525c1fcf32 100644 --- a/gdb/testsuite/gdb.ada/mi_prot.exp +++ b/gdb/testsuite/gdb.ada/mi_prot.exp @@ -16,7 +16,7 @@ load_lib "ada.exp" require allow_ada_tests -require {gnatmake_version_at_least 8} +require {gnat_version_compare >= 8} standard_ada_testfile prot diff --git a/gdb/testsuite/gdb.ada/rename_subscript_param.exp b/gdb/testsuite/gdb.ada/rename_subscript_param.exp index bd49b5b02b6..efb29f40f62 100644 --- a/gdb/testsuite/gdb.ada/rename_subscript_param.exp +++ b/gdb/testsuite/gdb.ada/rename_subscript_param.exp @@ -17,7 +17,7 @@ load_lib "ada.exp" require allow_ada_tests -require {gnatmake_version_at_least 8} +require {gnat_version_compare >= 8} standard_ada_testfile pb30_012 diff --git a/gdb/testsuite/gdb.ada/scalar_storage.exp b/gdb/testsuite/gdb.ada/scalar_storage.exp index 5dccaef8f14..f8fc46974b1 100644 --- a/gdb/testsuite/gdb.ada/scalar_storage.exp +++ b/gdb/testsuite/gdb.ada/scalar_storage.exp @@ -36,7 +36,7 @@ if {![runto "storage.adb:$bp_location"]} { gdb_test "print V_LE" "= \\(value => 126, another_value => 12, color => green\\)" # This requires a compiler fix that is in GCC 14. -if { ![gnatmake_version_at_least 14] } { +if { ![gnat_version_compare >= 14] } { setup_kfail "DW_AT_endianity on enum types" *-*-* } gdb_test "print V_BE" "= \\(value => 126, another_value => 12, color => green\\)" diff --git a/gdb/testsuite/gdb.ada/verylong.exp b/gdb/testsuite/gdb.ada/verylong.exp index 4a3e0b9eeb2..c8574f34e9d 100644 --- a/gdb/testsuite/gdb.ada/verylong.exp +++ b/gdb/testsuite/gdb.ada/verylong.exp @@ -16,7 +16,7 @@ load_lib "ada.exp" require allow_ada_tests -require {gnatmake_version_at_least 11} +require {gnat_version_compare >= 11} standard_ada_testfile prog diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp index 05151d3d8f1..83b419ae210 100644 --- a/gdb/testsuite/lib/ada.exp +++ b/gdb/testsuite/lib/ada.exp @@ -167,27 +167,6 @@ proc find_ada_tool {tool} { return $result } -# Return 1 if gnatmake is at least version $MAJOR.x.x - -proc gnatmake_version_at_least { major } { - set gnatmake [find_gnatmake] - set gnatmake [lindex [split $gnatmake] 0] - if {[catch {exec $gnatmake --version} output]} { - return 0 - } - if { [regexp {GNATMAKE ([^ .]+).([^ .]+).([^ .]+)} $output \ - match gnatmake_major gnatmake_minor gnatmake_micro] } { - if { $gnatmake_major >= $major } { - return 1 - } else { - return 0 - } - } - - # Unknown, return 1 - return 1 -} - # Compare the GNAT version against L2 using version_compare. If the # compiler does not appear to be GCC, this will always return false.