[cairo-commit] cairo/test .cvsignore, 1.66, 1.67 Makefile.am, 1.107, 1.108 multi-page.c, NONE, 1.1 pdf-clip.c, 1.1, NONE pdf-surface.c, 1.10, NONE ps-surface.c, 1.4, NONE

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/test
In directory gabe:/tmp/cvs-serv11785/test

Modified Files:
	.cvsignore Makefile.am 
Added Files:
	multi-page.c 
Removed Files:
	pdf-clip.c pdf-surface.c ps-surface.c 
Log Message:

2006-01-12  Carl Worth  <cworth at cworth.org>

        * configure.in: Add a new CAIRO_HAS_MULTI_PAGE_SURFACES automake
        conditional.

        * test/.cvsignore:
        * test/Makefile.am:
        * test/pdf-clip.c:
        * test/pdf-surface.c:
        * test/ps-surface.c: Remove backend-specific tests (ps-surface,
        pdf-surface, and pdf-clip) that are now redundant with the ps and
        pdf support in the rest of the test suite.

        * test/multi-page.c: (draw), (draw_five_pages), (main): Add a new
        one-off test for testing show_page with both the ps and pdf
        backends.


Index: .cvsignore
===================================================================
RCS file: /cvs/cairo/cairo/test/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- .cvsignore	21 Dec 2005 20:08:57 -0000	1.66
+++ .cvsignore	13 Jan 2006 00:35:12 -0000	1.67
@@ -34,6 +34,9 @@
 mask-ctm
 mask-surface-ctm
 move-to-show-surface
+multi-page
+multi-page.pdf
+multi-page.ps
 nil-surface
 operator-clear
 operator-source
@@ -41,18 +44,12 @@
 paint-with-alpha
 path-data
 pdf2png
-pdf-clip
-pdf-clip.pdf
-pdf-surface
-pdf-surface.pdf
 svg2png
 svg-clip
 svg-clip.svg
 svg-surface
 svg-surface.svg
 pixman-rotate
-ps-surface
-ps-surface.ps
 pthread-show-text
 rectangle-rounding-error
 rel-path

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/test/Makefile.am,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- Makefile.am	29 Dec 2005 15:17:01 -0000	1.107
+++ Makefile.am	13 Jan 2006 00:35:12 -0000	1.108
@@ -69,22 +69,18 @@
 TESTS += ft-font-create-for-ft-face
 endif
 
-if CAIRO_HAS_PDF_SURFACE
-TESTS += pdf-surface pdf-clip
-endif
-
 if CAIRO_HAS_SVG_SURFACE
 TESTS += svg-surface svg-clip
 endif
 
-if CAIRO_HAS_PS_SURFACE
-TESTS += ps-surface
-endif
-
 if CAIRO_HAS_XLIB_SURFACE
 TESTS += xlib-surface
 endif
 
+if CAIRO_HAS_MULTI_PAGE_SURFACES
+TESTS += multi-page
+endif
+
 # All tests which have a reference image go here.
 # I really don't like having to repeat this list. Anyone know a good
 # way to avoid it? Can I use a wildcard here?
@@ -313,6 +309,7 @@
 mask_LDADD = $(LDADDS)
 mask_ctm_LDADD = $(LDADDS)
 mask_surface_ctm_LDADD = $(LDADDS)
+multi_page_LDADD = $(LDADDS)
 move_to_show_surface_LDADD = $(LDADDS)
 nil_surface_LDADD = $(LDADDS)
 operator_clear_LDADD = $(LDADDS)
@@ -320,12 +317,9 @@
 paint_LDADD = $(LDADDS)
 paint_with_alpha_LDADD = $(LDADDS)
 path_data_LDADD = $(LDADDS)
-pdf_surface_LDADD = $(LDADDS)
 svg_surface_LDADD = $(LDADDS)
-pdf_clip_LDADD = $(LDADDS)
 svg_clip_LDADD = $(LDADDS)
 pixman_rotate_LDADD = $(LDADDS)
-ps_surface_LDADD = $(LDADDS)
 pthread_show_text_LDADD = $(LDADDS)
 rectangle_rounding_error_LDADD = $(LDADDS)
 scale_source_surface_paint_LDADD = $(LDADDS)
@@ -374,10 +368,9 @@
 	*-out.png				\
 	*-diff.png				\
 	*.log					\
-	ps-surface.ps				\
-	pdf-surface.pdf				\
+	multi-page.ps				\
+	multi-page.pdf				\
 	svg-surface.svg				\
-	pdf-clip.pdf				\
 	svg-clip.svg
 
 check-valgrind:

--- NEW FILE: multi-page.c ---
(This appears to be a binary file; contents omitted.)

--- pdf-clip.c DELETED ---

--- pdf-surface.c DELETED ---

--- ps-surface.c DELETED ---