Rename '_python_svm_unittest' to '_run_python_unittests' and generalize it.

Author: fangerer

mx.graalpython/mx_graalpython.py

@@ -265,6 +265,7 @@ def python3_unittests(args):
 # mx gate --tags pythontest
 # mx gate --tags fulltest
 
+AOT_INCOMPATIBLE_TESTS = ["test_interop.py"]
 
 class GraalPythonTags(object):
     junit = 'python-junit'
@@ -348,20 +349,18 @@ def gate_unittests(args=[], subdir=""):
         mx.run(["python3"] + test_args, nonZeroIsFatal=True)
 
 
-def _python_svm_unittest(svm_image):
-    suite_dir = _suite.dir
-    llvm_home = mx_subst.path_substitutions.substitute('--native.Dllvm.home=<path:SULONG_LIBS>')
-
+def _run_python_unittests(python_binary, args=[], aot_compatible=True, exclude=[]):
     # tests root directory
-    tests_folder = os.path.join(suite_dir, "graalpython", "com.oracle.graal.python.test", "src", "tests")
+    tests_folder = os.path.join(_suite.dir, "graalpython", "com.oracle.graal.python.test", "src", "tests")
 
     # list of excluded tests
-    excluded = ["test_interop.py"]
+    if aot_compatible:
+        exclude += AOT_INCOMPATIBLE_TESTS
 
     def is_included(path):
         if path.endswith(".py"):
             basename = os.path.basename(path)
-            return basename.startswith("test_") and basename not in excluded
+            return basename.startswith("test_") and basename not in exclude
         return False
 
     # list all 1st-level tests and exclude the SVM-incompatible ones
@@ -378,13 +377,9 @@ def is_included(path):
             except OSError:
                 pass
 
-    args = ["--python.CoreHome=%s" % os.path.join(suite_dir, "graalpython", "lib-graalpython"),
-            "--python.StdLibHome=%s" % os.path.join(suite_dir, "graalpython", "lib-python/3"),
-            llvm_home,
-            os.path.join(suite_dir, "graalpython", "com.oracle.graal.python.test", "src", "graalpytest.py"),
-            "-v"]
+    args += [os.path.join(_suite.dir, "graalpython", "com.oracle.graal.python.test", "src", "graalpytest.py"), "-v"]
     args += testfiles
-    return mx.run([svm_image] + args, nonZeroIsFatal=True)
+    return mx.run([python_binary] + args, nonZeroIsFatal=True)
 
 
 def graalpython_gate_runner(args, tasks):
@@ -414,7 +409,11 @@ def graalpython_gate_runner(args, tasks):
             if not os.path.exists(svm_image_name):
                 python_svm(["-h"])
             else:
-                _python_svm_unittest(svm_image_name)
+                llvm_home = mx_subst.path_substitutions.substitute('--native.Dllvm.home=<path:SULONG_LIBS>')
+                args = ["--python.CoreHome=%s" % os.path.join(_suite.dir, "graalpython", "lib-graalpython"),
+                        "--python.StdLibHome=%s" % os.path.join(_suite.dir, "graalpython", "lib-python/3"),
+                        llvm_home]
+                _run_python_unittests(svm_image_name, args)
 
     with Task('GraalPython apptests', tasks, tags=[GraalPythonTags.apptests]) as task:
         if task: