From patchwork Thu Aug 29 14:37:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 34323 Received: (qmail 19721 invoked by alias); 29 Aug 2019 14:38:01 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 19603 invoked by uid 89); 29 Aug 2019 14:38:01 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy=GNATMAKE, states X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 29 Aug 2019 14:38:00 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 0266DADDD; Thu, 29 Aug 2019 14:37:57 +0000 (UTC) Date: Thu, 29 Aug 2019 16:37:56 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Tom Tromey , Philippe Waroquiers Subject: [PATCH][gdb/testsuite] Require gnatmake 8 for gdb.ada/rename_subscript_param.exp Message-ID: <20190829143754.GA18195@delia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes Hi, When running gdb.ada/rename_subscript_param.exp with gnatmake 7.4.1, we get: ... FAIL: gdb.ada/rename_subscript_param.exp: print rename_subscript_param_b \ before changing its value FAIL: gdb.ada/rename_subscript_param.exp: print rename_subscript_param_b \ after changing its value ... The commit last touching the test-case (afcfda091e) states: ... The test still fails with old compilers that do not properly generate debug info for this renaming: ... Fix this by requiring at least gnatmake 8 for the test-case. Tested on x86_64-linux. OK for trunk? Thanks, - Tom [gdb/testsuite] Require gnatmake 8 for gdb.ada/rename_subscript_param.exp gdb/testsuite/ChangeLog: 2019-08-29 Tom de Vries PR teststuite/24599 * gdb.ada/rename_subscript_param.exp: Require gnatmake 8. * lib/ada.exp (gnatmake_version_at_least): New proc. --- gdb/testsuite/gdb.ada/rename_subscript_param.exp | 4 ++++ gdb/testsuite/lib/ada.exp | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/gdb/testsuite/gdb.ada/rename_subscript_param.exp b/gdb/testsuite/gdb.ada/rename_subscript_param.exp index ffcfa50df3..fd8208825a 100644 --- a/gdb/testsuite/gdb.ada/rename_subscript_param.exp +++ b/gdb/testsuite/gdb.ada/rename_subscript_param.exp @@ -15,6 +15,10 @@ load_lib "ada.exp" +if { ![gnatmake_version_at_least 8] } { + return -1 +} + standard_ada_testfile pb30_012 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp index 1345c747c5..95f0f525b1 100644 --- a/gdb/testsuite/lib/ada.exp +++ b/gdb/testsuite/lib/ada.exp @@ -105,3 +105,22 @@ 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 [gdb_find_gnatmake] + set gnatmake [lindex [split $gnatmake] 0] + set output [exec $gnatmake --version] + 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 +}