From e8feb059ca2b3fb50a1ccec01a49f119ec223084 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 18 Jan 2022 10:31:15 +0100 Subject: [PATCH] Add check_effective_target_python3_module. gcc/testsuite/ChangeLog: * gcc.src/maintainers.exp: Use check_effective_target_python3_module for checking of unicode module. * lib/target-supports.exp: Add check_effective_target_python3_module. --- gcc/testsuite/gcc.src/maintainers.exp | 6 ++++++ gcc/testsuite/lib/target-supports.exp | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/gcc/testsuite/gcc.src/maintainers.exp b/gcc/testsuite/gcc.src/maintainers.exp index a4b3986..045f7ec 100644 --- a/gcc/testsuite/gcc.src/maintainers.exp +++ b/gcc/testsuite/gcc.src/maintainers.exp @@ -29,6 +29,12 @@ proc gcc_src_run_maintainers_verify_sh {} { return } + if { ![check_effective_target_python3_module "unidecode"] } { + unsupported "$script 'unidecode' python3 module is missing" + return + } + + set result [remote_exec host $contrib/$script $maintainers] set status [lindex $result 0] if { $status == 0 } then { diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index fbb6c73..cffcdb5 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -11735,6 +11735,18 @@ proc check_effective_target_recent_python3 { } { } } +# Return 1 if python3 contains a module + +proc check_effective_target_python3_module { module } { + set result [remote_exec host "python3 -c \"import $module\""] + set status [lindex $result 0] + if { $status == 0 } then { + return 1; + } else { + return 0; + } +} + # Return 1 if pytest module is available for python3. proc check_effective_target_pytest3 { } { -- 2.7.4