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

@@ -285,7 +285,7 @@ def _python_graalvm_launcher(args):
     mx.run_mx(dy + ["build"])
     out = mx.OutputCapture()
     mx.run_mx(dy + ["graalvm-home"], out=mx.TeeOutputCapture(out))
-    launcher = os.path.join(out.data.strip(), "bin", "graalpython")
+    launcher = os.path.join(out.data.strip(), "bin", "graalpython").split("\n")[-1].strip()
     mx.log(launcher)
     if args:
         mx.run([launcher] + args)