diff options
Diffstat (limited to 'test/Makefile.am')
| -rw-r--r-- | test/Makefile.am | 169 |
1 files changed, 106 insertions, 63 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 9b673d2..1648dd8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -127,21 +127,24 @@ CLEANFILES += $(BUILT_SOURCES) REFERENCE_IMAGES = \ a1-bug.ref.png \ a1-bug.image16.ref.png \ + a1-bug.quartz.xfail.png \ a1-bug.xlib.ref.png \ a1-image-sample.ref.png \ a1-image-sample.gl.xfail.png \ - a1-image-sample.quartz.xfail.png \ a1-mask.ref.png \ a1-mask-sample.ref.png \ - a1-mask-sample.quartz.xfail.png \ a1-rasterisation-rectangles.ref.png \ + a1-rasterisation-rectangles.quartz.xfail.png \ a1-rasterisation-triangles.ref.png \ + a1-rasterisation-triangles.quartz.xfail.png \ a1-traps-sample.ref.png \ a1-traps-sample.quartz.xfail.png \ a8-clear.ref.png \ + a8-clear.quartz.ref.png \ a8-mask.ref.png \ aliasing.ref.png \ aliasing.image16.ref.png \ + aliasing.quartz.ref.png \ aliasing.xlib.ref.png \ alpha-similar.gl.argb32.xfail.png \ alpha-similar.gl.rgb24.xfail.png \ @@ -154,6 +157,11 @@ REFERENCE_IMAGES = \ alpha-similar.svg.argb32.xfail.png \ alpha-similar.svg.rgb24.xfail.png \ api-special-cases.ref.png \ + arc-infinite-loop.ref.png \ + arc-looping-dash.image16.ref.png \ + arc-looping-dash.ps.ref.png \ + arc-looping-dash.quartz.ref.png \ + arc-looping-dash.ref.png \ big-line.ref.png \ big-line.image16.ref.png \ big-line.ps.ref.png \ @@ -478,11 +486,15 @@ REFERENCE_IMAGES = \ extended-blend.image16.ref.png \ extended-blend.argb32.ref.png \ extended-blend.rgb24.ref.png \ + extended-blend.quartz.argb32.ref.png \ + extended-blend.quartz.rgb24.ref.png \ extended-blend.svg12.argb32.xfail.png \ extended-blend.svg12.rgb24.xfail.png \ extended-blend-alpha.image16.ref.png \ extended-blend-alpha.argb32.ref.png \ extended-blend-alpha.rgb24.ref.png \ + extended-blend-alpha.quartz.argb32.ref.png \ + extended-blend-alpha.quartz.rgb24.ref.png \ extended-blend-alpha.svg12.argb32.xfail.png \ extended-blend-alpha.svg12.rgb24.xfail.png \ extend-pad-border.image16.ref.png \ @@ -513,22 +525,27 @@ REFERENCE_IMAGES = \ extend-repeat.ps2.ref.png \ extend-repeat.ps3.ref.png \ extend-repeat.ref.png \ - fallback-resolution.ppi150x150.ref.png \ - fallback-resolution.ppi150x72.ref.png \ - fallback-resolution.ppi300x300.ref.png \ - fallback-resolution.ppi300x72.ref.png \ - fallback-resolution.ppi37.5x37.5.ref.png \ - fallback-resolution.ppi37.5x72.ref.png \ - fallback-resolution.ppi600x600.ref.png \ - fallback-resolution.ppi600x72.ref.png \ - fallback-resolution.ppi72x150.ref.png \ - fallback-resolution.ppi72x300.ref.png \ - fallback-resolution.ppi72x37.5.ref.png \ - fallback-resolution.ppi72x600.ref.png \ + fallback-resolution.ppi144x144.ps.ref.png \ + fallback-resolution.ppi144x144.ref.png \ + fallback-resolution.ppi144x72.ps.ref.png \ + fallback-resolution.ppi144x72.ref.png \ + fallback-resolution.ppi288x288.pdf.ref.png \ + fallback-resolution.ppi288x288.ps.ref.png \ + fallback-resolution.ppi288x288.svg.ref.png \ + fallback-resolution.ppi288x72.ps.ref.png \ + fallback-resolution.ppi288x72.ref.png \ + fallback-resolution.ppi576x576.pdf.ref.png \ + fallback-resolution.ppi576x576.ps.ref.png \ + fallback-resolution.ppi576x576.svg.ref.png \ + fallback-resolution.ppi576x72.ps.ref.png \ + fallback-resolution.ppi576x72.ref.png \ + fallback-resolution.ppi72x144.ps.ref.png \ + fallback-resolution.ppi72x144.ref.png \ + fallback-resolution.ppi72x288.ps.ref.png \ + fallback-resolution.ppi72x288.ref.png \ + fallback-resolution.ppi72x576.ps.ref.png \ + fallback-resolution.ppi72x576.ref.png \ fallback-resolution.ppi72x72.ref.png \ - fallback-resolution.ppi72x75.ref.png \ - fallback-resolution.ppi75x72.ref.png \ - fallback-resolution.ppi75x75.ref.png \ fill-alpha-pattern.image16.ref.png \ fill-alpha-pattern.ps3.argb32.ref.png \ fill-alpha-pattern.ps3.ref.png \ @@ -600,7 +617,6 @@ REFERENCE_IMAGES = \ filter-nearest-offset.pdf.xfail.png \ filter-nearest-offset.ps2.ref.png \ filter-nearest-offset.ps3.ref.png \ - filter-nearest-offset.quartz.xfail.png \ filter-nearest-offset.ref.png \ filter-nearest-offset.svg.xfail.png \ filter-nearest-transformed.image16.ref.png \ @@ -712,6 +728,7 @@ REFERENCE_IMAGES = \ huge-linear.image16.ref.png \ huge-linear.pdf.ref.png \ huge-linear.ps3.ref.png \ + huge-linear.quartz.ref.png \ huge-linear.ref.png \ huge-radial.image16.ref.png \ huge-radial.pdf.argb32.ref.png \ @@ -785,6 +802,7 @@ REFERENCE_IMAGES = \ linear-gradient.quartz.ref.png \ linear-gradient.ref.png \ linear-gradient.xlib.ref.png \ + linear-gradient-large.quartz.ref.png \ linear-gradient-large.ref.png \ linear-gradient-one-stop.argb32.ref.png \ linear-gradient-one-stop.rgb24.ref.png \ @@ -837,20 +855,20 @@ REFERENCE_IMAGES = \ mask.svg.rgb24.xfail.png \ mask.xlib.ref.png \ mask.xlib.rgb24.ref.png \ - recording-surface-pattern.image16.ref.png \ - recording-surface-pattern.gl.argb32.ref.png \ - recording-surface-pattern.pdf.argb32.ref.png \ - recording-surface-pattern.pdf.rgb24.ref.png \ - recording-surface-pattern.ps.argb32.ref.png \ - recording-surface-pattern.ps.rgb24.ref.png \ - recording-surface-pattern.quartz.argb32.ref.png \ - recording-surface-pattern.quartz.rgb24.ref.png \ - recording-surface-pattern.ref.png \ - recording-surface-pattern.rgb24.ref.png \ - recording-surface-pattern.svg.argb32.ref.png \ - recording-surface-pattern.svg.rgb24.ref.png \ - recording-surface-pattern.xlib.argb32.ref.png \ - recording-surface-pattern.xlib.rgb24.ref.png \ + mesh-pattern.image16.ref.png \ + mesh-pattern.ref.png \ + mesh-pattern-accuracy.image16.ref.png \ + mesh-pattern-accuracy.ref.png \ + mesh-pattern-conical.image16.ref.png \ + mesh-pattern-conical.ref.png \ + mesh-pattern-control-points.image16.ref.png \ + mesh-pattern-control-points.ref.png \ + mesh-pattern-fold.image16.ref.png \ + mesh-pattern-fold.ref.png \ + mesh-pattern-overlap.image16.ref.png \ + mesh-pattern-overlap.ref.png \ + mesh-pattern-transformed.image16.ref.png \ + mesh-pattern-transformed.ref.png \ mime-data.pdf.ref.png \ mime-data.ps.ref.png \ mime-data.ref.png \ @@ -948,6 +966,8 @@ REFERENCE_IMAGES = \ overlapping-glyphs.rgb24.ref.png \ overlapping-glyphs.pdf.argb32.xfail.png \ overlapping-glyphs.pdf.rgb24.xfail.png \ + overlapping-glyphs.quartz.argb32.ref.png \ + overlapping-glyphs.quartz.rgb24.ref.png \ overlapping-glyphs.svg.rgb24.ref.png \ overlapping-glyphs.svg.argb32.ref.png \ paint-repeat.ref.png \ @@ -960,6 +980,7 @@ REFERENCE_IMAGES = \ paint.ref.png \ partial-clip-text.ref.png \ partial-clip-text.ps.ref.png \ + partial-clip-text.quartz.ref.png \ partial-clip-text.svg.ref.png \ partial-coverage-half-reference.ref.png \ partial-coverage-half-triangles.ref.png \ @@ -994,6 +1015,7 @@ REFERENCE_IMAGES = \ pixman-rotate.ref.png \ pixman-rotate.rgb24.ref.png \ pixman-rotate.ps.argb32.ref.png \ + ps-eps.ref.png \ pthread-same-source.image16.ref.png \ pthread-same-source.quartz.xfail.png \ pthread-same-source.ref.png \ @@ -1020,6 +1042,7 @@ REFERENCE_IMAGES = \ push-group-color.image16.ref.png \ push-group-color.quartz.ref.png \ push-group-color.ref.png \ + push-group-color.ps2.ref.png \ push-group-color.ps3.ref.png \ push-group-color.xlib.ref.png \ quartz-surface-source.rgb24.ref.png \ @@ -1027,22 +1050,27 @@ REFERENCE_IMAGES = \ quartz-surface-source.ps2.ref.png \ quartz-surface-source.ps3.ref.png \ radial-gradient.image16.ref.png \ - radial-gradient.pdf.ref.png \ radial-gradient.ref.png \ - radial-gradient.svg.xfail.png \ + radial-gradient.quartz.ref.png \ + radial-gradient-extend.ps3.ref.png \ radial-gradient-extend.ref.png \ radial-gradient-source.image16.ref.png \ radial-gradient-source.argb32.ref.png \ radial-gradient-source.rgb24.ref.png \ - radial-gradient-source.pdf.argb32.ref.png \ - radial-gradient-mask.argb32.ref.png \ - radial-gradient-mask.rgb24.ref.png \ + radial-gradient-source.quartz.argb32.ref.png \ + radial-gradient-source.quartz.rgb24.ref.png \ + radial-gradient-mask.ref.png \ radial-gradient-mask.image16.ref.png \ + radial-gradient-mask.quartz.ref.png \ radial-gradient-mask-source.argb32.ref.png \ radial-gradient-mask-source.rgb24.ref.png \ radial-gradient-mask-source.image16.ref.png \ - radial-gradient-one-stop.argb32.ref.png \ - radial-gradient-one-stop.rgb24.ref.png \ + radial-gradient-mask-source.quartz.argb32.ref.png \ + radial-gradient-mask-source.quartz.rgb24.ref.png \ + radial-gradient-mask-source.xlib.argb32.ref.png \ + radial-gradient-mask-source.xlib.rgb24.ref.png \ + radial-gradient-one-stop.ref.png \ + radial-gradient-one-stop.quartz.ref.png \ random-intersections-eo.image16.ref.png \ random-intersections-eo.ps.ref.png \ random-intersections-eo.quartz.ref.png \ @@ -1067,6 +1095,20 @@ REFERENCE_IMAGES = \ random-intersections-curves-nz.ref.png \ random-intersections-curves-nz.xlib.ref.png \ random-intersections-curves-nz.xlib-fallback.ref.png \ + recording-surface-pattern.image16.ref.png \ + recording-surface-pattern.gl.argb32.ref.png \ + recording-surface-pattern.pdf.argb32.ref.png \ + recording-surface-pattern.pdf.rgb24.ref.png \ + recording-surface-pattern.ps.argb32.ref.png \ + recording-surface-pattern.ps.rgb24.ref.png \ + recording-surface-pattern.quartz.argb32.ref.png \ + recording-surface-pattern.quartz.rgb24.ref.png \ + recording-surface-pattern.ref.png \ + recording-surface-pattern.rgb24.ref.png \ + recording-surface-pattern.svg.argb32.ref.png \ + recording-surface-pattern.svg.rgb24.ref.png \ + recording-surface-pattern.xlib.argb32.ref.png \ + recording-surface-pattern.xlib.rgb24.ref.png \ rectangle-rounding-error.ref.png \ rectilinear-dash.quartz.xfail.png \ rectilinear-dash.ref.png \ @@ -1255,8 +1297,8 @@ REFERENCE_IMAGES = \ surface-pattern-operator.xlib.rgb24.ref.png \ surface-pattern-operator.pdf.argb32.xfail.png \ surface-pattern-operator.pdf.rgb24.xfail.png \ - surface-pattern-operator.quartz.argb32.xfail.png \ - surface-pattern-operator.quartz.rgb24.xfail.png \ + surface-pattern-operator.quartz.argb32.ref.png \ + surface-pattern-operator.quartz.rgb24.ref.png \ surface-pattern-scale-down.image16.ref.png \ surface-pattern-scale-down.pdf.ref.png \ surface-pattern-scale-down.ps2.ref.png \ @@ -1367,6 +1409,8 @@ REFERENCE_IMAGES = \ unbounded-operator.pdf.argb32.ref.png \ unbounded-operator.ps2.argb32.ref.png \ unbounded-operator.ps3.argb32.ref.png \ + unbounded-operator.quartz.argb32.ref.png \ + unbounded-operator.quartz.rgb24.ref.png \ unbounded-operator.ref.png \ unbounded-operator.rgb24.ref.png \ unbounded-operator.svg12.argb32.ref.png \ @@ -1399,6 +1443,7 @@ REFERENCE_IMAGES = \ user-font.ref.png \ user-font.svg.ref.png \ user-font.xlib.ref.png \ + xcb-stress-cache.ref.png \ xcb-surface-source.rgb24.ref.png \ xcb-surface-source.argb32.ref.png \ xcomposite-projection.ref.png \ @@ -1414,20 +1459,22 @@ REFERENCE_IMAGES = \ xlib-surface-source.ps3.ref.png \ xlib-surface-source.svg12.argb32.xfail.png \ xlib-surface-source.svg12.rgb24.xfail.png \ + white-in-noop.ref.png \ zero-mask.ref.png \ zero-mask.rgb24.ref.png \ zero-alpha.ref.png EXTRA_DIST += \ 6x13.pcf \ -make-html.pl \ +index.html \ +jp2.jp2 \ jpeg.jpg \ png.png \ -jp2.jp2 \ romedalen.jpg \ romedalen.png \ scarab.jpg \ surface-source.c \ +testtable.js \ $(REFERENCE_IMAGES) # Any test for which the code committed to CVS is expected to fail @@ -1662,7 +1709,6 @@ VALGRIND_FLAGS = \ CLEANFILES += \ valgrind-log \ - index.html \ ref.hash \ png-test.png \ png.out.png \ @@ -1674,7 +1720,6 @@ CLEANFILES += \ ps-surface-source.out.ps \ pdf-features.pdf \ pdf-mime-data.out* \ - ps-eps.eps \ ps-features.ps \ svg-clip.svg \ svg-surface.svg \ @@ -1705,24 +1750,16 @@ recheck: @echo Re-checking failed tests @$(MAKE) $(AM_MAKEFLAGS) $(recheck) -# Checks tests and creates index.html. +# Checks tests. # Target doesn't fail if tests fail. test: - @$(MAKE) $(AM_MAKEFLAGS) check; \ - $(MAKE) $(AM_MAKEFLAGS) html + @$(MAKE) $(AM_MAKEFLAGS) check -# Re-checks tests and creates index.html. +# Re-checks tests. # Target doesn't fail if tests fail. retest: @CAIRO_TESTS="$(FAILED_TESTS)"; \ - $(MAKE) $(AM_MAKEFLAGS) check; \ - $(MAKE) $(AM_MAKEFLAGS) html - -html-local: index.html - -# Make index.html with no dependency tracking, containing only the failed tests. -rehtml: - @CAIRO_TESTS="$(FAILED_TESTS)" $(MAKE) $(AM_MAKEFLAGS) html + $(MAKE) $(AM_MAKEFLAGS) check # Run tests under a tool specified by TOOL. For example, make run TOOL=gdb run: @@ -1740,11 +1777,6 @@ NOLOG_TESTS_LOG = $(NOLOG_TESTS:=.log) $(NOLOG_TESTS_LOG): @echo dummy > $@ -index.html: $(srcdir)/make-html.pl - @echo Creating index.html - @perl $(srcdir)/make-html.pl > $@ - - # Identify identical reference images check-ref-dups: @LANG=C; \ @@ -1795,6 +1827,17 @@ check-ref-missing: release-verify-sane-tests: check-ref-missing -.PHONY: check-valgrind test recheck retest rehtml check-ref-dups check-ref-missing release-verify-sane-tests +results.tar: + @tar cf $@ index.html testtable.js *.log; \ + for i in output/*.fail.png ; do \ + testname=$${i#output/} ; \ + testname=$${testname%%.*} ; \ + tar uf $@ $${testname}*.ref.png $${i%fail.png}out.png $${i%fail.png}diff.png ; \ + done + +results.tar.gz: results.tar + gzip -c $< > $@ + +.PHONY: check-valgrind test recheck retest check-ref-dups check-ref-missing release-verify-sane-tests EXTRA_DIST += Makefile.win32 |