[test/subset] Massage more

test/subset/run-repack-tests.py

@@ -38,7 +38,8 @@ def cmd(command):
         command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True
     )
     (stdoutdata, stderrdata) = p.communicate()
-    print(stderrdata, end="", file=sys.stderr)
+    if stderrdata:
+        print(stderrdata, file=sys.stderr)
     return stdoutdata, p.returncode
 
 
@@ -53,8 +54,8 @@ def fail_test(test, cli_args, message):
     print("not ok -", test)
     print("   ---", file=sys.stderr)
     print('   message: "%s"' % message, file=sys.stderr)
-    print('   test.font_name: "%s"' % test.font_name)
-    print('   test.test_path: "%s"' % os.path.abspath(test.test_path))
+    print('   test.font_name: "%s"' % test.font_name, file=sys.stderr)
+    print('   test.test_path: "%s"' % os.path.abspath(test.test_path), file=sys.stderr)
     print("   ...", file=sys.stderr)
     return False
 

test/subset/run-tests.py

@@ -40,19 +40,20 @@ def cmd(command):
         command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True
     )
     (stdoutdata, stderrdata) = p.communicate()
-    print(stderrdata, end="", file=sys.stderr)
+    if stderrdata:
+        print(stderrdata, file=sys.stderr)
     return stdoutdata, p.returncode
 
 
 def fail_test(test, cli_args, message):
-    global fails
+    global fails, number
     fails += 1
 
     expected_file = os.path.join(
         test_suite.get_output_directory(), test.get_font_name()
     )
 
-    print("not ok -", test)
+    print("not ok %d - %s" % (number, test))
     print("   ---", file=sys.stderr)
     print('   message: "%s"' % message, file=sys.stderr)
     print('   test.font_path: "%s"' % os.path.abspath(test.font_path), file=sys.stderr)
@@ -217,7 +218,7 @@ for path in args:
                     print("ok %d - %s" % (number, test))
 
 if fails != 0:
-    print("# %d test(s) failed; output left in %s" % (fails, out_dir), file=sys.stderr)
+    print("# %d test(s) failed; output left in %s" % (fails, out_dir))
 else:
     print("# All tests passed.")
     shutil.rmtree(out_dir)

test/subset/subset_test_suite.py

@@ -17,10 +17,10 @@ class Test:
         self.options = options
 
     def __str__(self):
-        return "Test: %s %s %s %s %s %s" % (
+        # Don't print self.subset as contains non-ASCII and some CI's don't like it
+        return "Test: %s %s %s %s %s" % (
             self.font_path,
             self.profile_path,
-            self.subset,
             self.instance,
             self.iup_optimize,
             self.options,