From 735fe4b60a060472956a77e40ef3eda5d1d8a441 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Tue, 1 Mar 2022 11:48:05 +1300
Subject: [PATCH] Filter out `is_python_*` in PHP tests

These functions are added in a number of testcases but for all
languages not just Python.  It's tedious having to update the
PHP expected function lists for them, so let's just filter them
out.
---
 Examples/test-suite/php/cpp_static_runme.php         | 4 ++--
 Examples/test-suite/php/director_exception_runme.php | 2 +-
 Examples/test-suite/php/exception_order_runme.php    | 2 +-
 Examples/test-suite/php/import_nomodule_runme.php    | 3 ++-
 Examples/test-suite/php/tests.php                    | 2 +-
 Examples/test-suite/php/threads_exception_runme.php  | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Examples/test-suite/php/cpp_static_runme.php b/Examples/test-suite/php/cpp_static_runme.php
index a1fd85c2e..2687333b0 100644
--- a/Examples/test-suite/php/cpp_static_runme.php
+++ b/Examples/test-suite/php/cpp_static_runme.php
@@ -2,8 +2,8 @@
 
 require "tests.php";
 
-// New functions
-check::functions(array('is_python_builtin'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('StaticMemberTest','StaticFunctionTest','cpp_static','StaticBase','StaticDerived'));
 // No new vars
diff --git a/Examples/test-suite/php/director_exception_runme.php b/Examples/test-suite/php/director_exception_runme.php
index e49c12da6..a8f95997f 100644
--- a/Examples/test-suite/php/director_exception_runme.php
+++ b/Examples/test-suite/php/director_exception_runme.php
@@ -3,7 +3,7 @@
 require "tests.php";
 
 // New functions
-check::functions(array('launder','is_python_builtin'));
+check::functions(array('launder'));
 // New classes
 check::classes(array('director_exception','Foo','Exception1','Exception2','Base','Bar','ReturnAllTypes'));
 // No new vars
diff --git a/Examples/test-suite/php/exception_order_runme.php b/Examples/test-suite/php/exception_order_runme.php
index fafa88483..835a83ca3 100644
--- a/Examples/test-suite/php/exception_order_runme.php
+++ b/Examples/test-suite/php/exception_order_runme.php
@@ -1,7 +1,7 @@
 <?php
 require "tests.php";
 
-check::functions(array('is_python_builtin'));
+check::functions(array());
 check::classes(array('A','E1','E2','E3','exception_order','ET_i','ET_d'));
 check::globals(array('efoovar','foovar','cfoovar'));
 
diff --git a/Examples/test-suite/php/import_nomodule_runme.php b/Examples/test-suite/php/import_nomodule_runme.php
index e639c781d..3dda18b0d 100644
--- a/Examples/test-suite/php/import_nomodule_runme.php
+++ b/Examples/test-suite/php/import_nomodule_runme.php
@@ -2,7 +2,8 @@
 
 require "tests.php";
 
-check::functions(array('is_python_builtin'));
+// No new functions
+check::functions(array());
 check::classes(array('import_nomodule'));
 // No new globals
 check::globals(array());
diff --git a/Examples/test-suite/php/tests.php b/Examples/test-suite/php/tests.php
index cec6e581f..aa27ea09b 100644
--- a/Examples/test-suite/php/tests.php
+++ b/Examples/test-suite/php/tests.php
@@ -109,7 +109,7 @@ class check {
       else unset($extra[$func]);
     }
     $extra = array_filter(array_keys($extra),
-			  function ($e) { return !preg_match('/_[gs]et$/', $e); });
+			  function ($e) { return !preg_match('/_[gs]et$|^is_python_/', $e); });
     if ($missing) $message[]=sprintf("Functions missing: %s",join(",",$missing));
     if ($message) return check::fail(join("\n  ",$message));
     if ($extra) $message[]=sprintf("These extra functions are defined: %s",join(",",$extra));
diff --git a/Examples/test-suite/php/threads_exception_runme.php b/Examples/test-suite/php/threads_exception_runme.php
index 21313aead..e9103f018 100644
--- a/Examples/test-suite/php/threads_exception_runme.php
+++ b/Examples/test-suite/php/threads_exception_runme.php
@@ -2,8 +2,8 @@
 
 require "tests.php";
 
-// Check functions
-check::functions(array('is_python_builtin'));
+// No new functions
+check::functions(array());
 // Check classes.
 check::classes(array('Exc','Test','threads_exception'));
 // No new vars