run retagging with svm so it's a bit faster

Author: timfel

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

@@ -100,14 +100,15 @@ def fun():
     else:
         glob_pattern = os.path.join(os.path.dirname(test.__file__), "test_*.py")
 
-    for testfile in glob.glob(glob_pattern):
+    testfiles = glob.glob(glob_pattern)
+    for idx, testfile in enumerate(testfiles):
         testfile_stem = os.path.splitext(os.path.basename(testfile))[0]
         testmod = "test." + testfile_stem
         cmd = ["/usr/bin/timeout", "-s", "9", "60"] + executable + ["-m"]
         tagfile = os.path.join(TAGS_DIR, testfile_stem + ".txt")
         test_selectors = working_selectors(tagfile)
 
-        print("Testing ", testmod)
+        print("[%d/%d] Testing %s" %(idx, len(testfiles), testmod))
         cmd += ["unittest", "-v"]
         for selector in test_selectors:
             cmd += ["-k", selector]

mx.graalpython/mx_graalpython.py

@@ -188,7 +188,7 @@ def retag_unittests(args):
     """run the cPython stdlib unittests"""
     os.environ["ENABLE_CPYTHON_TAGGED_UNITTESTS"] = "true"
     try:
-        python(["graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py"] + args)
+        python_svm(["graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py"] + args)
     finally:
         del os.environ["ENABLE_CPYTHON_TAGGED_UNITTESTS"]
 
@@ -265,7 +265,7 @@ def python_svm(args):
     mx.run_mx(_SVM_ARGS + ["build"])
     out = mx.OutputCapture()
     mx.run_mx(_SVM_ARGS + ["graalvm-home"], out=mx.TeeOutputCapture(out))
-    svm_image = os.path.join(out.data.strip(), "bin", "graalpython")
+    svm_image = os.path.join(out.data.strip(), "bin", "graalpython").split("\n")[-1].strip()
     mx.log(svm_image)
     mx.run([svm_image] + args)
     return svm_image