Start using check-MAINTAINERS.py instead of legacy maintainers-verify.sh.

contrib/ChangeLog:

	* maintainers-verify.sh: Removed.

gcc/testsuite/ChangeLog:

	* gcc.src/maintainers.exp: Start using check-MAINTAINERS.py.
	* lib/target-supports.exp: Add check_effective_target_python3.

2 files changed, 23 insertions, 7 deletions

diff --git a/gcc/testsuite/gcc.src/maintainers.exp b/gcc/testsuite/gcc.src/maintainers.exp
index 9ce84f7..63361dd 100644
--- a/gcc/testsuite/gcc.src/maintainers.exp
+++ b/gcc/testsuite/gcc.src/maintainers.exp
@@ -14,22 +14,27 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
-load_lib "gcc-defs.exp"
+load_lib "target-supports.exp"
 
 proc gcc_src_run_maintainers_verify_sh {} {
-    set script maintainers-verify.sh
+    set script check-MAINTAINERS.py
 
     global srcdir
     set rootdir $srcdir/../..
     set contrib $rootdir/contrib
-
     set maintainers $rootdir/MAINTAINERS
 
-    set verify_output [exec $contrib/$script $maintainers]
-    if { "$verify_output"  == "" } {
+    if { ![check_effective_target_python3] } {
+      unsupported "$script python3 is missing"
+      return
+    }
+
+    set result [remote_exec host $contrib/$script $maintainers]
+    set status [lindex $result 0]
+    if { $status == 0 } then {
 	pass "$script"
     } else {
-	send_log "$verify_output\n"
+	send_log "$result\n"
 	fail "$script"
     }
 }
@@ -40,4 +45,3 @@ if ![gcc_parallel_test_run_p maintainers] {
 gcc_parallel_test_enable 0
 gcc_src_run_maintainers_verify_sh
 gcc_parallel_test_enable 1
-
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index c1ad97c..12c5ca5d 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -11722,3 +11722,15 @@ proc check_effective_target___OPTIMIZE__ {} {
 	#endif
     } [current_compiler_flags]]
 }
+
+# Return 1 if python3 is available.
+
+proc check_effective_target_python3 { } {
+    set result [remote_exec host "python3 --version"]
+    set status [lindex $result 0]
+    if { $status == 0 } then {
+        return 1;
+    } else {
+        return 0;
+    }
+}