From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 0681F3857C52; Tue, 18 Jan 2022 08:18:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0681F3857C52 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6656] Update check_effective_target_recent_python3 X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: 5e26bf17220926d308d0e3bb82bae6e592d2e485 X-Git-Newrev: 50c3975129c5d97387bbe4976bea1931d3fad0b2 Message-Id: <20220118081842.0681F3857C52@sourceware.org> Date: Tue, 18 Jan 2022 08:18:42 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2022 08:18:42 -0000 https://gcc.gnu.org/g:50c3975129c5d97387bbe4976bea1931d3fad0b2 commit r12-6656-g50c3975129c5d97387bbe4976bea1931d3fad0b2 Author: Martin Liska Date: Tue Jan 18 09:16:26 2022 +0100 Update check_effective_target_recent_python3 Require at least Python 3.6. gcc/testsuite/ChangeLog: * gcc.src/maintainers.exp: Use the new check_effective_target_recent_python3. * lib/target-supports.exp: Check for Python3 version >= 3.6. Diff: --- gcc/testsuite/gcc.src/maintainers.exp | 4 ++-- gcc/testsuite/lib/target-supports.exp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/testsuite/gcc.src/maintainers.exp b/gcc/testsuite/gcc.src/maintainers.exp index 63361dd5e4b..a4b3986be77 100644 --- a/gcc/testsuite/gcc.src/maintainers.exp +++ b/gcc/testsuite/gcc.src/maintainers.exp @@ -24,8 +24,8 @@ proc gcc_src_run_maintainers_verify_sh {} { set contrib $rootdir/contrib set maintainers $rootdir/MAINTAINERS - if { ![check_effective_target_python3] } { - unsupported "$script python3 is missing" + if { ![check_effective_target_recent_python3] } { + unsupported "$script recent python3 is missing" return } diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index fd48475a57c..fbb6c735223 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -11723,10 +11723,10 @@ proc check_effective_target___OPTIMIZE__ {} { } [current_compiler_flags]] } -# Return 1 if python3 is available. +# Return 1 if python3 (>= 3.6) is available. -proc check_effective_target_python3 { } { - set result [remote_exec host "python3 --version"] +proc check_effective_target_recent_python3 { } { + set result [remote_exec host "python3 -c \"import sys; assert sys.version_info >= (3, 6)\""] set status [lindex $result 0] if { $status == 0 } then { return 1;