[GR-23080] Do not pollute source tree with generated test artifacts.

PullRequest: graalpython/1128

Author: fangerer

.gitignore

@@ -52,31 +52,12 @@ language
 /org.eclipse.jdt.core.prefs
 Python3.g4.stamp
 *.orig
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/Py*.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/_Py*.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/Test*.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/*.sha256
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/PointerEquality_Primitive.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/buffer.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/dealloc.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/format_specifier_w_star.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/memoryview_member_flags.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/parseargs_H.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/parseargs_I.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/parseargs_K.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/parseargs_O_conv.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/parseargs_O_typecheck.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/parseargs_S.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/parseargs_U.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/parseargs_Y.c
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/parseargs_valist.c
 /*.diff
 /testenv
 ## generated from: pyhocon -i ci.hocon -f json -o ci.json
 /ci.json
 /*.err
 /graalpython/include/*
-/graalpython/com.oracle.graal.python.test/src/tests/cpyext/As_FileDescriptor_Testfile
 /.*.csv*
 /graal_dumps
 *.jfr

docs/contributor/CONTRIBUTING.md

@@ -141,9 +141,7 @@ substituting TEST-PATTERN (and possibly the file glob on the third line) with
 the test you want to run. Note that you can insert `-d` to debug on the Java
 level or use `--inspect` to debug in the Chrome debugger.
 
-    mx [-d] python3 [--inspect] \
-        graalpython/com.oracle.graal.python.test/src/graalpytest.py \
-        graalpython/com.oracle.graal.python.test/src/tests/test_*.py \
+    mx [-d] graalpytest [--inspect] test_*.py \
         -k TEST-PATTERN
 
 To run the JUnit tests, you can use this command:

mx.graalpython/mx_graalpython.py

@@ -478,33 +478,46 @@ def _graalpytest_driver():
 
 
 def _graalpytest_root():
-    return os.path.join(SUITE.dir, "graalpython", "com.oracle.graal.python.test", "src", "tests")
+    return os.path.join(mx.dependency("com.oracle.graal.python.test").get_output_root(), "bin", "tests")
 
 
 def _hpy_test_root():
     return os.path.join(_get_core_home(), "modules", "hpy", "test")
 
 
-def run_python_unittests(python_binary, args=None, paths=None, aot_compatible=True, exclude=None, env=None):
-    args = args or []
-    args = ["--experimental-options=true",
-            "--python.CatchAllExceptions=true"] + args
-    exclude = exclude or []
-    paths = paths or [_graalpytest_root()]
-    if env is None:
-        env = os.environ.copy()
+def graalpytest(args):
+    parser = ArgumentParser(prog='mx graalpytest')
+    parser.add_argument('--python', type=str, action='store', default="", help='Run tests with custom Python binary.')
+    parser.add_argument('-v', "--verbose", action="store_true", help='Verbose output.')
+    parser.add_argument('-k', dest="filter", default=[], help='Test pattern.')
+    parser.add_argument('test', nargs="*", default=[], help='Test file to run (specify absolute or relative; e.g. "/path/to/test_file.py" or "cpyext/test_object.py") ')
+    args, unknown_args = parser.parse_known_args(args)
+
+    # ensure that the test distribution is up-to-date
+    mx.command_function("build")(["--dep", "com.oracle.graal.python.test"])
+
+    testfiles = _list_graalpython_unittests(args.test)
+    # we assume that unknown args are polyglot arguments and just prepend them to the test driver
+    cmd_args = unknown_args + [_graalpytest_driver()]
+    if args.verbose:
+        cmd_args += ["-v"]
+    cmd_args += testfiles
+    if args.filter:
+        cmd_args += ["-k", args.filter]
+    if args.python:
+        return mx.run([args.python] + cmd_args, nonZeroIsFatal=True)
+    else:
+        return do_run_python(cmd_args)
 
-    # list of excluded tests
-    if aot_compatible:
-        exclude += AOT_INCOMPATIBLE_TESTS
 
+def _list_graalpython_unittests(paths=None, exclude=[]):
+    paths = paths or [_graalpytest_root()]
     def is_included(path):
         if path.endswith(".py"):
             basename = os.path.basename(path)
             return basename.startswith("test_") and basename not in exclude
         return False
 
-    # list all 1st-level tests and exclude the SVM-incompatible ones
     testfiles = []
     for path in paths:
         if not os.path.exists(path):
@@ -519,6 +532,26 @@ def is_included(path):
             for testfile in glob.glob(os.path.join(path, "test_*.py")):
                 if is_included(testfile):
                     testfiles.append(testfile)
+    return testfiles
+
+
+def run_python_unittests(python_binary, args=None, paths=None, aot_compatible=True, exclude=None, env=None):
+    # ensure that the test distribution is up-to-date
+    mx.command_function("build")(["--dep", "com.oracle.graal.python.test"])
+
+    args = args or []
+    args = ["--experimental-options=true",
+            "--python.CatchAllExceptions=true"] + args
+    exclude = exclude or []
+    if env is None:
+        env = os.environ.copy()
+
+    # list of excluded tests
+    if aot_compatible:
+        exclude += AOT_INCOMPATIBLE_TESTS
+
+    # list all 1st-level tests and exclude the SVM-incompatible ones
+    testfiles = _list_graalpython_unittests(paths, exclude)
 
     args += [_graalpytest_driver(), "-v"]
 
@@ -1903,6 +1936,7 @@ def import_files(from_dir, to_dir):
     'python-src-import': [import_python_sources, ''],
     'python-coverage': [python_coverage, ''],
     'punittest': [punittest, ''],
+    'graalpytest': [graalpytest, '[-h] [-v] [--python PYTHON] [-k TEST_PATTERN] [TESTS]'],
     'clean': [python_clean, ''],
     'python-update-hpy-import': [update_hpy_import_cmd, '[--no-pull] PATH_TO_HPY'],
 })