simplify unittest running

Author: timfel

docs/contributor/CONTRIBUTING.md

@@ -167,16 +167,11 @@ implementation isn't quite ready, so you have to put the flags somewhere else to
 debug. You can see `-debug-java` and `--inspect` below, to debug in Java
 debugger or Chromium, respectively.
 
-    ENABLE_CPYTHON_TAGGED_UNITTESTS=true mx python3 \
-        graalpython/com.oracle.graal.python.test/src/graalpytest.py \
-        [-debug-java] [--inspect] \
-        graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py \
-        -k NAME-OF-CPYTHON-UNITTEST
+    mx python-run-cpython-unittest [-debug-java] [--inspect] NAME-OF-CPYTHON-UNITTEST
 
 A tag file can be regenerated with
 
-    mx python graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py \
-        --retag NAME-OF-CPYTHON-UNITTEST
+    mx python-retag-unittests NAME-OF-CPYTHON-UNITTEST
 
 There's also multiple other gates that may fail with changes. One of these is
 our *style* gate, which checks formatting rules and copyrights. To auto-fix most

mx.graalpython/mx_graalpython.py

@@ -222,10 +222,33 @@ def compare_unittests(args):
     mx.run([sys.executable, "graalpython/com.oracle.graal.python.test/src/compare_unittests.py", "-v"] + args)
 
 
+def run_cpython_test(args):
+    import glob
+    interp_args = []
+    globs = []
+    test_args = []
+    for arg in args:
+        if arg.startswith("-"):
+            if not globs:
+                interp_args.append(arg)
+            else:
+                test_args.append(arg)
+        else:
+            globs.append(arg)
+    testfiles = []
+    for g in globs:
+        testfiles += glob.glob(os.path.join(SUITE.dir, "graalpython/lib-python/3/test", f"{g}*"))
+    mx.run([python_gvm()] + interp_args + [
+        os.path.join(SUITE.dir, "graalpython/com.oracle.graal.python.test/src/tests/run_cpython_test.py"),
+    ] + test_args + testfiles)
+
+
 def retag_unittests(args):
     """run the cPython stdlib unittests"""
     parser = ArgumentParser('mx python-retag-unittests')
     parser.add_argument('--upload-results-to')
+    parser.add_argument('--inspect', action='store_true')
+    parser.add_argument('-debug-java', action='store_true')
     parsed_args, remaining_args = parser.parse_known_args(args)
     env = os.environ.copy()
     env.update(
@@ -235,9 +258,14 @@ def retag_unittests(args):
     args = [
         '--experimental-options=true',
         '--python.CatchAllExceptions=true',
-        '--python.WithThread=true',
+        '--python.WithThread=true']
+    if parsed_args.inspect:
+        args.append('--inspect')
+    if parsed_args.debug_java:
+        args.append('-debug-java')
+    args += [
         'graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py',
-        '--retag',
+        '--retag'
     ]
     mx.run([python_gvm()] + args + remaining_args, env=env)
     if parsed_args.upload_results_to:
@@ -1757,6 +1785,7 @@ def python_clean(args):
     'python-unittests': [python3_unittests, ''],
     'python-compare-unittests': [compare_unittests, ''],
     'python-retag-unittests': [retag_unittests, ''],
+    'python-run-cpython-unittest': [run_cpython_test, 'test-name'],
     'python-update-unittest-tags': [update_unittest_tags, ''],
     'python-import-for-graal': [checkout_find_version_for_graalvm, ''],
     'nativebuild': [nativebuild, ''],