diff options
Diffstat (limited to 'test/Makefile.am')
| -rw-r--r-- | test/Makefile.am | 65 |
1 files changed, 54 insertions, 11 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 21976de6..de9f9c47 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -13,8 +13,10 @@ test_sources = \ big-line.c \ big-trap.c \ bilevel-image.c \ + caps.c \ caps-joins.c \ caps-joins-alpha.c \ + caps-joins-curve.c \ caps-sub-paths.c \ clip-all.c \ clip-empty.c \ @@ -51,6 +53,8 @@ test_sources = \ device-offset-positive.c \ device-offset-scale.c \ extend-pad.c \ + extend-pad-border.c \ + extend-pad-similar.c \ extend-reflect.c \ extend-reflect-similar.c \ extend-repeat.c \ @@ -106,6 +110,7 @@ test_sources = \ mask-transformed-image.c \ mask-transformed-similar.c \ meta-surface-pattern.c \ + mime-data.c \ miter-precision.c \ move-to-show-surface.c \ new-sub-path.c \ @@ -138,6 +143,8 @@ test_sources = \ rgb24-ignore-alpha.c \ rotate-image-surface-paint.c \ scale-down-source-surface-paint.c \ + scale-offset-image.c \ + scale-offset-similar.c \ scale-source-surface-paint.c \ stroke-ctm-caps.c \ stroke-image.c \ @@ -207,13 +214,18 @@ test_sources += ft-text-vertical-layout-type3.c test_sources += ft-text-antialias-none.c endif -# Need to add win32-surface-source, quartz-surface-source +# Need to add quartz-surface-source +if CAIRO_HAS_QUARTZ_SURFACE +test_sources += quartz-surface-source.c +endif + if CAIRO_HAS_GLITZ_SURFACE test_sources += glitz-surface-source.c endif if CAIRO_HAS_PDF_SURFACE test_sources += pdf-features.c +test_sources += pdf-mime-data.c test_sources += pdf-surface-source.c endif @@ -279,12 +291,19 @@ cairo_test_suite_LDADD = \ cairo_test_suite_DEPENDENCIES = \ $(top_builddir)/test/pdiff/libpdiff.la \ $(top_builddir)/boilerplate/libcairoboilerplate.la \ - $(top_builddir)/src/libcairo.la \ + $(top_builddir)/src/libcairo.la +if BUILD_ANY2PPM +cairo_test_suite_DEPENDENCIES += \ any2ppm +endif if HAVE_PTHREAD cairo_test_suite_LDADD += -lpthread endif +if CAIRO_HAS_SDL_SURFACE +cairo_test_suite_LDADD += $(sdl_LIBS) +endif + BUILT_SOURCES += cairo-test-constructors.c noinst_SCRIPTS = make-cairo-test-constructors.pl EXTRA_DIST += $(BUILT_SOURCES) $(noinst_SCRIPTS) COPYING @@ -309,13 +328,16 @@ REFERENCE_IMAGES = \ bilevel-image.ref.png \ bitmap-font.ref.png \ bitmap-font.rgb24.ref.png \ + caps.ref.png \ + caps.ps.ref.png \ caps-joins-alpha.quartz.ref.png \ caps-joins-alpha.ref.png \ caps-joins-alpha.svg12.ref.png \ caps-joins-alpha.svg11.ref.png \ + caps-joins-curve.ref.png \ + caps-joins-curve.ps.ref.png \ caps-joins.ref.png \ - caps-joins.ps2.ref.png \ - caps-joins.ps3.ref.png \ + caps-joins.ps.ref.png \ caps-sub-paths.ref.png \ clip-all.ref.png \ clip-empty.ref.png \ @@ -438,6 +460,8 @@ REFERENCE_IMAGES = \ device-offset.rgb24.ref.png \ device-offset-scale.ref.png \ extend-pad.ref.png \ + extend-pad-border.ref.png \ + extend-pad-similar.ref.png \ extend-reflect.ref.png \ extend-reflect-similar.ref.png \ extend-reflect-similar.ps2.ref.png \ @@ -687,6 +711,10 @@ REFERENCE_IMAGES = \ meta-surface-pattern.svg11.rgb24.ref.png \ meta-surface-pattern.svg12.argb32.ref.png \ meta-surface-pattern.svg12.rgb24.ref.png \ + mime-data.ref.png \ + mime-data.ps.ref.png \ + mime-data.pdf.ref.png \ + mime-data.svg.ref.png \ miter-precision.ref.png \ miter-precision.ps2.ref.png \ miter-precision.ps3.ref.png \ @@ -800,6 +828,10 @@ REFERENCE_IMAGES = \ rotate-image-surface-paint.svg12.ref.png \ rotate-image-surface-paint.svg11.ref.png \ scale-down-source-surface-paint.ref.png \ + scale-offset-image.ref.png \ + scale-offset-image.ps.ref.png \ + scale-offset-similar.ref.png \ + scale-offset-similar.ps.ref.png \ scale-source-surface-paint.pdf.argb32.ref.png \ scale-source-surface-paint.ref.png \ scale-source-surface-paint.rgb24.ref.png \ @@ -903,8 +935,7 @@ REFERENCE_IMAGES = \ surface-pattern-scale-up.ps2.ref.png \ surface-pattern-scale-up.ps3.ref.png \ surface-pattern-scale-up.ref.png \ - surface-pattern.svg12.ref.png \ - surface-pattern.svg11.ref.png \ + surface-pattern.svg.ref.png \ svg-surface-source.ref.png \ text-antialias-gray.ref.png \ text-antialias-gray.quartz.ref.png \ @@ -953,6 +984,7 @@ REFERENCE_IMAGES = \ trap-clip.ps2.argb32.ref.png \ trap-clip.ps2.rgb24.ref.png \ twin.ref.png \ + twin.pdf.ref.png \ twin.ps2.ref.png \ twin.ps3.ref.png \ twin.svg11.ref.png \ @@ -993,7 +1025,11 @@ REFERENCE_IMAGES = \ EXTRA_DIST += \ 6x13.pcf \ make-html.pl \ +jpeg.jpg \ +png.png \ +romedalen.jpg \ romedalen.png \ +scarab.jpg \ surface-source.c \ $(REFERENCE_IMAGES) @@ -1120,6 +1156,7 @@ AM_CPPFLAGS = \ -I$(srcdir) \ -I$(srcdir)/pdiff \ -I$(top_srcdir)/boilerplate \ + -I$(top_srcdir)/util/cairo-script \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ $(CAIRO_CFLAGS) @@ -1133,6 +1170,9 @@ $(top_builddir)/src/libcairo.la: $(top_builddir)/test/pdiff/libpdiff.la: cd $(top_builddir)/test/pdiff && $(MAKE) $(AM_MAKEFLAGS) libpdiff.la +$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la: $(top_builddir)/src/libcairo.la + cd $(top_builddir)/util/cairo-script && $(MAKE) $(AM_MAKEFLAGS) libcairo-script-interpreter.la + EXTRA_PROGRAMS += imagediff png-flatten imagediff_SOURCES = \ @@ -1140,7 +1180,8 @@ imagediff_SOURCES = \ buffer-diff.c \ buffer-diff.h imagediff_LDADD = \ - $(top_builddir)/test/pdiff/libpdiff.la + $(top_builddir)/test/pdiff/libpdiff.la \ + $(top_builddir)/src/libcairo.la png_flatten_SOURCES = png-flatten.c png_flatten_LDADD = $(top_builddir)/src/libcairo.la $(CAIRO_LDADD) @@ -1150,7 +1191,7 @@ check_PROGRAMS += any2ppm any2ppm_CFLAGS = $(POPPLER_CFLAGS) $(LIBRSVG_CFLAGS) $(LIBSPECTRE_CFLAGS) # add LDADD, so poppler/librsvg uses "our" cairo any2ppm_LDFLAGS = $(CAIRO_TEST_UNDEFINED_LDFLAGS) -any2ppm_LDADD = $(top_builddir)/src/libcairo.la $(CAIRO_LDADD) $(POPPLER_LIBS) $(LIBRSVG_LIBS) $(LIBSPECTRE_LIBS) +any2ppm_LDADD = $(top_builddir)/util/cairo-script/libcairo-script-interpreter.la $(top_builddir)/src/libcairo.la $(CAIRO_LDADD) $(POPPLER_LIBS) $(LIBRSVG_LIBS) $(LIBSPECTRE_LIBS) endif if CAIRO_CAN_TEST_PDF_SURFACE @@ -1209,6 +1250,7 @@ CLEANFILES += \ pdf-surface-source.pdf \ ps-surface-source.ps \ pdf-features.pdf \ + pdf-mime-data.out* \ ps-features.ps \ svg-clip.svg \ svg-surface.svg \ @@ -1222,12 +1264,12 @@ CLEANFILES += \ # reality of portability was raised and it became.... clean-local: clean-caches rm -rf output - -${FIND} . -name '*-out.*' -print | ${XARGS} ${RM} + -${FIND} . -name '*.out.*' -print | ${XARGS} ${RM} -${FIND} . -name '*.log' -print | ${XARGS} ${RM} -${FIND} . -name '*.[is]' -print | ${XARGS} ${RM} clean-caches: - -${FIND} . -name '*-pass.*' -print | ${XARGS} ${RM} - -${FIND} . -name '*-fail.*' -print | ${XARGS} ${RM} + -${FIND} . -name '*.pass.*' -print | ${XARGS} ${RM} + -${FIND} . -name '*.fail.*' -print | ${XARGS} ${RM} # The following definitions both should work. #FAILED_TESTS = `grep -l '\<FAIL\>' $(test_sources:.c=.log) 2>/dev/null | sed -e 's/[.]log$$//' | xargs echo` @@ -1267,6 +1309,7 @@ run: $(MAKE) $(AM_MAKEFLAGS) check TESTS_ENVIRONMENT='$(TESTS_ENVIRONMENT) $(top_builddir)/libtool --mode=execute env $(TOOL)' # Check tests under valgrind. Saves log to valgrind-log +check-valgrind: MODE+=,foreground check-valgrind: $(MAKE) $(AM_MAKEFLAGS) check TESTS_ENVIRONMENT='$(TESTS_ENVIRONMENT) $(top_builddir)/libtool --mode=execute valgrind $(VALGRIND_FLAGS)' 2>&1 | tee valgrind-log |