don't run the tagged unittests with the default gate on the CI

Author: timfel

ci.jsonnet

@@ -212,6 +212,9 @@
   local testGate = function(type, platform)
     baseGraalGate + {tags:: "python-"+type} + getPlatform(platform) + {name: "python-"+ type +"-"+platform},
 
+  local testGateTime = function(type, platform, timelimit)
+    baseGraalGate + {tags:: "python-"+type} + getPlatform(platform) + {name: "python-"+ type +"-"+platform} + {timelimit: timelimit},
+
   local styleGate = baseGraalGate + eclipseMixin + linuxMixin + {
     tags:: "style,fullbuild,python-license",
     name: "python-style",
@@ -251,7 +254,7 @@
           // cannot run with excluded "GeneratedBy" since that would lead to "command line too long"
           // ['mx', '--jacoco-whitelist-package', 'com.oracle.graal.python', '--jacoco-exclude-annotation', '@GeneratedBy', '--strict-compliance', "--dynamicimports", super.dynamicImports, "--primary", 'gate', '-B=--force-deprecation-as-warning-for-dependencies', '--strict-mode', '--tags', "python-junit", '--jacocout', 'html'],
           // ['mx', '--jacoco-whitelist-package', 'com.oracle.graal.python', '--jacoco-exclude-annotation', '@GeneratedBy', 'sonarqube-upload', "-Dsonar.host.url=$SONAR_HOST_URL", "-Dsonar.projectKey=com.oracle.graalvm.python", "-Dsonar.projectName=GraalVM - Python", '--exclude-generated'],
-          ['mx', '--jacoco-whitelist-package', 'com.oracle.graal.python', '--strict-compliance', "--dynamicimports", super.dynamicImports, "--primary", 'gate', '-B=--force-deprecation-as-warning-for-dependencies', '--strict-mode', '--tags', "python-unittest,python-junit", '--jacocout', 'html'],
+          ['mx', '--jacoco-whitelist-package', 'com.oracle.graal.python', '--strict-compliance', "--dynamicimports", super.dynamicImports, "--primary", 'gate', '-B=--force-deprecation-as-warning-for-dependencies', '--strict-mode', '--tags', "python-unittest,python-tagged-unittest,python-junit", '--jacocout', 'html'],
           ['mx', '--jacoco-whitelist-package', 'com.oracle.graal.python', 'sonarqube-upload', "-Dsonar.host.url=$SONAR_HOST_URL", "-Dsonar.projectKey=com.oracle.graalvm.python", "-Dsonar.projectName=GraalVM - Python", '--exclude-generated'],
       ],
       name: "python-coverage"
@@ -265,6 +268,8 @@
     // unittests
     testGate(type="unittest", platform="linux"),
     testGate(type="unittest", platform="darwin"),
+    testGateTime(type="tagged-unittest", platform="linux", timelimit=TIME_LIMIT["2h"]),
+    testGateTime(type="tagged-unittest", platform="darwin", timelimit=TIME_LIMIT["2h"]),
     testGate(type="svm-unittest", platform="linux"),
     testGate(type="svm-unittest", platform="darwin"),
 

graalpython/com.oracle.graal.python.test/src/tests/test_working_unittests.py renamed to graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py

@@ -44,7 +44,12 @@
 import test
 
 
-TAGS_DIR = os.path.join(os.path.dirname(__file__), "unittest_tags")
+if os.environ.get("ENABLE_CPYTHON_TAGGED_UNITTESTS") == "true" or os.environ.get("CI") is None:
+    # On the CI, I'd like to explicitly enable these, so we can run them in a
+    # separate job easily. But it's not important for local execution
+    TAGS_DIR = os.path.join(os.path.dirname(__file__), "unittest_tags")
+else:
+    TAGS_DIR = "null"
 
 
 def working_selectors(tagfile):

mx.graalpython/mx_graalpython.py

@@ -175,12 +175,19 @@ def python3_unittests(args):
     mx.run(["python3", "graalpython/com.oracle.graal.python.test/src/python_unittests.py", "-v"] + args)
 
 
+def retag_unittests(args):
+    """run the cPython stdlib unittests"""
+    with set_env(ENABLE_CPYTHON_TAGGED_UNITTESTS="true"):
+        python(["graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py"] + args)
+
+
 AOT_INCOMPATIBLE_TESTS = ["test_interop.py"]
 
 class GraalPythonTags(object):
     junit = 'python-junit'
     unittest = 'python-unittest'
     unittest_sandboxed = 'python-unittest-sandboxed'
+    tagged = 'python-tagged-unittest'
     svmunit = 'python-svm-unittest'
     svmunit_sandboxed = 'python-svm-unittest-sandboxed'
     shared_object = 'python-so'
@@ -347,6 +354,11 @@ def graalpython_gate_runner(args, tasks):
         if task:
             run_python_unittests(python_gvm(["sandboxed"]), args=["--llvm.sandboxed"])
 
+    with Task('GraalPython Python tests', tasks, tags=[GraalPythonTags.tagged-unittest]) as task:
+        if task:
+            with set_env(ENABLE_CPYTHON_TAGGED_UNITTESTS="true"):
+                gate_unittests(subdir="test_tagged_unittests.py")
+
     # Unittests on SVM
     with Task('GraalPython tests on SVM', tasks, tags=[GraalPythonTags.svmunit]) as task:
         if task:
@@ -917,6 +929,7 @@ def python_coverage(args):
     'python-svm': [python_svm, ''],
     'python-gvm': [python_gvm, ''],
     'python-unittests': [python3_unittests, ''],
+    'python-retag-unittests': [retag_unittests, ''],
     'nativebuild': [nativebuild, ''],
     'nativeclean': [nativeclean, ''],
     'python-src-import': [import_python_sources, ''],