TODO:progressbar

- Verify that things still work with newer versions of automake
- clean up patches

9 files changed, 21 insertions, 17 deletions

diff --git a/test/affine-test.c b/test/affine-test.c
index 2506250d..87894a6c 100644
--- a/test/affine-test.c
+++ b/test/affine-test.c
@@ -321,6 +321,6 @@ main (int argc, const char *argv[])
 {
     pixman_disable_out_of_bounds_workaround ();
 
-    return fuzzer_test_main ("affine", 8000000, CHECKSUM,
+    return fuzzer_test_main ("affine-test", 8000000, CHECKSUM,
 			     test_composite, argc, argv);
 }
diff --git a/test/blitters-test.c b/test/blitters-test.c
index a2c6ff4d..b6d0b8f1 100644
--- a/test/blitters-test.c
+++ b/test/blitters-test.c
@@ -401,7 +401,7 @@ main (int argc, const char *argv[])
 	initialize_palette (&(y_palette[i]), i, FALSE);
     }
 
-    return fuzzer_test_main("blitters", 2000000,
+    return fuzzer_test_main("blitters-test", 2000000,
 			    0x0CF3283B,
 			    test_composite, argc, argv);
 }
diff --git a/test/composite-traps-test.c b/test/composite-traps-test.c
index 2983eae8..f607e27f 100644
--- a/test/composite-traps-test.c
+++ b/test/composite-traps-test.c
@@ -251,6 +251,6 @@ test_composite (int      testnum,
 int
 main (int argc, const char *argv[])
 {
-    return fuzzer_test_main("composite traps", 40000, 0x749BCC57,
+    return fuzzer_test_main("composite-traps-test", 40000, 0x749BCC57,
 			    test_composite, argc, argv);
 }
diff --git a/test/glyph-test.c b/test/glyph-test.c
index 1811add7..580167e1 100644
--- a/test/glyph-test.c
+++ b/test/glyph-test.c
@@ -326,7 +326,7 @@ test_glyphs (int testnum, int verbose)
 int
 main (int argc, const char *argv[])
 {
-    return fuzzer_test_main ("glyph", 30000,	
+    return fuzzer_test_main ("glyph-test", 30000,	
 			     0xFA478A79,
 			     test_glyphs, argc, argv);
 }
diff --git a/test/matrix-test.c b/test/matrix-test.c
index 0a5f203f..5c414832 100644
--- a/test/matrix-test.c
+++ b/test/matrix-test.c
@@ -229,7 +229,7 @@ test_matrix (int testnum, int verbose)
 int
 main (int argc, const char *argv[])
 {
-    return fuzzer_test_main ("matrix", 20000,
+    return fuzzer_test_main ("matrix-test", 20000,
 			     0xBEBF98C3,
 			     test_matrix, argc, argv);
 }
diff --git a/test/region-contains-test.c b/test/region-contains-test.c
index 096e6517..3d3b48c9 100644
--- a/test/region-contains-test.c
+++ b/test/region-contains-test.c
@@ -161,7 +161,7 @@ test_region_contains_rectangle (int i, int verbose)
 int
 main (int argc, const char *argv[])
 {
-    return fuzzer_test_main ("region_contains",
+    return fuzzer_test_main ("region-contains-test",
 			     1000000,
 			     0x548E0F3F,
 			     test_region_contains_rectangle,
diff --git a/test/rotate-test.c b/test/rotate-test.c
index 9d2a620c..eebab5da 100644
--- a/test/rotate-test.c
+++ b/test/rotate-test.c
@@ -105,7 +105,7 @@ test_transform (int testnum, int verbose)
 int
 main (int argc, const char *argv[])
 {
-    return fuzzer_test_main ("rotate", 15000,
+    return fuzzer_test_main ("rotate-test", 15000,
 			     0xECF5E426,
 			     test_transform, argc, argv);
 }
diff --git a/test/scaling-test.c b/test/scaling-test.c
index a8cb4c47..2c8b18fa 100644
--- a/test/scaling-test.c
+++ b/test/scaling-test.c
@@ -390,6 +390,6 @@ main (int argc, const char *argv[])
 {
     pixman_disable_out_of_bounds_workaround ();
 
-    return fuzzer_test_main("scaling", 8000000, CHECKSUM,
+    return fuzzer_test_main("scaling-test", 8000000, CHECKSUM,
 			    test_composite, argc, argv);
 }
diff --git a/test/utils.c b/test/utils.c
index 39f9f213..0c182f83 100644
--- a/test/utils.c
+++ b/test/utils.c
@@ -602,6 +602,12 @@ draw_checkerboard (pixman_image_t *image,
     }
 }
 
+static void
+backspace (void)
+{
+    printf ("\010");
+}
+
 /*
  * A function, which can be used as a core part of the test programs,
  * intended to detect various problems with the help of fuzzing input
@@ -706,8 +712,13 @@ fuzzer_test_main (const char *test_name,
     {
 	if (checksum == expected_checksum)
 	{
-	    printf ("%s test passed (checksum=%08X)\n",
-		    test_name, checksum);
+	    int n = printf ("      %s (checksum=%08X)",
+			    test_name, checksum);
+	    while (n--)
+		backspace();
+
+	    if (!getenv ("MAKELEVEL"))
+		printf ("PASS:\n");
 	}
 	else
 	{
@@ -1560,13 +1571,6 @@ pixel_checker_check (const pixel_checker_t *checker, uint32_t pixel,
 }
 
 #define WIDTH		40
-#define BACKSPACE	"\010"
-
-static void
-backspace (void)
-{
-    printf ("\010");
-}
 
 void
 progress_bar_init (progress_bar_t *bar, const char *name, int n_updates)