[cairo-commit] 4 commits - test/cairo-test.c test/show-text-current-point-pdf-argb32-ref.png test/show-text-current-point-ps-argb32-ref.png test/text-antialias-gray-pdf-argb32-ref.png test/text-antialias-gray-ps-argb32-ref.png test/text-antialias-none-pdf-argb32-ref.png test/text-antialias-none-ps-argb32-ref.png test/text-antialias-subpixel-pdf-argb32-ref.png test/text-antialias-subpixel-ps-argb32-ref.png

[Carl Worth]

 test/cairo-test.c                               |   10 +++++++++-
 test/show-text-current-point-pdf-argb32-ref.png |binary
 test/show-text-current-point-ps-argb32-ref.png  |binary
 test/text-antialias-gray-pdf-argb32-ref.png     |binary
 test/text-antialias-gray-ps-argb32-ref.png      |binary
 test/text-antialias-none-pdf-argb32-ref.png     |binary
 test/text-antialias-none-ps-argb32-ref.png      |binary
 test/text-antialias-subpixel-pdf-argb32-ref.png |binary
 test/text-antialias-subpixel-ps-argb32-ref.png  |binary
 9 files changed, 9 insertions(+), 1 deletion(-)

New commits:
diff-tree a0df6fa696d44533adec1ecec7398e851b2eb37a (from 6237437f412d9d007e1c49c33f6e81117b612d39)
Author: Carl Worth <cworth at cworth.org>
Date:   Tue Apr 25 07:07:48 2006 -0700

    Update PS and PDF reference images for change in font options

diff --git a/test/show-text-current-point-pdf-argb32-ref.png b/test/show-text-current-point-pdf-argb32-ref.png
index c024a4d..8923e99 100644
Binary files a/test/show-text-current-point-pdf-argb32-ref.png and b/test/show-text-current-point-pdf-argb32-ref.png differ
diff --git a/test/show-text-current-point-ps-argb32-ref.png b/test/show-text-current-point-ps-argb32-ref.png
index f00681b..013d97c 100644
Binary files a/test/show-text-current-point-ps-argb32-ref.png and b/test/show-text-current-point-ps-argb32-ref.png differ
diff --git a/test/text-antialias-gray-pdf-argb32-ref.png b/test/text-antialias-gray-pdf-argb32-ref.png
index bd039b3..9241d50 100644
Binary files a/test/text-antialias-gray-pdf-argb32-ref.png and b/test/text-antialias-gray-pdf-argb32-ref.png differ
diff --git a/test/text-antialias-gray-ps-argb32-ref.png b/test/text-antialias-gray-ps-argb32-ref.png
index acb273c..c0965cb 100644
Binary files a/test/text-antialias-gray-ps-argb32-ref.png and b/test/text-antialias-gray-ps-argb32-ref.png differ
diff --git a/test/text-antialias-none-pdf-argb32-ref.png b/test/text-antialias-none-pdf-argb32-ref.png
index bd039b3..9241d50 100644
Binary files a/test/text-antialias-none-pdf-argb32-ref.png and b/test/text-antialias-none-pdf-argb32-ref.png differ
diff --git a/test/text-antialias-none-ps-argb32-ref.png b/test/text-antialias-none-ps-argb32-ref.png
index acb273c..c0965cb 100644
Binary files a/test/text-antialias-none-ps-argb32-ref.png and b/test/text-antialias-none-ps-argb32-ref.png differ
diff --git a/test/text-antialias-subpixel-pdf-argb32-ref.png b/test/text-antialias-subpixel-pdf-argb32-ref.png
index bd039b3..9241d50 100644
Binary files a/test/text-antialias-subpixel-pdf-argb32-ref.png and b/test/text-antialias-subpixel-pdf-argb32-ref.png differ
diff --git a/test/text-antialias-subpixel-ps-argb32-ref.png b/test/text-antialias-subpixel-ps-argb32-ref.png
index acb273c..c0965cb 100644
Binary files a/test/text-antialias-subpixel-ps-argb32-ref.png and b/test/text-antialias-subpixel-ps-argb32-ref.png differ
diff-tree 6237437f412d9d007e1c49c33f6e81117b612d39 (from parents)
Merge: 22ab0e5f1615e28f77d8dc0c8a26929e0f0279b6 f1c37547530c0c6c134526ea4bac7d11013160f1
Author: Carl Worth <cworth at cworth.org>
Date:   Tue Apr 25 07:02:41 2006 -0700

    Merge branch 'behdad-colored-fails' into cairo

diff-tree f1c37547530c0c6c134526ea4bac7d11013160f1 (from 9668b6592f805b6e05f9e75354956e4119483b6a)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Apr 25 09:58:48 2006 -0400

    Use white on red for failures.

diff --git a/test/cairo-test.c b/test/cairo-test.c
index 8484808..46cf5f4 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -1763,7 +1763,7 @@ cairo_test (cairo_test_t *test, cairo_te
 {
 #ifdef HAVE_UNISTD_H
     if (isatty (1)) {
-	fail_face = "\033[41m";
+	fail_face = "\033[41m\033[37m\033[1m";
 	normal_face = "\033[m";
     }
 #endif
diff-tree 9668b6592f805b6e05f9e75354956e4119483b6a (from 6723547f0035e6c41abee165ebefb7406e40b7d8)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Apr 25 09:03:26 2006 -0400

    Set background color to red for test failures printing on a terminal.

diff --git a/test/cairo-test.c b/test/cairo-test.c
index c61cb0e..8484808 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -71,6 +71,8 @@ typedef enum cairo_internal_surface_type
 static void
 xunlink (const char *pathname);
 
+static const char *fail_face = "", *normal_face = "";
+
 #define CAIRO_TEST_LOG_SUFFIX ".log"
 #define CAIRO_TEST_PNG_SUFFIX "-out.png"
 #define CAIRO_TEST_REF_SUFFIX "-ref.png"
@@ -1726,7 +1728,7 @@ cairo_test_expecting (cairo_test_t *test
 		printf ("XFAIL\n");
 		cairo_test_log ("XFAIL\n");
 	    } else {
-		printf ("FAIL\n");
+		printf ("%sFAIL%s\n", fail_face, normal_face);
 		cairo_test_log ("FAIL\n");
 	    }
 	    ret = status;
@@ -1759,6 +1761,12 @@ cairo_test_expect_failure (cairo_test_t	
 cairo_test_status_t
 cairo_test (cairo_test_t *test, cairo_test_draw_function_t draw)
 {
+#ifdef HAVE_UNISTD_H
+    if (isatty (1)) {
+	fail_face = "\033[41m";
+	normal_face = "\033[m";
+    }
+#endif
     printf ("\n");
     return cairo_test_expecting (test, draw, CAIRO_TEST_SUCCESS);
 }