From 992f74d884c9ea83f7b51c6959dd93718027b99a Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 31 Oct 2008 13:50:55 +0000
Subject: [PATCH] [test] Use '.' as the field separator in the names

We frequently use '-' within the test name or format name and so we
encounter confusion as '-' is also used as the field separator. At times
this has caused a new test to break an old test because the new test would
match one of the old test's target specific reference images. So switch
everything over to use '.' between fields (test name, target, format,
subtest, etc.).
---
 test/.gitignore                               |    8 +-
 test/Makefile.am                              | 1402 ++++++++---------
 ...sample-ref.png => a1-image-sample.ref.png} |  Bin
 test/{a1-mask-ref.png => a1-mask.ref.png}     |  Bin
 ...sample-ref.png => a1-traps-sample.ref.png} |  Bin
 test/{a8-mask-ref.png => a8-mask.ref.png}     |  Bin
 ...-similar-ref.png => alpha-similar.ref.png} |  Bin
 ...24-ref.png => alpha-similar.rgb24.ref.png} |  Bin
 ...-line-ps2-ref.png => big-line.ps2.ref.png} |  Bin
 ...b24-ref.png => big-line.ps2.rgb24.ref.png} |  Bin
 ...-line-ps3-ref.png => big-line.ps3.ref.png} |  Bin
 ...b24-ref.png => big-line.ps3.rgb24.ref.png} |  Bin
 ...quartz-ref.png => big-line.quartz.ref.png} |  Bin
 ...-ref.png => big-line.quartz.rgb24.ref.png} |  Bin
 test/{big-line-ref.png => big-line.ref.png}   |  Bin
 ...e-rgb24-ref.png => big-line.rgb24.ref.png} |  Bin
 ...el-image-ref.png => bilevel-image.ref.png} |  Bin
 ...itmap-font-ref.png => bitmap-font.ref.png} |  Bin
 ...gb24-ref.png => bitmap-font.rgb24.ref.png} |  Bin
 test/cairo-test.c                             |   68 +-
 test/cairo-test.h                             |    1 +
 ...ef.png => caps-joins-alpha.quartz.ref.png} |  Bin
 ...alpha-ref.png => caps-joins-alpha.ref.png} |  Bin
 ...ref.png => caps-joins-alpha.svg11.ref.png} |  Bin
 ...ref.png => caps-joins-alpha.svg12.ref.png} |  Bin
 ...ins-ps2-ref.png => caps-joins.ps2.ref.png} |  Bin
 ...ins-ps3-ref.png => caps-joins.ps3.ref.png} |  Bin
 ...{caps-joins-ref.png => caps-joins.ref.png} |  Bin
 ...b-paths-ref.png => caps-sub-paths.ref.png} |  Bin
 test/{clip-all-ref.png => clip-all.ref.png}   |  Bin
 ...{clip-empty-ref.png => clip-empty.ref.png} |  Bin
 ...g => clip-fill-rule-pixel-aligned.ref.png} |  Bin
 ...lip-fill-rule-pixel-aligned.rgb24.ref.png} |  Bin
 ....png => clip-fill-rule.ps2.argb32.ref.png} |  Bin
 ...f.png => clip-fill-rule.ps2.rgb24.ref.png} |  Bin
 ....png => clip-fill-rule.ps3.argb32.ref.png} |  Bin
 ...f.png => clip-fill-rule.ps3.rgb24.ref.png} |  Bin
 ...ll-rule-ref.png => clip-fill-rule.ref.png} |  Bin
 ...4-ref.png => clip-fill-rule.rgb24.ref.png} |  Bin
 ...ef.png => clip-nesting.ps2.argb32.ref.png} |  Bin
 ...ref.png => clip-nesting.ps2.rgb24.ref.png} |  Bin
 ...ef.png => clip-nesting.ps3.argb32.ref.png} |  Bin
 ...ref.png => clip-nesting.ps3.rgb24.ref.png} |  Bin
 ...tz-ref.png => clip-nesting.quartz.ref.png} |  Bin
 ....png => clip-nesting.quartz.rgb24.ref.png} |  Bin
 ...p-nesting-ref.png => clip-nesting.ref.png} |  Bin
 ...b24-ref.png => clip-nesting.rgb24.ref.png} |  Bin
 ...f.png => clip-operator.pdf.argb32.ref.png} |  Bin
 ...ef.png => clip-operator.pdf.rgb24.ref.png} |  Bin
 ...ef.png => clip-operator.ps2.rgb24.ref.png} |  Bin
 ...-ps3-ref.png => clip-operator.ps3.ref.png} |  Bin
 ...ef.png => clip-operator.ps3.rgb24.ref.png} |  Bin
 ...z-ref.png => clip-operator.quartz.ref.png} |  Bin
 ...png => clip-operator.quartz.rgb24.ref.png} |  Bin
 ...operator-ref.png => clip-operator.ref.png} |  Bin
 ...24-ref.png => clip-operator.rgb24.ref.png} |  Bin
 ...png => clip-push-group.ps2.argb32.ref.png} |  Bin
 ....png => clip-push-group.ps2.rgb24.ref.png} |  Bin
 ...png => clip-push-group.ps3.argb32.ref.png} |  Bin
 ....png => clip-push-group.ps3.rgb24.ref.png} |  Bin
 ...ref.png => clip-push-group.quartz.ref.png} |  Bin
 ...-group-ref.png => clip-push-group.ref.png} |  Bin
 ...-ref.png => clip-twice.ps2.argb32.ref.png} |  Bin
 ...4-ref.png => clip-twice.ps2.rgb24.ref.png} |  Bin
 ...-ref.png => clip-twice.ps3.argb32.ref.png} |  Bin
 ...4-ref.png => clip-twice.ps3.rgb24.ref.png} |  Bin
 ...artz-ref.png => clip-twice.quartz.ref.png} |  Bin
 ...ef.png => clip-twice.quartz.rgb24.ref.png} |  Bin
 ...{clip-twice-ref.png => clip-twice.ref.png} |  Bin
 ...rgb24-ref.png => clip-twice.rgb24.ref.png} |  Bin
 ...-ps2-ref.png => clipped-group.ps2.ref.png} |  Bin
 ...-ps3-ref.png => clipped-group.ps3.ref.png} |  Bin
 ...ed-group-ref.png => clipped-group.ref.png} |  Bin
 ...urface-ref.png => clipped-surface.ref.png} |  Bin
 ...ath-ps2-ref.png => close-path.ps2.ref.png} |  Bin
 ...ath-ps3-ref.png => close-path.ps3.ref.png} |  Bin
 ...{close-path-ref.png => close-path.ref.png} |  Bin
 ...integer-translate-over-repeat.ps2.ref.png} |  Bin
 ...integer-translate-over-repeat.ps3.ref.png} |  Bin
 ...ite-integer-translate-over-repeat.ref.png} |  Bin
 ...posite-integer-translate-over.ps2.ref.png} |  Bin
 ...posite-integer-translate-over.ps3.ref.png} |  Bin
 ... composite-integer-translate-over.ref.png} |  Bin
 ...site-integer-translate-source.ps2.ref.png} |  Bin
 ...site-integer-translate-source.ps3.ref.png} |  Bin
 ...omposite-integer-translate-source.ref.png} |  Bin
 ...path-ps2-ref.png => copy-path.ps2.ref.png} |  Bin
 ...path-ps3-ref.png => copy-path.ps3.ref.png} |  Bin
 test/{copy-path-ref.png => copy-path.ref.png} |  Bin
 test/create-for-stream.c                      |    2 +-
 test/create-from-png-stream.c                 |    2 +-
 ...ref.png => create-from-png-stream.ref.png} |  Bin
 ...-ref.png => create-from-png.alpha.ref.png} |  Bin
 test/create-from-png.c                        |   16 +-
 ...png => create-from-png.gray-alpha.ref.png} |  Bin
 ...y-ref.png => create-from-png.gray.ref.png} |  Bin
 ... => create-from-png.indexed-alpha.ref.png} |  Bin
 ...ef.png => create-from-png.indexed.ref.png} |  Bin
 ...om-png-ref.png => create-from-png.ref.png} |  Bin
 ...png => dash-caps-joins.ps2.argb32.ref.png} |  Bin
 ....png => dash-caps-joins.ps2.rgb24.ref.png} |  Bin
 ...png => dash-caps-joins.ps3.argb32.ref.png} |  Bin
 ....png => dash-caps-joins.ps3.rgb24.ref.png} |  Bin
 ...ref.png => dash-caps-joins.quartz.ref.png} |  Bin
 ...-joins-ref.png => dash-caps-joins.ref.png} |  Bin
 ...rve-ps2-ref.png => dash-curve.ps2.ref.png} |  Bin
 ...rve-ps3-ref.png => dash-curve.ps3.ref.png} |  Bin
 ...artz-ref.png => dash-curve.quartz.ref.png} |  Bin
 ...{dash-curve-ref.png => dash-curve.ref.png} |  Bin
 ...h-no-dash-ref.png => dash-no-dash.ref.png} |  Bin
 ...e-ref.png => dash-offset-negative.ref.png} |  Bin
 ...-ref.png => dash-scale.ps2.argb32.ref.png} |  Bin
 ...4-ref.png => dash-scale.ps2.rgb24.ref.png} |  Bin
 ...-ref.png => dash-scale.ps3.argb32.ref.png} |  Bin
 ...4-ref.png => dash-scale.ps3.rgb24.ref.png} |  Bin
 ...artz-ref.png => dash-scale.quartz.ref.png} |  Bin
 ...{dash-scale-ref.png => dash-scale.ref.png} |  Bin
 ...ate-ps2-ref.png => dash-state.ps2.ref.png} |  Bin
 ...ate-ps3-ref.png => dash-state.ps3.ref.png} |  Bin
 ...artz-ref.png => dash-state.quartz.ref.png} |  Bin
 ...{dash-state-ref.png => dash-state.ref.png} |  Bin
 ...2-ref.png => dash-zero-length.ps2.ref.png} |  Bin
 ...png => dash-zero-length.ps2.rgb24.ref.png} |  Bin
 ...3-ref.png => dash-zero-length.ps3.ref.png} |  Bin
 ...png => dash-zero-length.ps3.rgb24.ref.png} |  Bin
 ...ength-ref.png => dash-zero-length.ref.png} |  Bin
 ...ref.png => dash-zero-length.rgb24.ref.png} |  Bin
 ...ps2-ref.png => degenerate-arc.ps2.ref.png} |  Bin
 ...ps3-ref.png => degenerate-arc.ps3.ref.png} |  Bin
 ...ate-arc-ref.png => degenerate-arc.ref.png} |  Bin
 ...e-dash-ref.png => degenerate-dash.ref.png} |  Bin
 ...png => degenerate-path.ps2.argb32.ref.png} |  Bin
 ....png => degenerate-path.ps2.rgb24.ref.png} |  Bin
 ...png => degenerate-path.ps3.argb32.ref.png} |  Bin
 ....png => degenerate-path.ps3.rgb24.ref.png} |  Bin
 ...ref.png => degenerate-path.quartz.ref.png} |  Bin
 ...g => degenerate-path.quartz.rgb24.ref.png} |  Bin
 ...e-path-ref.png => degenerate-path.ref.png} |  Bin
 ...-ref.png => degenerate-path.rgb24.ref.png} |  Bin
 ...ps2-ref.png => degenerate-pen.ps2.ref.png} |  Bin
 ...ps3-ref.png => degenerate-pen.ps3.ref.png} |  Bin
 ...-ref.png => degenerate-pen.quartz.ref.png} |  Bin
 ...ate-pen-ref.png => degenerate-pen.ref.png} |  Bin
 ...g => device-offset-fractional.pdf.ref.png} |  Bin
 ...g => device-offset-fractional.ps2.ref.png} |  Bin
 ...g => device-offset-fractional.ps3.ref.png} |  Bin
 ...f.png => device-offset-fractional.ref.png} |  Bin
 ...ref.png => device-offset-positive.ref.png} |  Bin
 ...g => device-offset-positive.rgb24.ref.png} |  Bin
 ...le-ref.png => device-offset-scale.ref.png} |  Bin
 ...e-offset-ref.png => device-offset.ref.png} |  Bin
 ...24-ref.png => device-offset.rgb24.ref.png} |  Bin
 ...{extend-pad-ref.png => extend-pad.ref.png} |  Bin
 ...png => extend-reflect-similar.ps2.ref.png} |  Bin
 ...png => extend-reflect-similar.ps3.ref.png} |  Bin
 ...ref.png => extend-reflect-similar.ref.png} |  Bin
 ...ps2-ref.png => extend-reflect.ps2.ref.png} |  Bin
 ...ps3-ref.png => extend-reflect.ps3.ref.png} |  Bin
 ...similar-ref.png => extend-reflect.ref.png} |  Bin
 ....png => extend-repeat-similar.ps2.ref.png} |  Bin
 ....png => extend-repeat-similar.ps3.ref.png} |  Bin
 ...-ref.png => extend-repeat-similar.ref.png} |  Bin
 ...-ps2-ref.png => extend-repeat.ps2.ref.png} |  Bin
 ...-ps3-ref.png => extend-repeat.ps3.ref.png} |  Bin
 ...-similar-ref.png => extend-repeat.ref.png} |  Bin
 test/fallback-resolution.c                    |   11 +-
 ...=> fallback-resolution.ppi150x150.ref.png} |  Bin
 ...=> fallback-resolution.ppi150x300.ref.png} |  Bin
 ...> fallback-resolution.ppi150x37.5.ref.png} |  Bin
 ...=> fallback-resolution.ppi150x600.ref.png} |  Bin
 ... => fallback-resolution.ppi150x72.ref.png} |  Bin
 ... => fallback-resolution.ppi150x75.ref.png} |  Bin
 ...=> fallback-resolution.ppi300x150.ref.png} |  Bin
 ...=> fallback-resolution.ppi300x300.ref.png} |  Bin
 ...> fallback-resolution.ppi300x37.5.ref.png} |  Bin
 ...=> fallback-resolution.ppi300x600.ref.png} |  Bin
 ... => fallback-resolution.ppi300x72.ref.png} |  Bin
 ... => fallback-resolution.ppi300x75.ref.png} |  Bin
 ...> fallback-resolution.ppi37.5x150.ref.png} |  Bin
 ...> fallback-resolution.ppi37.5x300.ref.png} |  Bin
 ... fallback-resolution.ppi37.5x37.5.ref.png} |  Bin
 ...> fallback-resolution.ppi37.5x600.ref.png} |  Bin
 ...=> fallback-resolution.ppi37.5x72.ref.png} |  Bin
 ...=> fallback-resolution.ppi37.5x75.ref.png} |  Bin
 ...=> fallback-resolution.ppi600x150.ref.png} |  Bin
 ...=> fallback-resolution.ppi600x300.ref.png} |  Bin
 ...> fallback-resolution.ppi600x37.5.ref.png} |  Bin
 ...=> fallback-resolution.ppi600x600.ref.png} |  Bin
 ... => fallback-resolution.ppi600x72.ref.png} |  Bin
 ... => fallback-resolution.ppi600x75.ref.png} |  Bin
 ... => fallback-resolution.ppi72x150.ref.png} |  Bin
 ... => fallback-resolution.ppi72x300.ref.png} |  Bin
 ...=> fallback-resolution.ppi72x37.5.ref.png} |  Bin
 ... => fallback-resolution.ppi72x600.ref.png} |  Bin
 ...g => fallback-resolution.ppi72x72.ref.png} |  Bin
 ...g => fallback-resolution.ppi72x75.ref.png} |  Bin
 ... => fallback-resolution.ppi75x150.ref.png} |  Bin
 ... => fallback-resolution.ppi75x300.ref.png} |  Bin
 ...=> fallback-resolution.ppi75x37.5.ref.png} |  Bin
 ... => fallback-resolution.ppi75x600.ref.png} |  Bin
 ...g => fallback-resolution.ppi75x72.ref.png} |  Bin
 ...g => fallback-resolution.ppi75x75.ref.png} |  Bin
 ... => fill-alpha-pattern.pdf.argb32.ref.png} |  Bin
 ...g => fill-alpha-pattern.pdf.rgb24.ref.png} |  Bin
 ...ref.png => fill-alpha-pattern.ps3.ref.png} |  Bin
 ...ern-ref.png => fill-alpha-pattern.ref.png} |  Bin
 ...{fill-alpha-ref.png => fill-alpha.ref.png} |  Bin
 ... fill-and-stroke-alpha-add.quartz.ref.png} |  Bin
 ....png => fill-and-stroke-alpha-add.ref.png} |  Bin
 ...g => fill-and-stroke-alpha.quartz.ref.png} |  Bin
 ...-ref.png => fill-and-stroke-alpha.ref.png} |  Bin
 ...png => fill-and-stroke.ps2.argb32.ref.png} |  Bin
 ....png => fill-and-stroke.ps2.rgb24.ref.png} |  Bin
 ...png => fill-and-stroke.ps3.argb32.ref.png} |  Bin
 ....png => fill-and-stroke.ps3.rgb24.ref.png} |  Bin
 ...ref.png => fill-and-stroke.quartz.ref.png} |  Bin
 ...g => fill-and-stroke.quartz.rgb24.ref.png} |  Bin
 ...stroke-ref.png => fill-and-stroke.ref.png} |  Bin
 ...-ref.png => fill-and-stroke.rgb24.ref.png} |  Bin
 ...fill-degenerate-sort-order.quartz.ref.png} |  Bin
 ...egenerate-sort-order.quartz.rgb24.ref.png} |  Bin
 ...png => fill-degenerate-sort-order.ref.png} |  Bin
 ... fill-degenerate-sort-order.rgb24.ref.png} |  Bin
 ...ng => fill-missed-stop.ps2.argb32.ref.png} |  Bin
 ...png => fill-missed-stop.ps2.rgb24.ref.png} |  Bin
 ...ng => fill-missed-stop.ps3.argb32.ref.png} |  Bin
 ...png => fill-missed-stop.ps3.rgb24.ref.png} |  Bin
 ...-stop-ref.png => fill-missed-stop.ref.png} |  Bin
 ...ref.png => fill-missed-stop.rgb24.ref.png} |  Bin
 ...2-ref.png => fill-rule.ps2.argb32.ref.png} |  Bin
 ...24-ref.png => fill-rule.ps2.rgb24.ref.png} |  Bin
 ...2-ref.png => fill-rule.ps3.argb32.ref.png} |  Bin
 ...24-ref.png => fill-rule.ps3.rgb24.ref.png} |  Bin
 ...uartz-ref.png => fill-rule.quartz.ref.png} |  Bin
 ...ref.png => fill-rule.quartz.rgb24.ref.png} |  Bin
 test/{fill-rule-ref.png => fill-rule.ref.png} |  Bin
 ...-rgb24-ref.png => fill-rule.rgb24.ref.png} |  Bin
 ...ng => filter-bilinear-extents.pdf.ref.png} |  Bin
 ...ng => filter-bilinear-extents.ps2.ref.png} |  Bin
 ...ng => filter-bilinear-extents.ps3.ref.png} |  Bin
 ...ef.png => filter-bilinear-extents.ref.png} |  Bin
 ....png => filter-nearest-offset.pdf.ref.png} |  Bin
 ....png => filter-nearest-offset.ps2.ref.png} |  Bin
 ....png => filter-nearest-offset.ps3.ref.png} |  Bin
 ...-ref.png => filter-nearest-offset.ref.png} |  Bin
 ...ng => filter-nearest-offset.svg11.ref.png} |  Bin
 ...ng => filter-nearest-offset.svg12.ref.png} |  Bin
 ...=> filter-nearest-transformed.pdf.ref.png} |  Bin
 ...png => filter-nearest-transformed.ref.png} |  Bin
 ... filter-nearest-transformed.svg11.ref.png} |  Bin
 ... filter-nearest-transformed.svg12.ref.png} |  Bin
 ...ng => finer-grained-fallbacks.ps2.ref.png} |  Bin
 ...finer-grained-fallbacks.ps2.rgb24.ref.png} |  Bin
 ...ng => finer-grained-fallbacks.ps3.ref.png} |  Bin
 ...finer-grained-fallbacks.ps3.rgb24.ref.png} |  Bin
 ...ef.png => finer-grained-fallbacks.ref.png} |  Bin
 ... => finer-grained-fallbacks.rgb24.ref.png} |  Bin
 ...ont-matrix-translation.ps2.argb32.ref.png} |  Bin
 ...font-matrix-translation.ps2.rgb24.ref.png} |  Bin
 ...ont-matrix-translation.ps3.argb32.ref.png} |  Bin
 ...font-matrix-translation.ps3.rgb24.ref.png} |  Bin
 ...=> font-matrix-translation.quartz.ref.png} |  Bin
 ...ef.png => font-matrix-translation.ref.png} |  Bin
 ... => font-matrix-translation.svg11.ref.png} |  Bin
 ... => font-matrix-translation.svg12.ref.png} |  Bin
 ...=> ft-show-glyphs-positioning.pdf.ref.png} |  Bin
 ...=> ft-show-glyphs-positioning.ps2.ref.png} |  Bin
 ...=> ft-show-glyphs-positioning.ps3.ref.png} |  Bin
 ...png => ft-show-glyphs-positioning.ref.png} |  Bin
 ... ft-show-glyphs-positioning.svg11.ref.png} |  Bin
 ... ft-show-glyphs-positioning.svg12.ref.png} |  Bin
 ...f.png => ft-show-glyphs-table.ps2.ref.png} |  Bin
 ...f.png => ft-show-glyphs-table.ps3.ref.png} |  Bin
 ...e-ref.png => ft-show-glyphs-table.ref.png} |  Bin
 ...ft-text-antialias-none.ps2.argb32.ref.png} |  Bin
 ...ft-text-antialias-none.ps3.argb32.ref.png} |  Bin
 ...ref.png => ft-text-antialias-none.ref.png} |  Bin
 ...ft-text-vertical-layout-type1.pdf.ref.png} |  Bin
 ...ft-text-vertical-layout-type1.ps2.ref.png} |  Bin
 ...ft-text-vertical-layout-type1.ps3.ref.png} |  Bin
 ... => ft-text-vertical-layout-type1.ref.png} |  Bin
 ...-text-vertical-layout-type1.svg11.ref.png} |  Bin
 ...-text-vertical-layout-type1.svg12.ref.png} |  Bin
 ...ft-text-vertical-layout-type3.pdf.ref.png} |  Bin
 ...ft-text-vertical-layout-type3.ps2.ref.png} |  Bin
 ...ft-text-vertical-layout-type3.ps3.ref.png} |  Bin
 ... => ft-text-vertical-layout-type3.ref.png} |  Bin
 ...-text-vertical-layout-type3.svg11.ref.png} |  Bin
 ...-text-vertical-layout-type3.svg12.ref.png} |  Bin
 ...arget-ref.png => get-group-target.ref.png} |  Bin
 ...e-ref.png => glitz-surface-source.ref.png} |  Bin
 ...f.png => glyph-cache-pressure.ps2.ref.png} |  Bin
 ...f.png => glyph-cache-pressure.ps3.ref.png} |  Bin
 ...ng => glyph-cache-pressure.quartz.ref.png} |  Bin
 ...e-ref.png => glyph-cache-pressure.ref.png} |  Bin
 ....png => gradient-alpha.pdf.argb32.ref.png} |  Bin
 ...f.png => gradient-alpha.pdf.rgb24.ref.png} |  Bin
 ....png => gradient-alpha.ps2.argb32.ref.png} |  Bin
 ...f.png => gradient-alpha.ps2.rgb24.ref.png} |  Bin
 ....png => gradient-alpha.ps3.argb32.ref.png} |  Bin
 ...f.png => gradient-alpha.ps3.rgb24.ref.png} |  Bin
 ...t-alpha-ref.png => gradient-alpha.ref.png} |  Bin
 ...4-ref.png => gradient-alpha.rgb24.ref.png} |  Bin
 ...radient-constant-alpha.pdf.argb32.ref.png} |  Bin
 ...gradient-constant-alpha.pdf.rgb24.ref.png} |  Bin
 ...ng => gradient-constant-alpha.ps3.ref.png} |  Bin
 ...gradient-constant-alpha.ps3.rgb24.ref.png} |  Bin
 ...ef.png => gradient-constant-alpha.ref.png} |  Bin
 ... => gradient-constant-alpha.rgb24.ref.png} |  Bin
 ...ps-ref.png => gradient-zero-stops.ref.png} |  Bin
 ....png => gradient-zero-stops.rgb24.ref.png} |  Bin
 ...roup-paint-ref.png => group-paint.ref.png} |  Bin
 ...n-pdf-ref.png => huge-pattern.pdf.ref.png} |  Bin
 ...ref.png => huge-pattern.pdf.rgb24.ref.png} |  Bin
 ...n-ps3-ref.png => huge-pattern.ps3.ref.png} |  Bin
 ...e-pattern-ref.png => huge-pattern.ref.png} |  Bin
 ...f.png => image-surface-source.ps2.ref.png} |  Bin
 ...f.png => image-surface-source.ps3.ref.png} |  Bin
 ...e-ref.png => image-surface-source.ref.png} |  Bin
 ...-ps2-ref.png => infinite-join.ps2.ref.png} |  Bin
 ...-ps3-ref.png => infinite-join.ps3.ref.png} |  Bin
 ...ite-join-ref.png => infinite-join.ref.png} |  Bin
 ...{large-clip-ref.png => large-clip.ref.png} |  Bin
 ...{large-font-ref.png => large-font.ref.png} |  Bin
 ...ge-source-ref.png => large-source.ref.png} |  Bin
 ...-ref.png => leaky-dash.ps2.argb32.ref.png} |  Bin
 ...4-ref.png => leaky-dash.ps2.rgb24.ref.png} |  Bin
 ...-ref.png => leaky-dash.ps3.argb32.ref.png} |  Bin
 ...4-ref.png => leaky-dash.ps3.rgb24.ref.png} |  Bin
 ...artz-ref.png => leaky-dash.quartz.ref.png} |  Bin
 ...{leaky-dash-ref.png => leaky-dash.ref.png} |  Bin
 ...png => leaky-dashed-rectangle.ps2.ref.png} |  Bin
 ...png => leaky-dashed-rectangle.ps3.ref.png} |  Bin
 ...ref.png => leaky-dashed-rectangle.ref.png} |  Bin
 ...ef.png => leaky-dashed-stroke.ps2.ref.png} |  Bin
 ...ef.png => leaky-dashed-stroke.ps3.ref.png} |  Bin
 ...ke-ref.png => leaky-dashed-stroke.ref.png} |  Bin
 ...-ps2-ref.png => leaky-polygon.ps2.ref.png} |  Bin
 ...-ps3-ref.png => leaky-polygon.ps3.ref.png} |  Bin
 ...-polygon-ref.png => leaky-polygon.ref.png} |  Bin
 ...2-ref.png => line-width-scale.ps2.ref.png} |  Bin
 ...3-ref.png => line-width-scale.ps3.ref.png} |  Bin
 ...ef.png => line-width-scale.quartz.ref.png} |  Bin
 ...scale-ref.png => line-width-scale.ref.png} |  Bin
 ...{line-width-ref.png => line-width.ref.png} |  Bin
 ...inear-gradient-reflect.pdf.argb32.ref.png} |  Bin
 ...linear-gradient-reflect.pdf.rgb24.ref.png} |  Bin
 ...ng => linear-gradient-reflect.ps3.ref.png} |  Bin
 ...=> linear-gradient-reflect.quartz.ref.png} |  Bin
 ...ef.png => linear-gradient-reflect.ref.png} |  Bin
 ...df-ref.png => linear-gradient.pdf.ref.png} |  Bin
 ...s3-ref.png => linear-gradient.ps3.ref.png} |  Bin
 ...ref.png => linear-gradient.quartz.ref.png} |  Bin
 ...adient-ref.png => linear-gradient.ref.png} |  Bin
 ...-ref.png => linear-gradient.svg11.ref.png} |  Bin
 ...-ref.png => linear-gradient.svg12.ref.png} |  Bin
 ...-ref.png => long-dashed-lines.ps2.ref.png} |  Bin
 ...-ref.png => long-dashed-lines.ps3.ref.png} |  Bin
 ...f.png => long-dashed-lines.quartz.ref.png} |  Bin
 ...ines-ref.png => long-dashed-lines.ref.png} |  Bin
 ...{long-lines-ref.png => long-lines.ref.png} |  Bin
 ...f.png => mask-alpha.quartz.argb32.ref.png} |  Bin
 ...{mask-alpha-ref.png => mask-alpha.ref.png} |  Bin
 ...rgb24-ref.png => mask-alpha.rgb24.ref.png} |  Bin
 ...ef.png => mask-alpha.svg11.argb32.ref.png} |  Bin
 ...ef.png => mask-alpha.svg12.argb32.ref.png} |  Bin
 test/{mask-ctm-ref.png => mask-ctm.ref.png}   |  Bin
 ...m-rgb24-ref.png => mask-ctm.rgb24.ref.png} |  Bin
 ...-ref.png => mask-ctm.svg11.argb32.ref.png} |  Bin
 ...-ref.png => mask-ctm.svg12.argb32.ref.png} |  Bin
 ...e-ctm-ref.png => mask-surface-ctm.ref.png} |  Bin
 ...ref.png => mask-surface-ctm.rgb24.ref.png} |  Bin
 ... => mask-surface-ctm.svg11.argb32.ref.png} |  Bin
 ... => mask-surface-ctm.svg12.argb32.ref.png} |  Bin
 ...ref.png => mask-transformed-image.ref.png} |  Bin
 ...g => mask-transformed-similar.pdf.ref.png} |  Bin
 ...f.png => mask-transformed-similar.ref.png} |  Bin
 ...=> mask-transformed-similar.svg11.ref.png} |  Bin
 ...=> mask-transformed-similar.svg12.ref.png} |  Bin
 ...argb32-ref.png => mask.pdf.argb32.ref.png} |  Bin
 ...f-rgb24-ref.png => mask.pdf.rgb24.ref.png} |  Bin
 ...ask-quartz-ref.png => mask.quartz.ref.png} |  Bin
 ...gb24-ref.png => mask.quartz.rgb24.ref.png} |  Bin
 test/{mask-ref.png => mask.ref.png}           |  Bin
 ...{mask-rgb24-ref.png => mask.rgb24.ref.png} |  Bin
 ...gb32-ref.png => mask.svg11.argb32.ref.png} |  Bin
 ...rgb24-ref.png => mask.svg11.rgb24.ref.png} |  Bin
 ...gb32-ref.png => mask.svg12.argb32.ref.png} |  Bin
 ...rgb24-ref.png => mask.svg12.rgb24.ref.png} |  Bin
 ...f.png => meta-surface-pattern.pdf.ref.png} |  Bin
 ...=> meta-surface-pattern.pdf.rgb24.ref.png} |  Bin
 ...> meta-surface-pattern.ps2.argb32.ref.png} |  Bin
 ...=> meta-surface-pattern.ps2.rgb24.ref.png} |  Bin
 ...> meta-surface-pattern.ps3.argb32.ref.png} |  Bin
 ...=> meta-surface-pattern.ps3.rgb24.ref.png} |  Bin
 ...ng => meta-surface-pattern.quartz.ref.png} |  Bin
 ...meta-surface-pattern.quartz.rgb24.ref.png} |  Bin
 ...n-ref.png => meta-surface-pattern.ref.png} |  Bin
 ...png => meta-surface-pattern.rgb24.ref.png} |  Bin
 ...meta-surface-pattern.svg11.argb32.ref.png} |  Bin
 ... meta-surface-pattern.svg11.rgb24.ref.png} |  Bin
 ...meta-surface-pattern.svg12.argb32.ref.png} |  Bin
 ... meta-surface-pattern.svg12.rgb24.ref.png} |  Bin
 ...s2-ref.png => miter-precision.ps2.ref.png} |  Bin
 ...s3-ref.png => miter-precision.ps3.ref.png} |  Bin
 ...cision-ref.png => miter-precision.ref.png} |  Bin
 ...e-ref.png => move-to-show-surface.ref.png} |  Bin
 test/multi-page.c                             |    4 +-
 ...ef.png => new-sub-path.ps2.argb32.ref.png} |  Bin
 ...ref.png => new-sub-path.ps2.rgb24.ref.png} |  Bin
 ...ef.png => new-sub-path.ps3.argb32.ref.png} |  Bin
 ...ref.png => new-sub-path.ps3.rgb24.ref.png} |  Bin
 ...tz-ref.png => new-sub-path.quartz.ref.png} |  Bin
 ....png => new-sub-path.quartz.rgb24.ref.png} |  Bin
 ...-sub-path-ref.png => new-sub-path.ref.png} |  Bin
 ...b24-ref.png => new-sub-path.rgb24.ref.png} |  Bin
 ...il-surface-ref.png => nil-surface.ref.png} |  Bin
 ...gb24-ref.png => nil-surface.rgb24.ref.png} |  Bin
 ...r-alpha-ref.png => operator-alpha.ref.png} |  Bin
 ...4-ref.png => operator-alpha.rgb24.ref.png} |  Bin
 ....png => operator-clear.pdf.argb32.ref.png} |  Bin
 ...f.png => operator-clear.pdf.rgb24.ref.png} |  Bin
 ...-ref.png => operator-clear.quartz.ref.png} |  Bin
 ...ng => operator-clear.quartz.rgb24.ref.png} |  Bin
 ...r-clear-ref.png => operator-clear.ref.png} |  Bin
 ...4-ref.png => operator-clear.rgb24.ref.png} |  Bin
 ...png => operator-source.pdf.argb32.ref.png} |  Bin
 ....png => operator-source.pdf.rgb24.ref.png} |  Bin
 ...ref.png => operator-source.quartz.ref.png} |  Bin
 ...g => operator-source.quartz.rgb24.ref.png} |  Bin
 ...source-ref.png => operator-source.ref.png} |  Bin
 ...-ref.png => operator-source.rgb24.ref.png} |  Bin
 test/{operator-ref.png => operator.ref.png}   |  Bin
 ...r-rgb24-ref.png => operator.rgb24.ref.png} |  Bin
 ...g => over-above-source.ps2.argb32.ref.png} |  Bin
 ...g => over-above-source.ps3.argb32.ref.png} |  Bin
 ...f.png => over-above-source.quartz.ref.png} |  Bin
 ...=> over-above-source.quartz.rgb24.ref.png} |  Bin
 ...urce-ref.png => over-above-source.ref.png} |  Bin
 ...ef.png => over-above-source.rgb24.ref.png} |  Bin
 ... => over-around-source.ps2.argb32.ref.png} |  Bin
 ...g => over-around-source.ps2.rgb24.ref.png} |  Bin
 ... => over-around-source.ps3.argb32.ref.png} |  Bin
 ...g => over-around-source.ps3.rgb24.ref.png} |  Bin
 ....png => over-around-source.quartz.ref.png} |  Bin
 ...> over-around-source.quartz.rgb24.ref.png} |  Bin
 ...rce-ref.png => over-around-source.ref.png} |  Bin
 ...f.png => over-around-source.rgb24.ref.png} |  Bin
 ...g => over-below-source.ps2.argb32.ref.png} |  Bin
 ...g => over-below-source.ps3.argb32.ref.png} |  Bin
 ...urce-ref.png => over-below-source.ref.png} |  Bin
 ...ef.png => over-below-source.rgb24.ref.png} |  Bin
 ...=> over-between-source.ps2.argb32.ref.png} |  Bin
 ...=> over-between-source.ps3.argb32.ref.png} |  Bin
 ...png => over-between-source.quartz.ref.png} |  Bin
 ... over-between-source.quartz.rgb24.ref.png} |  Bin
 ...ce-ref.png => over-between-source.ref.png} |  Bin
 ....png => over-between-source.rgb24.ref.png} |  Bin
 ...nt-repeat-ref.png => paint-repeat.ref.png} |  Bin
 ... => paint-source-alpha.pdf.argb32.ref.png} |  Bin
 ...ref.png => paint-source-alpha.pdf.ref.png} |  Bin
 ...pha-ref.png => paint-source-alpha.ref.png} |  Bin
 ...f.png => paint-source-alpha.svg11.ref.png} |  Bin
 ...f.png => paint-source-alpha.svg12.ref.png} |  Bin
 ...f-ref.png => paint-with-alpha.pdf.ref.png} |  Bin
 ...alpha-ref.png => paint-with-alpha.ref.png} |  Bin
 ...ref.png => paint-with-alpha.svg11.ref.png} |  Bin
 ...ref.png => paint-with-alpha.svg12.ref.png} |  Bin
 test/{paint-ref.png => paint.ref.png}         |  Bin
 ...s-through-ref.png => pass-through.ref.png} |  Bin
 ...b24-ref.png => pass-through.rgb24.ref.png} |  Bin
 ...etters-ref.png => pattern-getters.ref.png} |  Bin
 test/pdf-features.c                           |    2 +-
 test/pdf-surface-source.c                     |    2 +-
 ...rce-ref.png => pdf-surface-source.ref.png} |  Bin
 ...n-rotate-ref.png => pixman-rotate.ref.png} |  Bin
 ...24-ref.png => pixman-rotate.rgb24.ref.png} |  Bin
 test/png.c                                    |    2 +-
 test/ps-features.c                            |    2 +-
 test/ps-surface-source.c                      |    2 +-
 ...urce-ref.png => ps-surface-source.ref.png} |  Bin
 ...oup-pdf-ref.png => push-group.pdf.ref.png} |  Bin
 ...4-ref.png => push-group.pdf.rgb24.ref.png} |  Bin
 ...{push-group-ref.png => push-group.ref.png} |  Bin
 ...rgb24-ref.png => push-group.rgb24.ref.png} |  Bin
 ...ef.png => push-group.svg11.argb32.ref.png} |  Bin
 ...ef.png => push-group.svg12.argb32.ref.png} |  Bin
 ...df-ref.png => radial-gradient.pdf.ref.png} |  Bin
 ...ref.png => radial-gradient.quartz.ref.png} |  Bin
 ...adient-ref.png => radial-gradient.ref.png} |  Bin
 ...-ref.png => radial-gradient.svg11.ref.png} |  Bin
 ...-ref.png => radial-gradient.svg12.ref.png} |  Bin
 ...f.png => random-intersections.ps2.ref.png} |  Bin
 ...f.png => random-intersections.ps3.ref.png} |  Bin
 ...ng => random-intersections.quartz.ref.png} |  Bin
 ...s-ref.png => random-intersections.ref.png} |  Bin
 ...f.png => rectangle-rounding-error.ref.png} |  Bin
 ...-fill-ref.png => rectilinear-fill.ref.png} |  Bin
 ...ng => rectilinear-miter-limit.ps2.ref.png} |  Bin
 ...ng => rectilinear-miter-limit.ps3.ref.png} |  Bin
 ...ef.png => rectilinear-miter-limit.ref.png} |  Bin
 ...oke-ref.png => rectilinear-stroke.ref.png} |  Bin
 ...2-ref.png => reflected-stroke.ps2.ref.png} |  Bin
 ...3-ref.png => reflected-stroke.ps3.ref.png} |  Bin
 ...ef.png => reflected-stroke.quartz.ref.png} |  Bin
 ...troke-ref.png => reflected-stroke.ref.png} |  Bin
 ...b24-ref.png => rel-path.ps2.rgb24.ref.png} |  Bin
 ...b24-ref.png => rel-path.ps3.rgb24.ref.png} |  Bin
 ...quartz-ref.png => rel-path.quartz.ref.png} |  Bin
 ...-ref.png => rel-path.quartz.rgb24.ref.png} |  Bin
 test/{rel-path-ref.png => rel-path.ref.png}   |  Bin
 ...h-rgb24-ref.png => rel-path.rgb24.ref.png} |  Bin
 ...pha-ref.png => rgb24-ignore-alpha.ref.png} |  Bin
 ...te-image-surface-paint.pdf.argb32.ref.png} |  Bin
 ...ate-image-surface-paint.pdf.rgb24.ref.png} |  Bin
 ...=> rotate-image-surface-paint.ps2.ref.png} |  Bin
 ...=> rotate-image-surface-paint.ps3.ref.png} |  Bin
 ...rotate-image-surface-paint.quartz.ref.png} |  Bin
 ...png => rotate-image-surface-paint.ref.png} |  Bin
 ... rotate-image-surface-paint.svg11.ref.png} |  Bin
 ... rotate-image-surface-paint.svg12.ref.png} |  Bin
 ...> scale-down-source-surface-paint.ref.png} |  Bin
 ...e-source-surface-paint.pdf.argb32.ref.png} |  Bin
 ...le-source-surface-paint.pdf.rgb24.ref.png} |  Bin
 ...png => scale-source-surface-paint.ref.png} |  Bin
 ... scale-source-surface-paint.rgb24.ref.png} |  Bin
 ...source-surface-paint.svg11.argb32.ref.png} |  Bin
 ...-source-surface-paint.svg11.rgb24.ref.png} |  Bin
 ...source-surface-paint.svg12.argb32.ref.png} |  Bin
 ...-source-surface-paint.svg12.rgb24.ref.png} |  Bin
 ...2-ref.png => select-font-face.ps2.ref.png} |  Bin
 ...3-ref.png => select-font-face.ps3.ref.png} |  Bin
 ...ef.png => select-font-face.quartz.ref.png} |  Bin
 ...-face-ref.png => select-font-face.ref.png} |  Bin
 ...rlap-ref.png => self-copy-overlap.ref.png} |  Bin
 ...ef.png => self-copy-overlap.rgb24.ref.png} |  Bin
 ...copy-ps2-ref.png => self-copy.ps2.ref.png} |  Bin
 ...copy-ps3-ref.png => self-copy.ps3.ref.png} |  Bin
 test/{self-copy-ref.png => self-copy.ref.png} |  Bin
 ...ting-ref.png => self-intersecting.ref.png} |  Bin
 ...ef.png => self-intersecting.rgb24.ref.png} |  Bin
 ...{set-source-ref.png => set-source.ref.png} |  Bin
 ...rgb24-ref.png => set-source.rgb24.ref.png} |  Bin
 ...ef.png => set-source.svg11.argb32.ref.png} |  Bin
 ...ef.png => set-source.svg12.argb32.ref.png} |  Bin
 ...-many-ref.png => show-glyphs-many.ref.png} |  Bin
 ...ng => show-text-current-point.ps2.ref.png} |  Bin
 ...ng => show-text-current-point.ps3.ref.png} |  Bin
 ...=> show-text-current-point.quartz.ref.png} |  Bin
 ...ef.png => show-text-current-point.ref.png} |  Bin
 ...e-ps2-ref.png => skew-extreme.ps2.ref.png} |  Bin
 ...e-ps3-ref.png => skew-extreme.ps3.ref.png} |  Bin
 ...w-extreme-ref.png => skew-extreme.ref.png} |  Bin
 ...ill-pdf-ref.png => smask-fill.pdf.ref.png} |  Bin
 ...{smask-fill-ref.png => smask-fill.ref.png} |  Bin
 ...svg11-ref.png => smask-fill.svg11.ref.png} |  Bin
 ...svg12-ref.png => smask-fill.svg12.ref.png} |  Bin
 ...f-ref.png => smask-image-mask.pdf.ref.png} |  Bin
 ...-mask-ref.png => smask-image-mask.ref.png} |  Bin
 ...ask-pdf-ref.png => smask-mask.pdf.ref.png} |  Bin
 ...{smask-mask-ref.png => smask-mask.ref.png} |  Bin
 ...svg11-ref.png => smask-mask.svg11.ref.png} |  Bin
 ...svg12-ref.png => smask-mask.svg12.ref.png} |  Bin
 ...nt-pdf-ref.png => smask-paint.pdf.ref.png} |  Bin
 ...mask-paint-ref.png => smask-paint.ref.png} |  Bin
 ...vg11-ref.png => smask-paint.svg11.ref.png} |  Bin
 ...vg12-ref.png => smask-paint.svg12.ref.png} |  Bin
 ...e-pdf-ref.png => smask-stroke.pdf.ref.png} |  Bin
 ...sk-stroke-ref.png => smask-stroke.ref.png} |  Bin
 ...ext-pdf-ref.png => smask-text.pdf.ref.png} |  Bin
 ...ext-ps2-ref.png => smask-text.ps2.ref.png} |  Bin
 ...ext-ps3-ref.png => smask-text.ps3.ref.png} |  Bin
 ...{smask-text-ref.png => smask-text.ref.png} |  Bin
 ...svg11-ref.png => smask-text.svg11.ref.png} |  Bin
 ...svg12-ref.png => smask-text.svg12.ref.png} |  Bin
 test/{smask-pdf-ref.png => smask.pdf.ref.png} |  Bin
 test/{smask-ps2-ref.png => smask.ps2.ref.png} |  Bin
 test/{smask-ps3-ref.png => smask.ps3.ref.png} |  Bin
 test/{smask-ref.png => smask.ref.png}         |  Bin
 ...mask-svg11-ref.png => smask.svg11.ref.png} |  Bin
 ...mask-svg12-ref.png => smask.svg12.ref.png} |  Bin
 ...png => solid-pattern-cache-stress.ref.png} |  Bin
 ...-ref.png => source-clip-scale.pdf.ref.png} |  Bin
 ...g => source-clip-scale.ps2.argb32.ref.png} |  Bin
 ...ng => source-clip-scale.ps2.rgb24.ref.png} |  Bin
 ...g => source-clip-scale.ps3.argb32.ref.png} |  Bin
 ...ng => source-clip-scale.ps3.rgb24.ref.png} |  Bin
 ...f.png => source-clip-scale.quartz.ref.png} |  Bin
 ...cale-ref.png => source-clip-scale.ref.png} |  Bin
 ...ef.png => source-clip-scale.svg11.ref.png} |  Bin
 ...ef.png => source-clip-scale.svg12.ref.png} |  Bin
 ...ource-clip-ref.png => source-clip.ref.png} |  Bin
 ...png => source-surface-scale-paint.ref.png} |  Bin
 ... source-surface-scale-paint.rgb24.ref.png} |  Bin
 ...f.png => spline-decomposition.pdf.ref.png} |  Bin
 ...f.png => spline-decomposition.ps2.ref.png} |  Bin
 ...f.png => spline-decomposition.ps3.ref.png} |  Bin
 ...n-ref.png => spline-decomposition.ref.png} |  Bin
 ...png => spline-decomposition.svg11.ref.png} |  Bin
 ...png => spline-decomposition.svg12.ref.png} |  Bin
 ...s2-ref.png => stroke-ctm-caps.ps2.ref.png} |  Bin
 ...s3-ref.png => stroke-ctm-caps.ps3.ref.png} |  Bin
 ...ref.png => stroke-ctm-caps.quartz.ref.png} |  Bin
 ...m-caps-ref.png => stroke-ctm-caps.ref.png} |  Bin
 ...e-pdf-ref.png => stroke-image.pdf.ref.png} |  Bin
 ...e-ps2-ref.png => stroke-image.ps2.ref.png} |  Bin
 ...e-ps3-ref.png => stroke-image.ps3.ref.png} |  Bin
 ...tz-ref.png => stroke-image.quartz.ref.png} |  Bin
 ...oke-image-ref.png => stroke-image.ref.png} |  Bin
 ...=> surface-pattern-big-scale-down.ref.png} |  Bin
 ...ace-pattern-scale-down.pdf.argb32.ref.png} |  Bin
 ...face-pattern-scale-down.pdf.rgb24.ref.png} |  Bin
 ...=> surface-pattern-scale-down.ps2.ref.png} |  Bin
 ...=> surface-pattern-scale-down.ps3.ref.png} |  Bin
 ...surface-pattern-scale-down.quartz.ref.png} |  Bin
 ...png => surface-pattern-scale-down.ref.png} |  Bin
 ...rface-pattern-scale-up.pdf.argb32.ref.png} |  Bin
 ...urface-pattern-scale-up.pdf.rgb24.ref.png} |  Bin
 ...g => surface-pattern-scale-up.ps2.ref.png} |  Bin
 ...g => surface-pattern-scale-up.ps3.ref.png} |  Bin
 ...f.png => surface-pattern-scale-up.ref.png} |  Bin
 ...df-ref.png => surface-pattern.pdf.ref.png} |  Bin
 ...s2-ref.png => surface-pattern.ps2.ref.png} |  Bin
 ...s3-ref.png => surface-pattern.ps3.ref.png} |  Bin
 ...attern-ref.png => surface-pattern.ref.png} |  Bin
 ...-ref.png => surface-pattern.svg11.ref.png} |  Bin
 ...-ref.png => surface-pattern.svg12.ref.png} |  Bin
 test/svg-clip.c                               |    2 +-
 test/svg-surface-source.c                     |    2 +-
 ...rce-ref.png => svg-surface-source.ref.png} |  Bin
 test/svg-surface.c                            |    2 +-
 ...png => text-antialias-gray.quartz.ref.png} |  Bin
 ...ay-ref.png => text-antialias-gray.ref.png} |  Bin
 ...png => text-antialias-none.quartz.ref.png} |  Bin
 ...ne-ref.png => text-antialias-none.ref.png} |  Bin
 ...=> text-antialias-subpixel.quartz.ref.png} |  Bin
 ...ef.png => text-antialias-subpixel.ref.png} |  Bin
 ...2-ref.png => text-glyph-range.ps2.ref.png} |  Bin
 ...3-ref.png => text-glyph-range.ps3.ref.png} |  Bin
 ...range-ref.png => text-glyph-range.ref.png} |  Bin
 ...ef.png => text-pattern.pdf.argb32.ref.png} |  Bin
 ...ref.png => text-pattern.pdf.rgb24.ref.png} |  Bin
 ...ef.png => text-pattern.ps3.argb32.ref.png} |  Bin
 ...ref.png => text-pattern.ps3.rgb24.ref.png} |  Bin
 ...tz-ref.png => text-pattern.quartz.ref.png} |  Bin
 ....png => text-pattern.quartz.rgb24.ref.png} |  Bin
 ...t-pattern-ref.png => text-pattern.ref.png} |  Bin
 ...b24-ref.png => text-pattern.rgb24.ref.png} |  Bin
 ....png => text-pattern.svg11.argb32.ref.png} |  Bin
 ...f.png => text-pattern.svg11.rgb24.ref.png} |  Bin
 ....png => text-pattern.svg12.argb32.ref.png} |  Bin
 ...f.png => text-pattern.svg12.rgb24.ref.png} |  Bin
 ...te-pdf-ref.png => text-rotate.pdf.ref.png} |  Bin
 ...te-ps2-ref.png => text-rotate.ps2.ref.png} |  Bin
 ...te-ps3-ref.png => text-rotate.ps3.ref.png} |  Bin
 ...rtz-ref.png => text-rotate.quartz.ref.png} |  Bin
 ...ext-rotate-ref.png => text-rotate.ref.png} |  Bin
 ...vg11-ref.png => text-rotate.svg11.ref.png} |  Bin
 ...vg12-ref.png => text-rotate.svg12.ref.png} |  Bin
 ...pdf-ref.png => text-transform.pdf.ref.png} |  Bin
 ...ps2-ref.png => text-transform.ps2.ref.png} |  Bin
 ...ps3-ref.png => text-transform.ps3.ref.png} |  Bin
 ...ansform-ref.png => text-transform.ref.png} |  Bin
 ...rms-ps2-ref.png => transforms.ps2.ref.png} |  Bin
 ...rms-ps3-ref.png => transforms.ps3.ref.png} |  Bin
 ...{transforms-ref.png => transforms.ref.png} |  Bin
 ...ref.png => translate-show-surface.ref.png} |  Bin
 ...2-ref.png => trap-clip.pdf.argb32.ref.png} |  Bin
 ...24-ref.png => trap-clip.pdf.rgb24.ref.png} |  Bin
 ...2-ref.png => trap-clip.ps2.argb32.ref.png} |  Bin
 ...24-ref.png => trap-clip.ps2.rgb24.ref.png} |  Bin
 ...2-ref.png => trap-clip.ps3.argb32.ref.png} |  Bin
 ...24-ref.png => trap-clip.ps3.rgb24.ref.png} |  Bin
 ...uartz-ref.png => trap-clip.quartz.ref.png} |  Bin
 ...ref.png => trap-clip.quartz.rgb24.ref.png} |  Bin
 test/{trap-clip-ref.png => trap-clip.ref.png} |  Bin
 ...-rgb24-ref.png => trap-clip.rgb24.ref.png} |  Bin
 test/{twin-ps2-ref.png => twin.ps2.ref.png}   |  Bin
 test/{twin-ps3-ref.png => twin.ps3.ref.png}   |  Bin
 test/{twin-ref.png => twin.ref.png}           |  Bin
 ...{twin-svg11-ref.png => twin.svg11.ref.png} |  Bin
 ...{twin-svg12-ref.png => twin.svg12.ref.png} |  Bin
 ...ng => unantialiased-shapes.quartz.ref.png} |  Bin
 ...s-ref.png => unantialiased-shapes.ref.png} |  Bin
 ....png => unbounded-operator.quartz.ref.png} |  Bin
 ...> unbounded-operator.quartz.rgb24.ref.png} |  Bin
 ...tor-ref.png => unbounded-operator.ref.png} |  Bin
 ...f.png => unbounded-operator.rgb24.ref.png} |  Bin
 ...pdf-ref.png => user-font-mask.pdf.ref.png} |  Bin
 ...ps2-ref.png => user-font-mask.ps2.ref.png} |  Bin
 ...ps3-ref.png => user-font-mask.ps3.ref.png} |  Bin
 ...nt-mask-ref.png => user-font-mask.ref.png} |  Bin
 ...1-ref.png => user-font-mask.svg11.ref.png} |  Bin
 ...df-ref.png => user-font-proxy.pdf.ref.png} |  Bin
 ...s2-ref.png => user-font-proxy.ps2.ref.png} |  Bin
 ...s3-ref.png => user-font-proxy.ps3.ref.png} |  Bin
 ...-proxy-ref.png => user-font-proxy.ref.png} |  Bin
 ...-ref.png => user-font-proxy.svg11.ref.png} |  Bin
 ...-ref.png => user-font-proxy.svg12.ref.png} |  Bin
 ...-ref.png => user-font-rescale.ps2.ref.png} |  Bin
 ...-ref.png => user-font-rescale.ps3.ref.png} |  Bin
 ...cale-ref.png => user-font-rescale.ref.png} |  Bin
 ...ef.png => user-font-rescale.svg11.ref.png} |  Bin
 ...ef.png => user-font-rescale.svg12.ref.png} |  Bin
 ...font-ps2-ref.png => user-font.ps2.ref.png} |  Bin
 ...font-ps3-ref.png => user-font.ps3.ref.png} |  Bin
 test/{user-font-ref.png => user-font.ref.png} |  Bin
 ...-svg11-ref.png => user-font.svg11.ref.png} |  Bin
 ...-svg12-ref.png => user-font.svg12.ref.png} |  Bin
 test/xlib-expose-event.c                      |    4 +-
 ...vent-ref.png => xlib-expose-event.ref.png} |  Bin
 ...ef.png => xlib-surface-source.ps2.ref.png} |  Bin
 ...ef.png => xlib-surface-source.ps3.ref.png} |  Bin
 ...ce-ref.png => xlib-surface-source.ref.png} |  Bin
 ...{zero-alpha-ref.png => zero-alpha.ref.png} |  Bin
 715 files changed, 782 insertions(+), 752 deletions(-)
 rename test/{a1-image-sample-ref.png => a1-image-sample.ref.png} (100%)
 rename test/{a1-mask-ref.png => a1-mask.ref.png} (100%)
 rename test/{a1-traps-sample-ref.png => a1-traps-sample.ref.png} (100%)
 rename test/{a8-mask-ref.png => a8-mask.ref.png} (100%)
 rename test/{alpha-similar-ref.png => alpha-similar.ref.png} (100%)
 rename test/{alpha-similar-rgb24-ref.png => alpha-similar.rgb24.ref.png} (100%)
 rename test/{big-line-ps2-ref.png => big-line.ps2.ref.png} (100%)
 rename test/{big-line-ps2-rgb24-ref.png => big-line.ps2.rgb24.ref.png} (100%)
 rename test/{big-line-ps3-ref.png => big-line.ps3.ref.png} (100%)
 rename test/{big-line-ps3-rgb24-ref.png => big-line.ps3.rgb24.ref.png} (100%)
 rename test/{big-line-quartz-ref.png => big-line.quartz.ref.png} (100%)
 rename test/{big-line-quartz-rgb24-ref.png => big-line.quartz.rgb24.ref.png} (100%)
 rename test/{big-line-ref.png => big-line.ref.png} (100%)
 rename test/{big-line-rgb24-ref.png => big-line.rgb24.ref.png} (100%)
 rename test/{bilevel-image-ref.png => bilevel-image.ref.png} (100%)
 rename test/{bitmap-font-ref.png => bitmap-font.ref.png} (100%)
 rename test/{bitmap-font-rgb24-ref.png => bitmap-font.rgb24.ref.png} (100%)
 rename test/{caps-joins-alpha-quartz-ref.png => caps-joins-alpha.quartz.ref.png} (100%)
 rename test/{caps-joins-alpha-ref.png => caps-joins-alpha.ref.png} (100%)
 rename test/{caps-joins-alpha-svg11-ref.png => caps-joins-alpha.svg11.ref.png} (100%)
 rename test/{caps-joins-alpha-svg12-ref.png => caps-joins-alpha.svg12.ref.png} (100%)
 rename test/{caps-joins-ps2-ref.png => caps-joins.ps2.ref.png} (100%)
 rename test/{caps-joins-ps3-ref.png => caps-joins.ps3.ref.png} (100%)
 rename test/{caps-joins-ref.png => caps-joins.ref.png} (100%)
 rename test/{caps-sub-paths-ref.png => caps-sub-paths.ref.png} (100%)
 rename test/{clip-all-ref.png => clip-all.ref.png} (100%)
 rename test/{clip-empty-ref.png => clip-empty.ref.png} (100%)
 rename test/{clip-fill-rule-pixel-aligned-ref.png => clip-fill-rule-pixel-aligned.ref.png} (100%)
 rename test/{clip-fill-rule-pixel-aligned-rgb24-ref.png => clip-fill-rule-pixel-aligned.rgb24.ref.png} (100%)
 rename test/{clip-fill-rule-ps2-argb32-ref.png => clip-fill-rule.ps2.argb32.ref.png} (100%)
 rename test/{clip-fill-rule-ps2-rgb24-ref.png => clip-fill-rule.ps2.rgb24.ref.png} (100%)
 rename test/{clip-fill-rule-ps3-argb32-ref.png => clip-fill-rule.ps3.argb32.ref.png} (100%)
 rename test/{clip-fill-rule-ps3-rgb24-ref.png => clip-fill-rule.ps3.rgb24.ref.png} (100%)
 rename test/{clip-fill-rule-ref.png => clip-fill-rule.ref.png} (100%)
 rename test/{clip-fill-rule-rgb24-ref.png => clip-fill-rule.rgb24.ref.png} (100%)
 rename test/{clip-nesting-ps2-argb32-ref.png => clip-nesting.ps2.argb32.ref.png} (100%)
 rename test/{clip-nesting-ps2-rgb24-ref.png => clip-nesting.ps2.rgb24.ref.png} (100%)
 rename test/{clip-nesting-ps3-argb32-ref.png => clip-nesting.ps3.argb32.ref.png} (100%)
 rename test/{clip-nesting-ps3-rgb24-ref.png => clip-nesting.ps3.rgb24.ref.png} (100%)
 rename test/{clip-nesting-quartz-ref.png => clip-nesting.quartz.ref.png} (100%)
 rename test/{clip-nesting-quartz-rgb24-ref.png => clip-nesting.quartz.rgb24.ref.png} (100%)
 rename test/{clip-nesting-ref.png => clip-nesting.ref.png} (100%)
 rename test/{clip-nesting-rgb24-ref.png => clip-nesting.rgb24.ref.png} (100%)
 rename test/{clip-operator-pdf-argb32-ref.png => clip-operator.pdf.argb32.ref.png} (100%)
 rename test/{clip-operator-pdf-rgb24-ref.png => clip-operator.pdf.rgb24.ref.png} (100%)
 rename test/{clip-operator-ps2-rgb24-ref.png => clip-operator.ps2.rgb24.ref.png} (100%)
 rename test/{clip-operator-ps3-ref.png => clip-operator.ps3.ref.png} (100%)
 rename test/{clip-operator-ps3-rgb24-ref.png => clip-operator.ps3.rgb24.ref.png} (100%)
 rename test/{clip-operator-quartz-ref.png => clip-operator.quartz.ref.png} (100%)
 rename test/{clip-operator-quartz-rgb24-ref.png => clip-operator.quartz.rgb24.ref.png} (100%)
 rename test/{clip-operator-ref.png => clip-operator.ref.png} (100%)
 rename test/{clip-operator-rgb24-ref.png => clip-operator.rgb24.ref.png} (100%)
 rename test/{clip-push-group-ps2-argb32-ref.png => clip-push-group.ps2.argb32.ref.png} (100%)
 rename test/{clip-push-group-ps2-rgb24-ref.png => clip-push-group.ps2.rgb24.ref.png} (100%)
 rename test/{clip-push-group-ps3-argb32-ref.png => clip-push-group.ps3.argb32.ref.png} (100%)
 rename test/{clip-push-group-ps3-rgb24-ref.png => clip-push-group.ps3.rgb24.ref.png} (100%)
 rename test/{clip-push-group-quartz-ref.png => clip-push-group.quartz.ref.png} (100%)
 rename test/{clip-push-group-ref.png => clip-push-group.ref.png} (100%)
 rename test/{clip-twice-ps2-argb32-ref.png => clip-twice.ps2.argb32.ref.png} (100%)
 rename test/{clip-twice-ps2-rgb24-ref.png => clip-twice.ps2.rgb24.ref.png} (100%)
 rename test/{clip-twice-ps3-argb32-ref.png => clip-twice.ps3.argb32.ref.png} (100%)
 rename test/{clip-twice-ps3-rgb24-ref.png => clip-twice.ps3.rgb24.ref.png} (100%)
 rename test/{clip-twice-quartz-ref.png => clip-twice.quartz.ref.png} (100%)
 rename test/{clip-twice-quartz-rgb24-ref.png => clip-twice.quartz.rgb24.ref.png} (100%)
 rename test/{clip-twice-ref.png => clip-twice.ref.png} (100%)
 rename test/{clip-twice-rgb24-ref.png => clip-twice.rgb24.ref.png} (100%)
 rename test/{clipped-group-ps2-ref.png => clipped-group.ps2.ref.png} (100%)
 rename test/{clipped-group-ps3-ref.png => clipped-group.ps3.ref.png} (100%)
 rename test/{clipped-group-ref.png => clipped-group.ref.png} (100%)
 rename test/{clipped-surface-ref.png => clipped-surface.ref.png} (100%)
 rename test/{close-path-ps2-ref.png => close-path.ps2.ref.png} (100%)
 rename test/{close-path-ps3-ref.png => close-path.ps3.ref.png} (100%)
 rename test/{close-path-ref.png => close-path.ref.png} (100%)
 rename test/{composite-integer-translate-over-repeat-ps2-ref.png => composite-integer-translate-over-repeat.ps2.ref.png} (100%)
 rename test/{composite-integer-translate-over-repeat-ps3-ref.png => composite-integer-translate-over-repeat.ps3.ref.png} (100%)
 rename test/{composite-integer-translate-over-repeat-ref.png => composite-integer-translate-over-repeat.ref.png} (100%)
 rename test/{composite-integer-translate-over-ps2-ref.png => composite-integer-translate-over.ps2.ref.png} (100%)
 rename test/{composite-integer-translate-over-ps3-ref.png => composite-integer-translate-over.ps3.ref.png} (100%)
 rename test/{composite-integer-translate-over-ref.png => composite-integer-translate-over.ref.png} (100%)
 rename test/{composite-integer-translate-source-ps2-ref.png => composite-integer-translate-source.ps2.ref.png} (100%)
 rename test/{composite-integer-translate-source-ps3-ref.png => composite-integer-translate-source.ps3.ref.png} (100%)
 rename test/{composite-integer-translate-source-ref.png => composite-integer-translate-source.ref.png} (100%)
 rename test/{copy-path-ps2-ref.png => copy-path.ps2.ref.png} (100%)
 rename test/{copy-path-ps3-ref.png => copy-path.ps3.ref.png} (100%)
 rename test/{copy-path-ref.png => copy-path.ref.png} (100%)
 rename test/{create-from-png-stream-ref.png => create-from-png-stream.ref.png} (100%)
 rename test/{create-from-png-alpha-ref.png => create-from-png.alpha.ref.png} (100%)
 rename test/{create-from-png-gray-alpha-ref.png => create-from-png.gray-alpha.ref.png} (100%)
 rename test/{create-from-png-gray-ref.png => create-from-png.gray.ref.png} (100%)
 rename test/{create-from-png-indexed-alpha-ref.png => create-from-png.indexed-alpha.ref.png} (100%)
 rename test/{create-from-png-indexed-ref.png => create-from-png.indexed.ref.png} (100%)
 rename test/{create-from-png-ref.png => create-from-png.ref.png} (100%)
 rename test/{dash-caps-joins-ps2-argb32-ref.png => dash-caps-joins.ps2.argb32.ref.png} (100%)
 rename test/{dash-caps-joins-ps2-rgb24-ref.png => dash-caps-joins.ps2.rgb24.ref.png} (100%)
 rename test/{dash-caps-joins-ps3-argb32-ref.png => dash-caps-joins.ps3.argb32.ref.png} (100%)
 rename test/{dash-caps-joins-ps3-rgb24-ref.png => dash-caps-joins.ps3.rgb24.ref.png} (100%)
 rename test/{dash-caps-joins-quartz-ref.png => dash-caps-joins.quartz.ref.png} (100%)
 rename test/{dash-caps-joins-ref.png => dash-caps-joins.ref.png} (100%)
 rename test/{dash-curve-ps2-ref.png => dash-curve.ps2.ref.png} (100%)
 rename test/{dash-curve-ps3-ref.png => dash-curve.ps3.ref.png} (100%)
 rename test/{dash-curve-quartz-ref.png => dash-curve.quartz.ref.png} (100%)
 rename test/{dash-curve-ref.png => dash-curve.ref.png} (100%)
 rename test/{dash-no-dash-ref.png => dash-no-dash.ref.png} (100%)
 rename test/{dash-offset-negative-ref.png => dash-offset-negative.ref.png} (100%)
 rename test/{dash-scale-ps2-argb32-ref.png => dash-scale.ps2.argb32.ref.png} (100%)
 rename test/{dash-scale-ps2-rgb24-ref.png => dash-scale.ps2.rgb24.ref.png} (100%)
 rename test/{dash-scale-ps3-argb32-ref.png => dash-scale.ps3.argb32.ref.png} (100%)
 rename test/{dash-scale-ps3-rgb24-ref.png => dash-scale.ps3.rgb24.ref.png} (100%)
 rename test/{dash-scale-quartz-ref.png => dash-scale.quartz.ref.png} (100%)
 rename test/{dash-scale-ref.png => dash-scale.ref.png} (100%)
 rename test/{dash-state-ps2-ref.png => dash-state.ps2.ref.png} (100%)
 rename test/{dash-state-ps3-ref.png => dash-state.ps3.ref.png} (100%)
 rename test/{dash-state-quartz-ref.png => dash-state.quartz.ref.png} (100%)
 rename test/{dash-state-ref.png => dash-state.ref.png} (100%)
 rename test/{dash-zero-length-ps2-ref.png => dash-zero-length.ps2.ref.png} (100%)
 rename test/{dash-zero-length-ps2-rgb24-ref.png => dash-zero-length.ps2.rgb24.ref.png} (100%)
 rename test/{dash-zero-length-ps3-ref.png => dash-zero-length.ps3.ref.png} (100%)
 rename test/{dash-zero-length-ps3-rgb24-ref.png => dash-zero-length.ps3.rgb24.ref.png} (100%)
 rename test/{dash-zero-length-ref.png => dash-zero-length.ref.png} (100%)
 rename test/{dash-zero-length-rgb24-ref.png => dash-zero-length.rgb24.ref.png} (100%)
 rename test/{degenerate-arc-ps2-ref.png => degenerate-arc.ps2.ref.png} (100%)
 rename test/{degenerate-arc-ps3-ref.png => degenerate-arc.ps3.ref.png} (100%)
 rename test/{degenerate-arc-ref.png => degenerate-arc.ref.png} (100%)
 rename test/{degenerate-dash-ref.png => degenerate-dash.ref.png} (100%)
 rename test/{degenerate-path-ps2-argb32-ref.png => degenerate-path.ps2.argb32.ref.png} (100%)
 rename test/{degenerate-path-ps2-rgb24-ref.png => degenerate-path.ps2.rgb24.ref.png} (100%)
 rename test/{degenerate-path-ps3-argb32-ref.png => degenerate-path.ps3.argb32.ref.png} (100%)
 rename test/{degenerate-path-ps3-rgb24-ref.png => degenerate-path.ps3.rgb24.ref.png} (100%)
 rename test/{degenerate-path-quartz-ref.png => degenerate-path.quartz.ref.png} (100%)
 rename test/{degenerate-path-quartz-rgb24-ref.png => degenerate-path.quartz.rgb24.ref.png} (100%)
 rename test/{degenerate-path-ref.png => degenerate-path.ref.png} (100%)
 rename test/{degenerate-path-rgb24-ref.png => degenerate-path.rgb24.ref.png} (100%)
 rename test/{degenerate-pen-ps2-ref.png => degenerate-pen.ps2.ref.png} (100%)
 rename test/{degenerate-pen-ps3-ref.png => degenerate-pen.ps3.ref.png} (100%)
 rename test/{degenerate-pen-quartz-ref.png => degenerate-pen.quartz.ref.png} (100%)
 rename test/{degenerate-pen-ref.png => degenerate-pen.ref.png} (100%)
 rename test/{device-offset-fractional-pdf-ref.png => device-offset-fractional.pdf.ref.png} (100%)
 rename test/{device-offset-fractional-ps2-ref.png => device-offset-fractional.ps2.ref.png} (100%)
 rename test/{device-offset-fractional-ps3-ref.png => device-offset-fractional.ps3.ref.png} (100%)
 rename test/{device-offset-fractional-ref.png => device-offset-fractional.ref.png} (100%)
 rename test/{device-offset-positive-ref.png => device-offset-positive.ref.png} (100%)
 rename test/{device-offset-positive-rgb24-ref.png => device-offset-positive.rgb24.ref.png} (100%)
 rename test/{device-offset-scale-ref.png => device-offset-scale.ref.png} (100%)
 rename test/{device-offset-ref.png => device-offset.ref.png} (100%)
 rename test/{device-offset-rgb24-ref.png => device-offset.rgb24.ref.png} (100%)
 rename test/{extend-pad-ref.png => extend-pad.ref.png} (100%)
 rename test/{extend-reflect-ps2-ref.png => extend-reflect-similar.ps2.ref.png} (100%)
 rename test/{extend-reflect-ps3-ref.png => extend-reflect-similar.ps3.ref.png} (100%)
 rename test/{extend-reflect-ref.png => extend-reflect-similar.ref.png} (100%)
 rename test/{extend-reflect-similar-ps2-ref.png => extend-reflect.ps2.ref.png} (100%)
 rename test/{extend-reflect-similar-ps3-ref.png => extend-reflect.ps3.ref.png} (100%)
 rename test/{extend-reflect-similar-ref.png => extend-reflect.ref.png} (100%)
 rename test/{extend-repeat-ps2-ref.png => extend-repeat-similar.ps2.ref.png} (100%)
 rename test/{extend-repeat-ps3-ref.png => extend-repeat-similar.ps3.ref.png} (100%)
 rename test/{extend-repeat-ref.png => extend-repeat-similar.ref.png} (100%)
 rename test/{extend-repeat-similar-ps2-ref.png => extend-repeat.ps2.ref.png} (100%)
 rename test/{extend-repeat-similar-ps3-ref.png => extend-repeat.ps3.ref.png} (100%)
 rename test/{extend-repeat-similar-ref.png => extend-repeat.ref.png} (100%)
 rename test/{fallback-resolution-ppi150x150-ref.png => fallback-resolution.ppi150x150.ref.png} (100%)
 rename test/{fallback-resolution-ppi150x300-ref.png => fallback-resolution.ppi150x300.ref.png} (100%)
 rename test/{fallback-resolution-ppi150x37.5-ref.png => fallback-resolution.ppi150x37.5.ref.png} (100%)
 rename test/{fallback-resolution-ppi150x600-ref.png => fallback-resolution.ppi150x600.ref.png} (100%)
 rename test/{fallback-resolution-ppi150x72-ref.png => fallback-resolution.ppi150x72.ref.png} (100%)
 rename test/{fallback-resolution-ppi150x75-ref.png => fallback-resolution.ppi150x75.ref.png} (100%)
 rename test/{fallback-resolution-ppi300x150-ref.png => fallback-resolution.ppi300x150.ref.png} (100%)
 rename test/{fallback-resolution-ppi300x300-ref.png => fallback-resolution.ppi300x300.ref.png} (100%)
 rename test/{fallback-resolution-ppi300x37.5-ref.png => fallback-resolution.ppi300x37.5.ref.png} (100%)
 rename test/{fallback-resolution-ppi300x600-ref.png => fallback-resolution.ppi300x600.ref.png} (100%)
 rename test/{fallback-resolution-ppi300x72-ref.png => fallback-resolution.ppi300x72.ref.png} (100%)
 rename test/{fallback-resolution-ppi300x75-ref.png => fallback-resolution.ppi300x75.ref.png} (100%)
 rename test/{fallback-resolution-ppi37.5x150-ref.png => fallback-resolution.ppi37.5x150.ref.png} (100%)
 rename test/{fallback-resolution-ppi37.5x300-ref.png => fallback-resolution.ppi37.5x300.ref.png} (100%)
 rename test/{fallback-resolution-ppi37.5x37.5-ref.png => fallback-resolution.ppi37.5x37.5.ref.png} (100%)
 rename test/{fallback-resolution-ppi37.5x600-ref.png => fallback-resolution.ppi37.5x600.ref.png} (100%)
 rename test/{fallback-resolution-ppi37.5x72-ref.png => fallback-resolution.ppi37.5x72.ref.png} (100%)
 rename test/{fallback-resolution-ppi37.5x75-ref.png => fallback-resolution.ppi37.5x75.ref.png} (100%)
 rename test/{fallback-resolution-ppi600x150-ref.png => fallback-resolution.ppi600x150.ref.png} (100%)
 rename test/{fallback-resolution-ppi600x300-ref.png => fallback-resolution.ppi600x300.ref.png} (100%)
 rename test/{fallback-resolution-ppi600x37.5-ref.png => fallback-resolution.ppi600x37.5.ref.png} (100%)
 rename test/{fallback-resolution-ppi600x600-ref.png => fallback-resolution.ppi600x600.ref.png} (100%)
 rename test/{fallback-resolution-ppi600x72-ref.png => fallback-resolution.ppi600x72.ref.png} (100%)
 rename test/{fallback-resolution-ppi600x75-ref.png => fallback-resolution.ppi600x75.ref.png} (100%)
 rename test/{fallback-resolution-ppi72x150-ref.png => fallback-resolution.ppi72x150.ref.png} (100%)
 rename test/{fallback-resolution-ppi72x300-ref.png => fallback-resolution.ppi72x300.ref.png} (100%)
 rename test/{fallback-resolution-ppi72x37.5-ref.png => fallback-resolution.ppi72x37.5.ref.png} (100%)
 rename test/{fallback-resolution-ppi72x600-ref.png => fallback-resolution.ppi72x600.ref.png} (100%)
 rename test/{fallback-resolution-ppi72x72-ref.png => fallback-resolution.ppi72x72.ref.png} (100%)
 rename test/{fallback-resolution-ppi72x75-ref.png => fallback-resolution.ppi72x75.ref.png} (100%)
 rename test/{fallback-resolution-ppi75x150-ref.png => fallback-resolution.ppi75x150.ref.png} (100%)
 rename test/{fallback-resolution-ppi75x300-ref.png => fallback-resolution.ppi75x300.ref.png} (100%)
 rename test/{fallback-resolution-ppi75x37.5-ref.png => fallback-resolution.ppi75x37.5.ref.png} (100%)
 rename test/{fallback-resolution-ppi75x600-ref.png => fallback-resolution.ppi75x600.ref.png} (100%)
 rename test/{fallback-resolution-ppi75x72-ref.png => fallback-resolution.ppi75x72.ref.png} (100%)
 rename test/{fallback-resolution-ppi75x75-ref.png => fallback-resolution.ppi75x75.ref.png} (100%)
 rename test/{fill-alpha-pattern-pdf-argb32-ref.png => fill-alpha-pattern.pdf.argb32.ref.png} (100%)
 rename test/{fill-alpha-pattern-pdf-rgb24-ref.png => fill-alpha-pattern.pdf.rgb24.ref.png} (100%)
 rename test/{fill-alpha-pattern-ps3-ref.png => fill-alpha-pattern.ps3.ref.png} (100%)
 rename test/{fill-alpha-pattern-ref.png => fill-alpha-pattern.ref.png} (100%)
 rename test/{fill-alpha-ref.png => fill-alpha.ref.png} (100%)
 rename test/{fill-and-stroke-alpha-add-quartz-ref.png => fill-and-stroke-alpha-add.quartz.ref.png} (100%)
 rename test/{fill-and-stroke-alpha-add-ref.png => fill-and-stroke-alpha-add.ref.png} (100%)
 rename test/{fill-and-stroke-alpha-quartz-ref.png => fill-and-stroke-alpha.quartz.ref.png} (100%)
 rename test/{fill-and-stroke-alpha-ref.png => fill-and-stroke-alpha.ref.png} (100%)
 rename test/{fill-and-stroke-ps2-argb32-ref.png => fill-and-stroke.ps2.argb32.ref.png} (100%)
 rename test/{fill-and-stroke-ps2-rgb24-ref.png => fill-and-stroke.ps2.rgb24.ref.png} (100%)
 rename test/{fill-and-stroke-ps3-argb32-ref.png => fill-and-stroke.ps3.argb32.ref.png} (100%)
 rename test/{fill-and-stroke-ps3-rgb24-ref.png => fill-and-stroke.ps3.rgb24.ref.png} (100%)
 rename test/{fill-and-stroke-quartz-ref.png => fill-and-stroke.quartz.ref.png} (100%)
 rename test/{fill-and-stroke-quartz-rgb24-ref.png => fill-and-stroke.quartz.rgb24.ref.png} (100%)
 rename test/{fill-and-stroke-ref.png => fill-and-stroke.ref.png} (100%)
 rename test/{fill-and-stroke-rgb24-ref.png => fill-and-stroke.rgb24.ref.png} (100%)
 rename test/{fill-degenerate-sort-order-quartz-ref.png => fill-degenerate-sort-order.quartz.ref.png} (100%)
 rename test/{fill-degenerate-sort-order-quartz-rgb24-ref.png => fill-degenerate-sort-order.quartz.rgb24.ref.png} (100%)
 rename test/{fill-degenerate-sort-order-ref.png => fill-degenerate-sort-order.ref.png} (100%)
 rename test/{fill-degenerate-sort-order-rgb24-ref.png => fill-degenerate-sort-order.rgb24.ref.png} (100%)
 rename test/{fill-missed-stop-ps2-argb32-ref.png => fill-missed-stop.ps2.argb32.ref.png} (100%)
 rename test/{fill-missed-stop-ps2-rgb24-ref.png => fill-missed-stop.ps2.rgb24.ref.png} (100%)
 rename test/{fill-missed-stop-ps3-argb32-ref.png => fill-missed-stop.ps3.argb32.ref.png} (100%)
 rename test/{fill-missed-stop-ps3-rgb24-ref.png => fill-missed-stop.ps3.rgb24.ref.png} (100%)
 rename test/{fill-missed-stop-ref.png => fill-missed-stop.ref.png} (100%)
 rename test/{fill-missed-stop-rgb24-ref.png => fill-missed-stop.rgb24.ref.png} (100%)
 rename test/{fill-rule-ps2-argb32-ref.png => fill-rule.ps2.argb32.ref.png} (100%)
 rename test/{fill-rule-ps2-rgb24-ref.png => fill-rule.ps2.rgb24.ref.png} (100%)
 rename test/{fill-rule-ps3-argb32-ref.png => fill-rule.ps3.argb32.ref.png} (100%)
 rename test/{fill-rule-ps3-rgb24-ref.png => fill-rule.ps3.rgb24.ref.png} (100%)
 rename test/{fill-rule-quartz-ref.png => fill-rule.quartz.ref.png} (100%)
 rename test/{fill-rule-quartz-rgb24-ref.png => fill-rule.quartz.rgb24.ref.png} (100%)
 rename test/{fill-rule-ref.png => fill-rule.ref.png} (100%)
 rename test/{fill-rule-rgb24-ref.png => fill-rule.rgb24.ref.png} (100%)
 rename test/{filter-bilinear-extents-pdf-ref.png => filter-bilinear-extents.pdf.ref.png} (100%)
 rename test/{filter-bilinear-extents-ps2-ref.png => filter-bilinear-extents.ps2.ref.png} (100%)
 rename test/{filter-bilinear-extents-ps3-ref.png => filter-bilinear-extents.ps3.ref.png} (100%)
 rename test/{filter-bilinear-extents-ref.png => filter-bilinear-extents.ref.png} (100%)
 rename test/{filter-nearest-offset-pdf-ref.png => filter-nearest-offset.pdf.ref.png} (100%)
 rename test/{filter-nearest-offset-ps2-ref.png => filter-nearest-offset.ps2.ref.png} (100%)
 rename test/{filter-nearest-offset-ps3-ref.png => filter-nearest-offset.ps3.ref.png} (100%)
 rename test/{filter-nearest-offset-ref.png => filter-nearest-offset.ref.png} (100%)
 rename test/{filter-nearest-offset-svg11-ref.png => filter-nearest-offset.svg11.ref.png} (100%)
 rename test/{filter-nearest-offset-svg12-ref.png => filter-nearest-offset.svg12.ref.png} (100%)
 rename test/{filter-nearest-transformed-pdf-ref.png => filter-nearest-transformed.pdf.ref.png} (100%)
 rename test/{filter-nearest-transformed-ref.png => filter-nearest-transformed.ref.png} (100%)
 rename test/{filter-nearest-transformed-svg11-ref.png => filter-nearest-transformed.svg11.ref.png} (100%)
 rename test/{filter-nearest-transformed-svg12-ref.png => filter-nearest-transformed.svg12.ref.png} (100%)
 rename test/{finer-grained-fallbacks-ps2-ref.png => finer-grained-fallbacks.ps2.ref.png} (100%)
 rename test/{finer-grained-fallbacks-ps2-rgb24-ref.png => finer-grained-fallbacks.ps2.rgb24.ref.png} (100%)
 rename test/{finer-grained-fallbacks-ps3-ref.png => finer-grained-fallbacks.ps3.ref.png} (100%)
 rename test/{finer-grained-fallbacks-ps3-rgb24-ref.png => finer-grained-fallbacks.ps3.rgb24.ref.png} (100%)
 rename test/{finer-grained-fallbacks-ref.png => finer-grained-fallbacks.ref.png} (100%)
 rename test/{finer-grained-fallbacks-rgb24-ref.png => finer-grained-fallbacks.rgb24.ref.png} (100%)
 rename test/{font-matrix-translation-ps2-argb32-ref.png => font-matrix-translation.ps2.argb32.ref.png} (100%)
 rename test/{font-matrix-translation-ps2-rgb24-ref.png => font-matrix-translation.ps2.rgb24.ref.png} (100%)
 rename test/{font-matrix-translation-ps3-argb32-ref.png => font-matrix-translation.ps3.argb32.ref.png} (100%)
 rename test/{font-matrix-translation-ps3-rgb24-ref.png => font-matrix-translation.ps3.rgb24.ref.png} (100%)
 rename test/{font-matrix-translation-quartz-ref.png => font-matrix-translation.quartz.ref.png} (100%)
 rename test/{font-matrix-translation-ref.png => font-matrix-translation.ref.png} (100%)
 rename test/{font-matrix-translation-svg11-ref.png => font-matrix-translation.svg11.ref.png} (100%)
 rename test/{font-matrix-translation-svg12-ref.png => font-matrix-translation.svg12.ref.png} (100%)
 rename test/{ft-show-glyphs-positioning-pdf-ref.png => ft-show-glyphs-positioning.pdf.ref.png} (100%)
 rename test/{ft-show-glyphs-positioning-ps2-ref.png => ft-show-glyphs-positioning.ps2.ref.png} (100%)
 rename test/{ft-show-glyphs-positioning-ps3-ref.png => ft-show-glyphs-positioning.ps3.ref.png} (100%)
 rename test/{ft-show-glyphs-positioning-ref.png => ft-show-glyphs-positioning.ref.png} (100%)
 rename test/{ft-show-glyphs-positioning-svg11-ref.png => ft-show-glyphs-positioning.svg11.ref.png} (100%)
 rename test/{ft-show-glyphs-positioning-svg12-ref.png => ft-show-glyphs-positioning.svg12.ref.png} (100%)
 rename test/{ft-show-glyphs-table-ps2-ref.png => ft-show-glyphs-table.ps2.ref.png} (100%)
 rename test/{ft-show-glyphs-table-ps3-ref.png => ft-show-glyphs-table.ps3.ref.png} (100%)
 rename test/{ft-show-glyphs-table-ref.png => ft-show-glyphs-table.ref.png} (100%)
 rename test/{ft-text-antialias-none-ps2-argb32-ref.png => ft-text-antialias-none.ps2.argb32.ref.png} (100%)
 rename test/{ft-text-antialias-none-ps3-argb32-ref.png => ft-text-antialias-none.ps3.argb32.ref.png} (100%)
 rename test/{ft-text-antialias-none-ref.png => ft-text-antialias-none.ref.png} (100%)
 rename test/{ft-text-vertical-layout-type1-pdf-ref.png => ft-text-vertical-layout-type1.pdf.ref.png} (100%)
 rename test/{ft-text-vertical-layout-type1-ps2-ref.png => ft-text-vertical-layout-type1.ps2.ref.png} (100%)
 rename test/{ft-text-vertical-layout-type1-ps3-ref.png => ft-text-vertical-layout-type1.ps3.ref.png} (100%)
 rename test/{ft-text-vertical-layout-type1-ref.png => ft-text-vertical-layout-type1.ref.png} (100%)
 rename test/{ft-text-vertical-layout-type1-svg11-ref.png => ft-text-vertical-layout-type1.svg11.ref.png} (100%)
 rename test/{ft-text-vertical-layout-type1-svg12-ref.png => ft-text-vertical-layout-type1.svg12.ref.png} (100%)
 rename test/{ft-text-vertical-layout-type3-pdf-ref.png => ft-text-vertical-layout-type3.pdf.ref.png} (100%)
 rename test/{ft-text-vertical-layout-type3-ps2-ref.png => ft-text-vertical-layout-type3.ps2.ref.png} (100%)
 rename test/{ft-text-vertical-layout-type3-ps3-ref.png => ft-text-vertical-layout-type3.ps3.ref.png} (100%)
 rename test/{ft-text-vertical-layout-type3-ref.png => ft-text-vertical-layout-type3.ref.png} (100%)
 rename test/{ft-text-vertical-layout-type3-svg11-ref.png => ft-text-vertical-layout-type3.svg11.ref.png} (100%)
 rename test/{ft-text-vertical-layout-type3-svg12-ref.png => ft-text-vertical-layout-type3.svg12.ref.png} (100%)
 rename test/{get-group-target-ref.png => get-group-target.ref.png} (100%)
 rename test/{glitz-surface-source-ref.png => glitz-surface-source.ref.png} (100%)
 rename test/{glyph-cache-pressure-ps2-ref.png => glyph-cache-pressure.ps2.ref.png} (100%)
 rename test/{glyph-cache-pressure-ps3-ref.png => glyph-cache-pressure.ps3.ref.png} (100%)
 rename test/{glyph-cache-pressure-quartz-ref.png => glyph-cache-pressure.quartz.ref.png} (100%)
 rename test/{glyph-cache-pressure-ref.png => glyph-cache-pressure.ref.png} (100%)
 rename test/{gradient-alpha-pdf-argb32-ref.png => gradient-alpha.pdf.argb32.ref.png} (100%)
 rename test/{gradient-alpha-pdf-rgb24-ref.png => gradient-alpha.pdf.rgb24.ref.png} (100%)
 rename test/{gradient-alpha-ps2-argb32-ref.png => gradient-alpha.ps2.argb32.ref.png} (100%)
 rename test/{gradient-alpha-ps2-rgb24-ref.png => gradient-alpha.ps2.rgb24.ref.png} (100%)
 rename test/{gradient-alpha-ps3-argb32-ref.png => gradient-alpha.ps3.argb32.ref.png} (100%)
 rename test/{gradient-alpha-ps3-rgb24-ref.png => gradient-alpha.ps3.rgb24.ref.png} (100%)
 rename test/{gradient-alpha-ref.png => gradient-alpha.ref.png} (100%)
 rename test/{gradient-alpha-rgb24-ref.png => gradient-alpha.rgb24.ref.png} (100%)
 rename test/{gradient-constant-alpha-pdf-argb32-ref.png => gradient-constant-alpha.pdf.argb32.ref.png} (100%)
 rename test/{gradient-constant-alpha-pdf-rgb24-ref.png => gradient-constant-alpha.pdf.rgb24.ref.png} (100%)
 rename test/{gradient-constant-alpha-ps3-ref.png => gradient-constant-alpha.ps3.ref.png} (100%)
 rename test/{gradient-constant-alpha-ps3-rgb24-ref.png => gradient-constant-alpha.ps3.rgb24.ref.png} (100%)
 rename test/{gradient-constant-alpha-ref.png => gradient-constant-alpha.ref.png} (100%)
 rename test/{gradient-constant-alpha-rgb24-ref.png => gradient-constant-alpha.rgb24.ref.png} (100%)
 rename test/{gradient-zero-stops-ref.png => gradient-zero-stops.ref.png} (100%)
 rename test/{gradient-zero-stops-rgb24-ref.png => gradient-zero-stops.rgb24.ref.png} (100%)
 rename test/{group-paint-ref.png => group-paint.ref.png} (100%)
 rename test/{huge-pattern-pdf-ref.png => huge-pattern.pdf.ref.png} (100%)
 rename test/{huge-pattern-pdf-rgb24-ref.png => huge-pattern.pdf.rgb24.ref.png} (100%)
 rename test/{huge-pattern-ps3-ref.png => huge-pattern.ps3.ref.png} (100%)
 rename test/{huge-pattern-ref.png => huge-pattern.ref.png} (100%)
 rename test/{image-surface-source-ps2-ref.png => image-surface-source.ps2.ref.png} (100%)
 rename test/{image-surface-source-ps3-ref.png => image-surface-source.ps3.ref.png} (100%)
 rename test/{image-surface-source-ref.png => image-surface-source.ref.png} (100%)
 rename test/{infinite-join-ps2-ref.png => infinite-join.ps2.ref.png} (100%)
 rename test/{infinite-join-ps3-ref.png => infinite-join.ps3.ref.png} (100%)
 rename test/{infinite-join-ref.png => infinite-join.ref.png} (100%)
 rename test/{large-clip-ref.png => large-clip.ref.png} (100%)
 rename test/{large-font-ref.png => large-font.ref.png} (100%)
 rename test/{large-source-ref.png => large-source.ref.png} (100%)
 rename test/{leaky-dash-ps2-argb32-ref.png => leaky-dash.ps2.argb32.ref.png} (100%)
 rename test/{leaky-dash-ps2-rgb24-ref.png => leaky-dash.ps2.rgb24.ref.png} (100%)
 rename test/{leaky-dash-ps3-argb32-ref.png => leaky-dash.ps3.argb32.ref.png} (100%)
 rename test/{leaky-dash-ps3-rgb24-ref.png => leaky-dash.ps3.rgb24.ref.png} (100%)
 rename test/{leaky-dash-quartz-ref.png => leaky-dash.quartz.ref.png} (100%)
 rename test/{leaky-dash-ref.png => leaky-dash.ref.png} (100%)
 rename test/{leaky-dashed-rectangle-ps2-ref.png => leaky-dashed-rectangle.ps2.ref.png} (100%)
 rename test/{leaky-dashed-rectangle-ps3-ref.png => leaky-dashed-rectangle.ps3.ref.png} (100%)
 rename test/{leaky-dashed-rectangle-ref.png => leaky-dashed-rectangle.ref.png} (100%)
 rename test/{leaky-dashed-stroke-ps2-ref.png => leaky-dashed-stroke.ps2.ref.png} (100%)
 rename test/{leaky-dashed-stroke-ps3-ref.png => leaky-dashed-stroke.ps3.ref.png} (100%)
 rename test/{leaky-dashed-stroke-ref.png => leaky-dashed-stroke.ref.png} (100%)
 rename test/{leaky-polygon-ps2-ref.png => leaky-polygon.ps2.ref.png} (100%)
 rename test/{leaky-polygon-ps3-ref.png => leaky-polygon.ps3.ref.png} (100%)
 rename test/{leaky-polygon-ref.png => leaky-polygon.ref.png} (100%)
 rename test/{line-width-scale-ps2-ref.png => line-width-scale.ps2.ref.png} (100%)
 rename test/{line-width-scale-ps3-ref.png => line-width-scale.ps3.ref.png} (100%)
 rename test/{line-width-scale-quartz-ref.png => line-width-scale.quartz.ref.png} (100%)
 rename test/{line-width-scale-ref.png => line-width-scale.ref.png} (100%)
 rename test/{line-width-ref.png => line-width.ref.png} (100%)
 rename test/{linear-gradient-reflect-pdf-argb32-ref.png => linear-gradient-reflect.pdf.argb32.ref.png} (100%)
 rename test/{linear-gradient-reflect-pdf-rgb24-ref.png => linear-gradient-reflect.pdf.rgb24.ref.png} (100%)
 rename test/{linear-gradient-reflect-ps3-ref.png => linear-gradient-reflect.ps3.ref.png} (100%)
 rename test/{linear-gradient-reflect-quartz-ref.png => linear-gradient-reflect.quartz.ref.png} (100%)
 rename test/{linear-gradient-reflect-ref.png => linear-gradient-reflect.ref.png} (100%)
 rename test/{linear-gradient-pdf-ref.png => linear-gradient.pdf.ref.png} (100%)
 rename test/{linear-gradient-ps3-ref.png => linear-gradient.ps3.ref.png} (100%)
 rename test/{linear-gradient-quartz-ref.png => linear-gradient.quartz.ref.png} (100%)
 rename test/{linear-gradient-ref.png => linear-gradient.ref.png} (100%)
 rename test/{linear-gradient-svg11-ref.png => linear-gradient.svg11.ref.png} (100%)
 rename test/{linear-gradient-svg12-ref.png => linear-gradient.svg12.ref.png} (100%)
 rename test/{long-dashed-lines-ps2-ref.png => long-dashed-lines.ps2.ref.png} (100%)
 rename test/{long-dashed-lines-ps3-ref.png => long-dashed-lines.ps3.ref.png} (100%)
 rename test/{long-dashed-lines-quartz-ref.png => long-dashed-lines.quartz.ref.png} (100%)
 rename test/{long-dashed-lines-ref.png => long-dashed-lines.ref.png} (100%)
 rename test/{long-lines-ref.png => long-lines.ref.png} (100%)
 rename test/{mask-alpha-quartz-argb32-ref.png => mask-alpha.quartz.argb32.ref.png} (100%)
 rename test/{mask-alpha-ref.png => mask-alpha.ref.png} (100%)
 rename test/{mask-alpha-rgb24-ref.png => mask-alpha.rgb24.ref.png} (100%)
 rename test/{mask-alpha-svg11-argb32-ref.png => mask-alpha.svg11.argb32.ref.png} (100%)
 rename test/{mask-alpha-svg12-argb32-ref.png => mask-alpha.svg12.argb32.ref.png} (100%)
 rename test/{mask-ctm-ref.png => mask-ctm.ref.png} (100%)
 rename test/{mask-ctm-rgb24-ref.png => mask-ctm.rgb24.ref.png} (100%)
 rename test/{mask-ctm-svg11-argb32-ref.png => mask-ctm.svg11.argb32.ref.png} (100%)
 rename test/{mask-ctm-svg12-argb32-ref.png => mask-ctm.svg12.argb32.ref.png} (100%)
 rename test/{mask-surface-ctm-ref.png => mask-surface-ctm.ref.png} (100%)
 rename test/{mask-surface-ctm-rgb24-ref.png => mask-surface-ctm.rgb24.ref.png} (100%)
 rename test/{mask-surface-ctm-svg11-argb32-ref.png => mask-surface-ctm.svg11.argb32.ref.png} (100%)
 rename test/{mask-surface-ctm-svg12-argb32-ref.png => mask-surface-ctm.svg12.argb32.ref.png} (100%)
 rename test/{mask-transformed-image-ref.png => mask-transformed-image.ref.png} (100%)
 rename test/{mask-transformed-similar-pdf-ref.png => mask-transformed-similar.pdf.ref.png} (100%)
 rename test/{mask-transformed-similar-ref.png => mask-transformed-similar.ref.png} (100%)
 rename test/{mask-transformed-similar-svg11-ref.png => mask-transformed-similar.svg11.ref.png} (100%)
 rename test/{mask-transformed-similar-svg12-ref.png => mask-transformed-similar.svg12.ref.png} (100%)
 rename test/{mask-pdf-argb32-ref.png => mask.pdf.argb32.ref.png} (100%)
 rename test/{mask-pdf-rgb24-ref.png => mask.pdf.rgb24.ref.png} (100%)
 rename test/{mask-quartz-ref.png => mask.quartz.ref.png} (100%)
 rename test/{mask-quartz-rgb24-ref.png => mask.quartz.rgb24.ref.png} (100%)
 rename test/{mask-ref.png => mask.ref.png} (100%)
 rename test/{mask-rgb24-ref.png => mask.rgb24.ref.png} (100%)
 rename test/{mask-svg11-argb32-ref.png => mask.svg11.argb32.ref.png} (100%)
 rename test/{mask-svg11-rgb24-ref.png => mask.svg11.rgb24.ref.png} (100%)
 rename test/{mask-svg12-argb32-ref.png => mask.svg12.argb32.ref.png} (100%)
 rename test/{mask-svg12-rgb24-ref.png => mask.svg12.rgb24.ref.png} (100%)
 rename test/{meta-surface-pattern-pdf-ref.png => meta-surface-pattern.pdf.ref.png} (100%)
 rename test/{meta-surface-pattern-pdf-rgb24-ref.png => meta-surface-pattern.pdf.rgb24.ref.png} (100%)
 rename test/{meta-surface-pattern-ps2-argb32-ref.png => meta-surface-pattern.ps2.argb32.ref.png} (100%)
 rename test/{meta-surface-pattern-ps2-rgb24-ref.png => meta-surface-pattern.ps2.rgb24.ref.png} (100%)
 rename test/{meta-surface-pattern-ps3-argb32-ref.png => meta-surface-pattern.ps3.argb32.ref.png} (100%)
 rename test/{meta-surface-pattern-ps3-rgb24-ref.png => meta-surface-pattern.ps3.rgb24.ref.png} (100%)
 rename test/{meta-surface-pattern-quartz-ref.png => meta-surface-pattern.quartz.ref.png} (100%)
 rename test/{meta-surface-pattern-quartz-rgb24-ref.png => meta-surface-pattern.quartz.rgb24.ref.png} (100%)
 rename test/{meta-surface-pattern-ref.png => meta-surface-pattern.ref.png} (100%)
 rename test/{meta-surface-pattern-rgb24-ref.png => meta-surface-pattern.rgb24.ref.png} (100%)
 rename test/{meta-surface-pattern-svg11-argb32-ref.png => meta-surface-pattern.svg11.argb32.ref.png} (100%)
 rename test/{meta-surface-pattern-svg11-rgb24-ref.png => meta-surface-pattern.svg11.rgb24.ref.png} (100%)
 rename test/{meta-surface-pattern-svg12-argb32-ref.png => meta-surface-pattern.svg12.argb32.ref.png} (100%)
 rename test/{meta-surface-pattern-svg12-rgb24-ref.png => meta-surface-pattern.svg12.rgb24.ref.png} (100%)
 rename test/{miter-precision-ps2-ref.png => miter-precision.ps2.ref.png} (100%)
 rename test/{miter-precision-ps3-ref.png => miter-precision.ps3.ref.png} (100%)
 rename test/{miter-precision-ref.png => miter-precision.ref.png} (100%)
 rename test/{move-to-show-surface-ref.png => move-to-show-surface.ref.png} (100%)
 rename test/{new-sub-path-ps2-argb32-ref.png => new-sub-path.ps2.argb32.ref.png} (100%)
 rename test/{new-sub-path-ps2-rgb24-ref.png => new-sub-path.ps2.rgb24.ref.png} (100%)
 rename test/{new-sub-path-ps3-argb32-ref.png => new-sub-path.ps3.argb32.ref.png} (100%)
 rename test/{new-sub-path-ps3-rgb24-ref.png => new-sub-path.ps3.rgb24.ref.png} (100%)
 rename test/{new-sub-path-quartz-ref.png => new-sub-path.quartz.ref.png} (100%)
 rename test/{new-sub-path-quartz-rgb24-ref.png => new-sub-path.quartz.rgb24.ref.png} (100%)
 rename test/{new-sub-path-ref.png => new-sub-path.ref.png} (100%)
 rename test/{new-sub-path-rgb24-ref.png => new-sub-path.rgb24.ref.png} (100%)
 rename test/{nil-surface-ref.png => nil-surface.ref.png} (100%)
 rename test/{nil-surface-rgb24-ref.png => nil-surface.rgb24.ref.png} (100%)
 rename test/{operator-alpha-ref.png => operator-alpha.ref.png} (100%)
 rename test/{operator-alpha-rgb24-ref.png => operator-alpha.rgb24.ref.png} (100%)
 rename test/{operator-clear-pdf-argb32-ref.png => operator-clear.pdf.argb32.ref.png} (100%)
 rename test/{operator-clear-pdf-rgb24-ref.png => operator-clear.pdf.rgb24.ref.png} (100%)
 rename test/{operator-clear-quartz-ref.png => operator-clear.quartz.ref.png} (100%)
 rename test/{operator-clear-quartz-rgb24-ref.png => operator-clear.quartz.rgb24.ref.png} (100%)
 rename test/{operator-clear-ref.png => operator-clear.ref.png} (100%)
 rename test/{operator-clear-rgb24-ref.png => operator-clear.rgb24.ref.png} (100%)
 rename test/{operator-source-pdf-argb32-ref.png => operator-source.pdf.argb32.ref.png} (100%)
 rename test/{operator-source-pdf-rgb24-ref.png => operator-source.pdf.rgb24.ref.png} (100%)
 rename test/{operator-source-quartz-ref.png => operator-source.quartz.ref.png} (100%)
 rename test/{operator-source-quartz-rgb24-ref.png => operator-source.quartz.rgb24.ref.png} (100%)
 rename test/{operator-source-ref.png => operator-source.ref.png} (100%)
 rename test/{operator-source-rgb24-ref.png => operator-source.rgb24.ref.png} (100%)
 rename test/{operator-ref.png => operator.ref.png} (100%)
 rename test/{operator-rgb24-ref.png => operator.rgb24.ref.png} (100%)
 rename test/{over-above-source-ps2-argb32-ref.png => over-above-source.ps2.argb32.ref.png} (100%)
 rename test/{over-above-source-ps3-argb32-ref.png => over-above-source.ps3.argb32.ref.png} (100%)
 rename test/{over-above-source-quartz-ref.png => over-above-source.quartz.ref.png} (100%)
 rename test/{over-above-source-quartz-rgb24-ref.png => over-above-source.quartz.rgb24.ref.png} (100%)
 rename test/{over-above-source-ref.png => over-above-source.ref.png} (100%)
 rename test/{over-above-source-rgb24-ref.png => over-above-source.rgb24.ref.png} (100%)
 rename test/{over-around-source-ps2-argb32-ref.png => over-around-source.ps2.argb32.ref.png} (100%)
 rename test/{over-around-source-ps2-rgb24-ref.png => over-around-source.ps2.rgb24.ref.png} (100%)
 rename test/{over-around-source-ps3-argb32-ref.png => over-around-source.ps3.argb32.ref.png} (100%)
 rename test/{over-around-source-ps3-rgb24-ref.png => over-around-source.ps3.rgb24.ref.png} (100%)
 rename test/{over-around-source-quartz-ref.png => over-around-source.quartz.ref.png} (100%)
 rename test/{over-around-source-quartz-rgb24-ref.png => over-around-source.quartz.rgb24.ref.png} (100%)
 rename test/{over-around-source-ref.png => over-around-source.ref.png} (100%)
 rename test/{over-around-source-rgb24-ref.png => over-around-source.rgb24.ref.png} (100%)
 rename test/{over-below-source-ps2-argb32-ref.png => over-below-source.ps2.argb32.ref.png} (100%)
 rename test/{over-below-source-ps3-argb32-ref.png => over-below-source.ps3.argb32.ref.png} (100%)
 rename test/{over-below-source-ref.png => over-below-source.ref.png} (100%)
 rename test/{over-below-source-rgb24-ref.png => over-below-source.rgb24.ref.png} (100%)
 rename test/{over-between-source-ps2-argb32-ref.png => over-between-source.ps2.argb32.ref.png} (100%)
 rename test/{over-between-source-ps3-argb32-ref.png => over-between-source.ps3.argb32.ref.png} (100%)
 rename test/{over-between-source-quartz-ref.png => over-between-source.quartz.ref.png} (100%)
 rename test/{over-between-source-quartz-rgb24-ref.png => over-between-source.quartz.rgb24.ref.png} (100%)
 rename test/{over-between-source-ref.png => over-between-source.ref.png} (100%)
 rename test/{over-between-source-rgb24-ref.png => over-between-source.rgb24.ref.png} (100%)
 rename test/{paint-repeat-ref.png => paint-repeat.ref.png} (100%)
 rename test/{paint-source-alpha-pdf-argb32-ref.png => paint-source-alpha.pdf.argb32.ref.png} (100%)
 rename test/{paint-source-alpha-pdf-ref.png => paint-source-alpha.pdf.ref.png} (100%)
 rename test/{paint-source-alpha-ref.png => paint-source-alpha.ref.png} (100%)
 rename test/{paint-source-alpha-svg11-ref.png => paint-source-alpha.svg11.ref.png} (100%)
 rename test/{paint-source-alpha-svg12-ref.png => paint-source-alpha.svg12.ref.png} (100%)
 rename test/{paint-with-alpha-pdf-ref.png => paint-with-alpha.pdf.ref.png} (100%)
 rename test/{paint-with-alpha-ref.png => paint-with-alpha.ref.png} (100%)
 rename test/{paint-with-alpha-svg11-ref.png => paint-with-alpha.svg11.ref.png} (100%)
 rename test/{paint-with-alpha-svg12-ref.png => paint-with-alpha.svg12.ref.png} (100%)
 rename test/{paint-ref.png => paint.ref.png} (100%)
 rename test/{pass-through-ref.png => pass-through.ref.png} (100%)
 rename test/{pass-through-rgb24-ref.png => pass-through.rgb24.ref.png} (100%)
 rename test/{pattern-getters-ref.png => pattern-getters.ref.png} (100%)
 rename test/{pdf-surface-source-ref.png => pdf-surface-source.ref.png} (100%)
 rename test/{pixman-rotate-ref.png => pixman-rotate.ref.png} (100%)
 rename test/{pixman-rotate-rgb24-ref.png => pixman-rotate.rgb24.ref.png} (100%)
 rename test/{ps-surface-source-ref.png => ps-surface-source.ref.png} (100%)
 rename test/{push-group-pdf-ref.png => push-group.pdf.ref.png} (100%)
 rename test/{push-group-pdf-rgb24-ref.png => push-group.pdf.rgb24.ref.png} (100%)
 rename test/{push-group-ref.png => push-group.ref.png} (100%)
 rename test/{push-group-rgb24-ref.png => push-group.rgb24.ref.png} (100%)
 rename test/{push-group-svg11-argb32-ref.png => push-group.svg11.argb32.ref.png} (100%)
 rename test/{push-group-svg12-argb32-ref.png => push-group.svg12.argb32.ref.png} (100%)
 rename test/{radial-gradient-pdf-ref.png => radial-gradient.pdf.ref.png} (100%)
 rename test/{radial-gradient-quartz-ref.png => radial-gradient.quartz.ref.png} (100%)
 rename test/{radial-gradient-ref.png => radial-gradient.ref.png} (100%)
 rename test/{radial-gradient-svg11-ref.png => radial-gradient.svg11.ref.png} (100%)
 rename test/{radial-gradient-svg12-ref.png => radial-gradient.svg12.ref.png} (100%)
 rename test/{random-intersections-ps2-ref.png => random-intersections.ps2.ref.png} (100%)
 rename test/{random-intersections-ps3-ref.png => random-intersections.ps3.ref.png} (100%)
 rename test/{random-intersections-quartz-ref.png => random-intersections.quartz.ref.png} (100%)
 rename test/{random-intersections-ref.png => random-intersections.ref.png} (100%)
 rename test/{rectangle-rounding-error-ref.png => rectangle-rounding-error.ref.png} (100%)
 rename test/{rectilinear-fill-ref.png => rectilinear-fill.ref.png} (100%)
 rename test/{rectilinear-miter-limit-ps2-ref.png => rectilinear-miter-limit.ps2.ref.png} (100%)
 rename test/{rectilinear-miter-limit-ps3-ref.png => rectilinear-miter-limit.ps3.ref.png} (100%)
 rename test/{rectilinear-miter-limit-ref.png => rectilinear-miter-limit.ref.png} (100%)
 rename test/{rectilinear-stroke-ref.png => rectilinear-stroke.ref.png} (100%)
 rename test/{reflected-stroke-ps2-ref.png => reflected-stroke.ps2.ref.png} (100%)
 rename test/{reflected-stroke-ps3-ref.png => reflected-stroke.ps3.ref.png} (100%)
 rename test/{reflected-stroke-quartz-ref.png => reflected-stroke.quartz.ref.png} (100%)
 rename test/{reflected-stroke-ref.png => reflected-stroke.ref.png} (100%)
 rename test/{rel-path-ps2-rgb24-ref.png => rel-path.ps2.rgb24.ref.png} (100%)
 rename test/{rel-path-ps3-rgb24-ref.png => rel-path.ps3.rgb24.ref.png} (100%)
 rename test/{rel-path-quartz-ref.png => rel-path.quartz.ref.png} (100%)
 rename test/{rel-path-quartz-rgb24-ref.png => rel-path.quartz.rgb24.ref.png} (100%)
 rename test/{rel-path-ref.png => rel-path.ref.png} (100%)
 rename test/{rel-path-rgb24-ref.png => rel-path.rgb24.ref.png} (100%)
 rename test/{rgb24-ignore-alpha-ref.png => rgb24-ignore-alpha.ref.png} (100%)
 rename test/{rotate-image-surface-paint-pdf-argb32-ref.png => rotate-image-surface-paint.pdf.argb32.ref.png} (100%)
 rename test/{rotate-image-surface-paint-pdf-rgb24-ref.png => rotate-image-surface-paint.pdf.rgb24.ref.png} (100%)
 rename test/{rotate-image-surface-paint-ps2-ref.png => rotate-image-surface-paint.ps2.ref.png} (100%)
 rename test/{rotate-image-surface-paint-ps3-ref.png => rotate-image-surface-paint.ps3.ref.png} (100%)
 rename test/{rotate-image-surface-paint-quartz-ref.png => rotate-image-surface-paint.quartz.ref.png} (100%)
 rename test/{rotate-image-surface-paint-ref.png => rotate-image-surface-paint.ref.png} (100%)
 rename test/{rotate-image-surface-paint-svg11-ref.png => rotate-image-surface-paint.svg11.ref.png} (100%)
 rename test/{rotate-image-surface-paint-svg12-ref.png => rotate-image-surface-paint.svg12.ref.png} (100%)
 rename test/{scale-down-source-surface-paint-ref.png => scale-down-source-surface-paint.ref.png} (100%)
 rename test/{scale-source-surface-paint-pdf-argb32-ref.png => scale-source-surface-paint.pdf.argb32.ref.png} (100%)
 rename test/{scale-source-surface-paint-pdf-rgb24-ref.png => scale-source-surface-paint.pdf.rgb24.ref.png} (100%)
 rename test/{scale-source-surface-paint-ref.png => scale-source-surface-paint.ref.png} (100%)
 rename test/{scale-source-surface-paint-rgb24-ref.png => scale-source-surface-paint.rgb24.ref.png} (100%)
 rename test/{scale-source-surface-paint-svg11-argb32-ref.png => scale-source-surface-paint.svg11.argb32.ref.png} (100%)
 rename test/{scale-source-surface-paint-svg11-rgb24-ref.png => scale-source-surface-paint.svg11.rgb24.ref.png} (100%)
 rename test/{scale-source-surface-paint-svg12-argb32-ref.png => scale-source-surface-paint.svg12.argb32.ref.png} (100%)
 rename test/{scale-source-surface-paint-svg12-rgb24-ref.png => scale-source-surface-paint.svg12.rgb24.ref.png} (100%)
 rename test/{select-font-face-ps2-ref.png => select-font-face.ps2.ref.png} (100%)
 rename test/{select-font-face-ps3-ref.png => select-font-face.ps3.ref.png} (100%)
 rename test/{select-font-face-quartz-ref.png => select-font-face.quartz.ref.png} (100%)
 rename test/{select-font-face-ref.png => select-font-face.ref.png} (100%)
 rename test/{self-copy-overlap-ref.png => self-copy-overlap.ref.png} (100%)
 rename test/{self-copy-overlap-rgb24-ref.png => self-copy-overlap.rgb24.ref.png} (100%)
 rename test/{self-copy-ps2-ref.png => self-copy.ps2.ref.png} (100%)
 rename test/{self-copy-ps3-ref.png => self-copy.ps3.ref.png} (100%)
 rename test/{self-copy-ref.png => self-copy.ref.png} (100%)
 rename test/{self-intersecting-ref.png => self-intersecting.ref.png} (100%)
 rename test/{self-intersecting-rgb24-ref.png => self-intersecting.rgb24.ref.png} (100%)
 rename test/{set-source-ref.png => set-source.ref.png} (100%)
 rename test/{set-source-rgb24-ref.png => set-source.rgb24.ref.png} (100%)
 rename test/{set-source-svg11-argb32-ref.png => set-source.svg11.argb32.ref.png} (100%)
 rename test/{set-source-svg12-argb32-ref.png => set-source.svg12.argb32.ref.png} (100%)
 rename test/{show-glyphs-many-ref.png => show-glyphs-many.ref.png} (100%)
 rename test/{show-text-current-point-ps2-ref.png => show-text-current-point.ps2.ref.png} (100%)
 rename test/{show-text-current-point-ps3-ref.png => show-text-current-point.ps3.ref.png} (100%)
 rename test/{show-text-current-point-quartz-ref.png => show-text-current-point.quartz.ref.png} (100%)
 rename test/{show-text-current-point-ref.png => show-text-current-point.ref.png} (100%)
 rename test/{skew-extreme-ps2-ref.png => skew-extreme.ps2.ref.png} (100%)
 rename test/{skew-extreme-ps3-ref.png => skew-extreme.ps3.ref.png} (100%)
 rename test/{skew-extreme-ref.png => skew-extreme.ref.png} (100%)
 rename test/{smask-fill-pdf-ref.png => smask-fill.pdf.ref.png} (100%)
 rename test/{smask-fill-ref.png => smask-fill.ref.png} (100%)
 rename test/{smask-fill-svg11-ref.png => smask-fill.svg11.ref.png} (100%)
 rename test/{smask-fill-svg12-ref.png => smask-fill.svg12.ref.png} (100%)
 rename test/{smask-image-mask-pdf-ref.png => smask-image-mask.pdf.ref.png} (100%)
 rename test/{smask-image-mask-ref.png => smask-image-mask.ref.png} (100%)
 rename test/{smask-mask-pdf-ref.png => smask-mask.pdf.ref.png} (100%)
 rename test/{smask-mask-ref.png => smask-mask.ref.png} (100%)
 rename test/{smask-mask-svg11-ref.png => smask-mask.svg11.ref.png} (100%)
 rename test/{smask-mask-svg12-ref.png => smask-mask.svg12.ref.png} (100%)
 rename test/{smask-paint-pdf-ref.png => smask-paint.pdf.ref.png} (100%)
 rename test/{smask-paint-ref.png => smask-paint.ref.png} (100%)
 rename test/{smask-paint-svg11-ref.png => smask-paint.svg11.ref.png} (100%)
 rename test/{smask-paint-svg12-ref.png => smask-paint.svg12.ref.png} (100%)
 rename test/{smask-stroke-pdf-ref.png => smask-stroke.pdf.ref.png} (100%)
 rename test/{smask-stroke-ref.png => smask-stroke.ref.png} (100%)
 rename test/{smask-text-pdf-ref.png => smask-text.pdf.ref.png} (100%)
 rename test/{smask-text-ps2-ref.png => smask-text.ps2.ref.png} (100%)
 rename test/{smask-text-ps3-ref.png => smask-text.ps3.ref.png} (100%)
 rename test/{smask-text-ref.png => smask-text.ref.png} (100%)
 rename test/{smask-text-svg11-ref.png => smask-text.svg11.ref.png} (100%)
 rename test/{smask-text-svg12-ref.png => smask-text.svg12.ref.png} (100%)
 rename test/{smask-pdf-ref.png => smask.pdf.ref.png} (100%)
 rename test/{smask-ps2-ref.png => smask.ps2.ref.png} (100%)
 rename test/{smask-ps3-ref.png => smask.ps3.ref.png} (100%)
 rename test/{smask-ref.png => smask.ref.png} (100%)
 rename test/{smask-svg11-ref.png => smask.svg11.ref.png} (100%)
 rename test/{smask-svg12-ref.png => smask.svg12.ref.png} (100%)
 rename test/{solid-pattern-cache-stress-ref.png => solid-pattern-cache-stress.ref.png} (100%)
 rename test/{source-clip-scale-pdf-ref.png => source-clip-scale.pdf.ref.png} (100%)
 rename test/{source-clip-scale-ps2-argb32-ref.png => source-clip-scale.ps2.argb32.ref.png} (100%)
 rename test/{source-clip-scale-ps2-rgb24-ref.png => source-clip-scale.ps2.rgb24.ref.png} (100%)
 rename test/{source-clip-scale-ps3-argb32-ref.png => source-clip-scale.ps3.argb32.ref.png} (100%)
 rename test/{source-clip-scale-ps3-rgb24-ref.png => source-clip-scale.ps3.rgb24.ref.png} (100%)
 rename test/{source-clip-scale-quartz-ref.png => source-clip-scale.quartz.ref.png} (100%)
 rename test/{source-clip-scale-ref.png => source-clip-scale.ref.png} (100%)
 rename test/{source-clip-scale-svg11-ref.png => source-clip-scale.svg11.ref.png} (100%)
 rename test/{source-clip-scale-svg12-ref.png => source-clip-scale.svg12.ref.png} (100%)
 rename test/{source-clip-ref.png => source-clip.ref.png} (100%)
 rename test/{source-surface-scale-paint-ref.png => source-surface-scale-paint.ref.png} (100%)
 rename test/{source-surface-scale-paint-rgb24-ref.png => source-surface-scale-paint.rgb24.ref.png} (100%)
 rename test/{spline-decomposition-pdf-ref.png => spline-decomposition.pdf.ref.png} (100%)
 rename test/{spline-decomposition-ps2-ref.png => spline-decomposition.ps2.ref.png} (100%)
 rename test/{spline-decomposition-ps3-ref.png => spline-decomposition.ps3.ref.png} (100%)
 rename test/{spline-decomposition-ref.png => spline-decomposition.ref.png} (100%)
 rename test/{spline-decomposition-svg11-ref.png => spline-decomposition.svg11.ref.png} (100%)
 rename test/{spline-decomposition-svg12-ref.png => spline-decomposition.svg12.ref.png} (100%)
 rename test/{stroke-ctm-caps-ps2-ref.png => stroke-ctm-caps.ps2.ref.png} (100%)
 rename test/{stroke-ctm-caps-ps3-ref.png => stroke-ctm-caps.ps3.ref.png} (100%)
 rename test/{stroke-ctm-caps-quartz-ref.png => stroke-ctm-caps.quartz.ref.png} (100%)
 rename test/{stroke-ctm-caps-ref.png => stroke-ctm-caps.ref.png} (100%)
 rename test/{stroke-image-pdf-ref.png => stroke-image.pdf.ref.png} (100%)
 rename test/{stroke-image-ps2-ref.png => stroke-image.ps2.ref.png} (100%)
 rename test/{stroke-image-ps3-ref.png => stroke-image.ps3.ref.png} (100%)
 rename test/{stroke-image-quartz-ref.png => stroke-image.quartz.ref.png} (100%)
 rename test/{stroke-image-ref.png => stroke-image.ref.png} (100%)
 rename test/{surface-pattern-big-scale-down-ref.png => surface-pattern-big-scale-down.ref.png} (100%)
 rename test/{surface-pattern-scale-down-pdf-argb32-ref.png => surface-pattern-scale-down.pdf.argb32.ref.png} (100%)
 rename test/{surface-pattern-scale-down-pdf-rgb24-ref.png => surface-pattern-scale-down.pdf.rgb24.ref.png} (100%)
 rename test/{surface-pattern-scale-down-ps2-ref.png => surface-pattern-scale-down.ps2.ref.png} (100%)
 rename test/{surface-pattern-scale-down-ps3-ref.png => surface-pattern-scale-down.ps3.ref.png} (100%)
 rename test/{surface-pattern-scale-down-quartz-ref.png => surface-pattern-scale-down.quartz.ref.png} (100%)
 rename test/{surface-pattern-scale-down-ref.png => surface-pattern-scale-down.ref.png} (100%)
 rename test/{surface-pattern-scale-up-pdf-argb32-ref.png => surface-pattern-scale-up.pdf.argb32.ref.png} (100%)
 rename test/{surface-pattern-scale-up-pdf-rgb24-ref.png => surface-pattern-scale-up.pdf.rgb24.ref.png} (100%)
 rename test/{surface-pattern-scale-up-ps2-ref.png => surface-pattern-scale-up.ps2.ref.png} (100%)
 rename test/{surface-pattern-scale-up-ps3-ref.png => surface-pattern-scale-up.ps3.ref.png} (100%)
 rename test/{surface-pattern-scale-up-ref.png => surface-pattern-scale-up.ref.png} (100%)
 rename test/{surface-pattern-pdf-ref.png => surface-pattern.pdf.ref.png} (100%)
 rename test/{surface-pattern-ps2-ref.png => surface-pattern.ps2.ref.png} (100%)
 rename test/{surface-pattern-ps3-ref.png => surface-pattern.ps3.ref.png} (100%)
 rename test/{surface-pattern-ref.png => surface-pattern.ref.png} (100%)
 rename test/{surface-pattern-svg11-ref.png => surface-pattern.svg11.ref.png} (100%)
 rename test/{surface-pattern-svg12-ref.png => surface-pattern.svg12.ref.png} (100%)
 rename test/{svg-surface-source-ref.png => svg-surface-source.ref.png} (100%)
 rename test/{text-antialias-gray-quartz-ref.png => text-antialias-gray.quartz.ref.png} (100%)
 rename test/{text-antialias-gray-ref.png => text-antialias-gray.ref.png} (100%)
 rename test/{text-antialias-none-quartz-ref.png => text-antialias-none.quartz.ref.png} (100%)
 rename test/{text-antialias-none-ref.png => text-antialias-none.ref.png} (100%)
 rename test/{text-antialias-subpixel-quartz-ref.png => text-antialias-subpixel.quartz.ref.png} (100%)
 rename test/{text-antialias-subpixel-ref.png => text-antialias-subpixel.ref.png} (100%)
 rename test/{text-glyph-range-ps2-ref.png => text-glyph-range.ps2.ref.png} (100%)
 rename test/{text-glyph-range-ps3-ref.png => text-glyph-range.ps3.ref.png} (100%)
 rename test/{text-glyph-range-ref.png => text-glyph-range.ref.png} (100%)
 rename test/{text-pattern-pdf-argb32-ref.png => text-pattern.pdf.argb32.ref.png} (100%)
 rename test/{text-pattern-pdf-rgb24-ref.png => text-pattern.pdf.rgb24.ref.png} (100%)
 rename test/{text-pattern-ps3-argb32-ref.png => text-pattern.ps3.argb32.ref.png} (100%)
 rename test/{text-pattern-ps3-rgb24-ref.png => text-pattern.ps3.rgb24.ref.png} (100%)
 rename test/{text-pattern-quartz-ref.png => text-pattern.quartz.ref.png} (100%)
 rename test/{text-pattern-quartz-rgb24-ref.png => text-pattern.quartz.rgb24.ref.png} (100%)
 rename test/{text-pattern-ref.png => text-pattern.ref.png} (100%)
 rename test/{text-pattern-rgb24-ref.png => text-pattern.rgb24.ref.png} (100%)
 rename test/{text-pattern-svg11-argb32-ref.png => text-pattern.svg11.argb32.ref.png} (100%)
 rename test/{text-pattern-svg11-rgb24-ref.png => text-pattern.svg11.rgb24.ref.png} (100%)
 rename test/{text-pattern-svg12-argb32-ref.png => text-pattern.svg12.argb32.ref.png} (100%)
 rename test/{text-pattern-svg12-rgb24-ref.png => text-pattern.svg12.rgb24.ref.png} (100%)
 rename test/{text-rotate-pdf-ref.png => text-rotate.pdf.ref.png} (100%)
 rename test/{text-rotate-ps2-ref.png => text-rotate.ps2.ref.png} (100%)
 rename test/{text-rotate-ps3-ref.png => text-rotate.ps3.ref.png} (100%)
 rename test/{text-rotate-quartz-ref.png => text-rotate.quartz.ref.png} (100%)
 rename test/{text-rotate-ref.png => text-rotate.ref.png} (100%)
 rename test/{text-rotate-svg11-ref.png => text-rotate.svg11.ref.png} (100%)
 rename test/{text-rotate-svg12-ref.png => text-rotate.svg12.ref.png} (100%)
 rename test/{text-transform-pdf-ref.png => text-transform.pdf.ref.png} (100%)
 rename test/{text-transform-ps2-ref.png => text-transform.ps2.ref.png} (100%)
 rename test/{text-transform-ps3-ref.png => text-transform.ps3.ref.png} (100%)
 rename test/{text-transform-ref.png => text-transform.ref.png} (100%)
 rename test/{transforms-ps2-ref.png => transforms.ps2.ref.png} (100%)
 rename test/{transforms-ps3-ref.png => transforms.ps3.ref.png} (100%)
 rename test/{transforms-ref.png => transforms.ref.png} (100%)
 rename test/{translate-show-surface-ref.png => translate-show-surface.ref.png} (100%)
 rename test/{trap-clip-pdf-argb32-ref.png => trap-clip.pdf.argb32.ref.png} (100%)
 rename test/{trap-clip-pdf-rgb24-ref.png => trap-clip.pdf.rgb24.ref.png} (100%)
 rename test/{trap-clip-ps2-argb32-ref.png => trap-clip.ps2.argb32.ref.png} (100%)
 rename test/{trap-clip-ps2-rgb24-ref.png => trap-clip.ps2.rgb24.ref.png} (100%)
 rename test/{trap-clip-ps3-argb32-ref.png => trap-clip.ps3.argb32.ref.png} (100%)
 rename test/{trap-clip-ps3-rgb24-ref.png => trap-clip.ps3.rgb24.ref.png} (100%)
 rename test/{trap-clip-quartz-ref.png => trap-clip.quartz.ref.png} (100%)
 rename test/{trap-clip-quartz-rgb24-ref.png => trap-clip.quartz.rgb24.ref.png} (100%)
 rename test/{trap-clip-ref.png => trap-clip.ref.png} (100%)
 rename test/{trap-clip-rgb24-ref.png => trap-clip.rgb24.ref.png} (100%)
 rename test/{twin-ps2-ref.png => twin.ps2.ref.png} (100%)
 rename test/{twin-ps3-ref.png => twin.ps3.ref.png} (100%)
 rename test/{twin-ref.png => twin.ref.png} (100%)
 rename test/{twin-svg11-ref.png => twin.svg11.ref.png} (100%)
 rename test/{twin-svg12-ref.png => twin.svg12.ref.png} (100%)
 rename test/{unantialiased-shapes-quartz-ref.png => unantialiased-shapes.quartz.ref.png} (100%)
 rename test/{unantialiased-shapes-ref.png => unantialiased-shapes.ref.png} (100%)
 rename test/{unbounded-operator-quartz-ref.png => unbounded-operator.quartz.ref.png} (100%)
 rename test/{unbounded-operator-quartz-rgb24-ref.png => unbounded-operator.quartz.rgb24.ref.png} (100%)
 rename test/{unbounded-operator-ref.png => unbounded-operator.ref.png} (100%)
 rename test/{unbounded-operator-rgb24-ref.png => unbounded-operator.rgb24.ref.png} (100%)
 rename test/{user-font-mask-pdf-ref.png => user-font-mask.pdf.ref.png} (100%)
 rename test/{user-font-mask-ps2-ref.png => user-font-mask.ps2.ref.png} (100%)
 rename test/{user-font-mask-ps3-ref.png => user-font-mask.ps3.ref.png} (100%)
 rename test/{user-font-mask-ref.png => user-font-mask.ref.png} (100%)
 rename test/{user-font-mask-svg11-ref.png => user-font-mask.svg11.ref.png} (100%)
 rename test/{user-font-proxy-pdf-ref.png => user-font-proxy.pdf.ref.png} (100%)
 rename test/{user-font-proxy-ps2-ref.png => user-font-proxy.ps2.ref.png} (100%)
 rename test/{user-font-proxy-ps3-ref.png => user-font-proxy.ps3.ref.png} (100%)
 rename test/{user-font-proxy-ref.png => user-font-proxy.ref.png} (100%)
 rename test/{user-font-proxy-svg11-ref.png => user-font-proxy.svg11.ref.png} (100%)
 rename test/{user-font-proxy-svg12-ref.png => user-font-proxy.svg12.ref.png} (100%)
 rename test/{user-font-rescale-ps2-ref.png => user-font-rescale.ps2.ref.png} (100%)
 rename test/{user-font-rescale-ps3-ref.png => user-font-rescale.ps3.ref.png} (100%)
 rename test/{user-font-rescale-ref.png => user-font-rescale.ref.png} (100%)
 rename test/{user-font-rescale-svg11-ref.png => user-font-rescale.svg11.ref.png} (100%)
 rename test/{user-font-rescale-svg12-ref.png => user-font-rescale.svg12.ref.png} (100%)
 rename test/{user-font-ps2-ref.png => user-font.ps2.ref.png} (100%)
 rename test/{user-font-ps3-ref.png => user-font.ps3.ref.png} (100%)
 rename test/{user-font-ref.png => user-font.ref.png} (100%)
 rename test/{user-font-svg11-ref.png => user-font.svg11.ref.png} (100%)
 rename test/{user-font-svg12-ref.png => user-font.svg12.ref.png} (100%)
 rename test/{xlib-expose-event-ref.png => xlib-expose-event.ref.png} (100%)
 rename test/{xlib-surface-source-ps2-ref.png => xlib-surface-source.ps2.ref.png} (100%)
 rename test/{xlib-surface-source-ps3-ref.png => xlib-surface-source.ps3.ref.png} (100%)
 rename test/{xlib-surface-source-ref.png => xlib-surface-source.ref.png} (100%)
 rename test/{zero-alpha-ref.png => zero-alpha.ref.png} (100%)

diff --git a/test/.gitignore b/test/.gitignore
index ad707683d..24ec7a61c 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -17,10 +17,10 @@ pdf2png
 ps2png
 svg2png
 valgrind-log
-*-out.*
-*-pass.*
-*-fail.*
-*-diff.png
+*.out.*
+*.pass.*
+*.fail.*
+*.diff.png
 *.manifest
 *.gcda
 *.gcno
diff --git a/test/Makefile.am b/test/Makefile.am
index 46c68ba88..d49f2abb0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -292,703 +292,703 @@ CLEANFILES += $(BUILT_SOURCES)
 
 # All tests which have a reference image go here.
 REFERENCE_IMAGES = \
-	a1-image-sample-ref.png		\
-	a1-mask-ref.png	\
-	a1-traps-sample-ref.png		\
-	a8-mask-ref.png	\
-	alpha-similar-ref.png	\
-	alpha-similar-rgb24-ref.png	\
-	big-line-ref.png		\
-	big-line-rgb24-ref.png		\
-	big-line-ps2-ref.png		\
-	big-line-ps3-ref.png		\
-	big-line-ps2-rgb24-ref.png	\
-	big-line-ps3-rgb24-ref.png	\
-	big-line-quartz-ref.png		\
-	big-line-quartz-rgb24-ref.png	\
-	bilevel-image-ref.png		\
-	bitmap-font-ref.png	\
-	bitmap-font-rgb24-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-ref.png	\
-	caps-joins-ps2-ref.png	\
-	caps-joins-ps3-ref.png	\
-	caps-sub-paths-ref.png	\
-	clip-all-ref.png	\
-	clip-empty-ref.png	\
-	clip-fill-rule-pixel-aligned-ref.png	\
-	clip-fill-rule-pixel-aligned-rgb24-ref.png	\
-	clip-fill-rule-ps2-argb32-ref.png	\
-	clip-fill-rule-ps3-argb32-ref.png	\
-	clip-fill-rule-ps2-rgb24-ref.png		\
-	clip-fill-rule-ps3-rgb24-ref.png		\
-	clip-fill-rule-ref.png	\
-	clip-fill-rule-rgb24-ref.png	\
-	clip-nesting-ps2-argb32-ref.png	\
-	clip-nesting-ps3-argb32-ref.png	\
-	clip-nesting-ps2-rgb24-ref.png	\
-	clip-nesting-ps3-rgb24-ref.png	\
-	clip-nesting-quartz-ref.png	\
-	clip-nesting-quartz-rgb24-ref.png	\
-	clip-nesting-ref.png	\
-	clip-nesting-rgb24-ref.png	\
-	clip-operator-ref.png	\
-	clip-operator-pdf-argb32-ref.png \
-	clip-operator-pdf-rgb24-ref.png \
-	clip-operator-ps2-rgb24-ref.png	\
-	clip-operator-ps3-rgb24-ref.png	\
-	clip-operator-ps3-ref.png	\
-	clip-operator-rgb24-ref.png	\
-	clip-operator-quartz-ref.png	\
-	clip-operator-quartz-rgb24-ref.png	\
-	clip-push-group-ps2-argb32-ref.png	\
-	clip-push-group-ps3-argb32-ref.png	\
-	clip-push-group-ps2-rgb24-ref.png	\
-	clip-push-group-ps3-rgb24-ref.png	\
-	clip-push-group-quartz-ref.png	\
-	clip-push-group-ref.png	\
-	clip-twice-ps2-argb32-ref.png	\
-	clip-twice-ps3-argb32-ref.png	\
-	clip-twice-ps2-rgb24-ref.png	\
-	clip-twice-ps3-rgb24-ref.png	\
-	clip-twice-quartz-ref.png	\
-	clip-twice-quartz-rgb24-ref.png	\
-	clip-twice-ref.png	\
-	clip-twice-rgb24-ref.png	\
-	clipped-group-ref.png	\
-	clipped-group-ps2-ref.png	\
-	clipped-group-ps3-ref.png	\
-	clipped-surface-ref.png	\
-	close-path-ref.png	\
-	close-path-ps2-ref.png	\
-	close-path-ps3-ref.png	\
-	composite-integer-translate-over-ref.png	\
-	composite-integer-translate-over-ps2-ref.png	\
-	composite-integer-translate-over-ps3-ref.png	\
-	composite-integer-translate-over-repeat-ref.png	\
-	composite-integer-translate-over-repeat-ps2-ref.png	\
-	composite-integer-translate-over-repeat-ps3-ref.png	\
-	composite-integer-translate-source-ref.png	\
-	composite-integer-translate-source-ps2-ref.png	\
-	composite-integer-translate-source-ps3-ref.png	\
-	copy-path-ps2-ref.png	\
-	copy-path-ps3-ref.png	\
-	copy-path-ref.png	\
-	create-from-png-ref.png			\
-	create-from-png-alpha-ref.png		\
-	create-from-png-gray-ref.png		\
-	create-from-png-gray-alpha-ref.png	\
-	create-from-png-indexed-ref.png		\
-	create-from-png-indexed-alpha-ref.png	\
-	create-from-png-stream-ref.png	\
-	dash-caps-joins-ps2-argb32-ref.png	\
-	dash-caps-joins-ps3-argb32-ref.png	\
-	dash-caps-joins-ps2-rgb24-ref.png	\
-	dash-caps-joins-ps3-rgb24-ref.png	\
-	dash-caps-joins-quartz-ref.png	\
-	dash-caps-joins-ref.png	\
-	dash-curve-ref.png	\
-	dash-curve-ps2-ref.png \
-	dash-curve-ps3-ref.png \
-	dash-curve-quartz-ref.png \
-	dash-no-dash-ref.png	\
-	dash-offset-negative-ref.png	\
-	dash-scale-ps2-argb32-ref.png	\
-	dash-scale-ps3-argb32-ref.png	\
-	dash-scale-ps2-rgb24-ref.png	\
-	dash-scale-ps3-rgb24-ref.png	\
-	dash-scale-quartz-ref.png	\
-	dash-scale-ref.png	\
-	dash-state-ps2-ref.png	\
-	dash-state-ps3-ref.png	\
-	dash-state-ref.png	\
-	dash-state-quartz-ref.png	\
-	dash-zero-length-ps2-ref.png	\
-	dash-zero-length-ps3-ref.png	\
-	dash-zero-length-ps2-rgb24-ref.png	\
-	dash-zero-length-ps3-rgb24-ref.png	\
-	dash-zero-length-ref.png	\
-	dash-zero-length-rgb24-ref.png	\
-	degenerate-arc-ref.png		\
-	degenerate-arc-ps2-ref.png	\
-	degenerate-arc-ps3-ref.png	\
-	degenerate-dash-ref.png		\
-	degenerate-pen-ref.png		\
-	degenerate-pen-ps2-ref.png	\
-	degenerate-pen-ps3-ref.png	\
-	degenerate-pen-quartz-ref.png	\
-	degenerate-path-ps2-argb32-ref.png	\
-	degenerate-path-ps2-rgb24-ref.png	\
-	degenerate-path-ps3-argb32-ref.png	\
-	degenerate-path-ps3-rgb24-ref.png	\
-	degenerate-path-ref.png	\
-	degenerate-path-rgb24-ref.png	\
-	degenerate-path-quartz-ref.png	\
-	degenerate-path-quartz-rgb24-ref.png	\
-	device-offset-fractional-ref.png	\
-	device-offset-fractional-pdf-ref.png	\
-	device-offset-fractional-ps2-ref.png	\
-	device-offset-fractional-ps3-ref.png	\
-	device-offset-positive-ref.png	\
-	device-offset-positive-rgb24-ref.png	\
-	device-offset-ref.png	\
-	device-offset-rgb24-ref.png	\
-	device-offset-scale-ref.png	\
-	extend-pad-ref.png	\
-	extend-reflect-ref.png	\
-	extend-reflect-similar-ref.png	\
-	extend-reflect-similar-ps2-ref.png	\
-	extend-reflect-similar-ps3-ref.png	\
-	extend-reflect-ps2-ref.png \
-	extend-reflect-ps3-ref.png \
-	extend-repeat-ref.png	\
-	extend-repeat-ps2-ref.png	\
-	extend-repeat-ps3-ref.png	\
-	extend-repeat-similar-ref.png	\
-	extend-repeat-similar-ps2-ref.png	\
-	extend-repeat-similar-ps3-ref.png	\
-	fallback-resolution-ppi37.5x37.5-ref.png \
-	fallback-resolution-ppi37.5x72-ref.png \
-	fallback-resolution-ppi37.5x75-ref.png \
-	fallback-resolution-ppi37.5x150-ref.png \
-	fallback-resolution-ppi37.5x300-ref.png \
-	fallback-resolution-ppi37.5x600-ref.png \
-	fallback-resolution-ppi72x37.5-ref.png \
-	fallback-resolution-ppi72x72-ref.png \
-	fallback-resolution-ppi72x75-ref.png \
-	fallback-resolution-ppi72x150-ref.png \
-	fallback-resolution-ppi72x300-ref.png \
-	fallback-resolution-ppi72x600-ref.png \
-	fallback-resolution-ppi75x37.5-ref.png \
-	fallback-resolution-ppi75x72-ref.png \
-	fallback-resolution-ppi75x75-ref.png \
-	fallback-resolution-ppi75x150-ref.png \
-	fallback-resolution-ppi75x300-ref.png \
-	fallback-resolution-ppi75x600-ref.png \
-	fallback-resolution-ppi150x37.5-ref.png \
-	fallback-resolution-ppi150x72-ref.png \
-	fallback-resolution-ppi150x75-ref.png \
-	fallback-resolution-ppi150x150-ref.png \
-	fallback-resolution-ppi150x300-ref.png \
-	fallback-resolution-ppi150x600-ref.png \
-	fallback-resolution-ppi300x37.5-ref.png \
-	fallback-resolution-ppi300x72-ref.png \
-	fallback-resolution-ppi300x75-ref.png \
-	fallback-resolution-ppi300x150-ref.png \
-	fallback-resolution-ppi300x300-ref.png \
-	fallback-resolution-ppi300x600-ref.png \
-	fallback-resolution-ppi600x37.5-ref.png \
-	fallback-resolution-ppi600x72-ref.png \
-	fallback-resolution-ppi600x75-ref.png \
-	fallback-resolution-ppi600x150-ref.png \
-	fallback-resolution-ppi600x300-ref.png \
-	fallback-resolution-ppi600x600-ref.png \
-	fill-alpha-ref.png	\
-	fill-alpha-pattern-ref.png	\
-	fill-alpha-pattern-pdf-argb32-ref.png	\
-	fill-alpha-pattern-pdf-rgb24-ref.png	\
-	fill-alpha-pattern-ps3-ref.png	\
-	fill-and-stroke-alpha-add-quartz-ref.png	\
-	fill-and-stroke-alpha-add-ref.png	\
-	fill-and-stroke-alpha-quartz-ref.png	\
-	fill-and-stroke-alpha-ref.png	\
-	fill-and-stroke-ps2-argb32-ref.png	\
-	fill-and-stroke-ps3-argb32-ref.png	\
-	fill-and-stroke-ps2-rgb24-ref.png	\
-	fill-and-stroke-ps3-rgb24-ref.png	\
-	fill-and-stroke-quartz-ref.png	\
-	fill-and-stroke-quartz-rgb24-ref.png	\
-	fill-and-stroke-ref.png	\
-	fill-and-stroke-rgb24-ref.png	\
-	fill-degenerate-sort-order-quartz-ref.png	\
-	fill-degenerate-sort-order-quartz-rgb24-ref.png	\
-	fill-degenerate-sort-order-ref.png	\
-	fill-degenerate-sort-order-rgb24-ref.png	\
-	fill-missed-stop-ps2-argb32-ref.png	\
-	fill-missed-stop-ps3-argb32-ref.png	\
-	fill-missed-stop-ps2-rgb24-ref.png	\
-	fill-missed-stop-ps3-rgb24-ref.png	\
-	fill-missed-stop-ref.png	\
-	fill-missed-stop-rgb24-ref.png	\
-	fill-rule-ps2-argb32-ref.png	\
-	fill-rule-ps3-argb32-ref.png	\
-	fill-rule-ps2-rgb24-ref.png \
-	fill-rule-ps3-rgb24-ref.png \
-	fill-rule-quartz-ref.png	\
-	fill-rule-quartz-rgb24-ref.png	\
-	fill-rule-ref.png	\
-	fill-rule-rgb24-ref.png	\
-	filter-bilinear-extents-ref.png \
-	filter-bilinear-extents-pdf-ref.png \
-	filter-bilinear-extents-ps2-ref.png \
-	filter-bilinear-extents-ps3-ref.png \
-	filter-nearest-offset-ref.png	\
-	filter-nearest-offset-pdf-ref.png	\
-	filter-nearest-offset-ps2-ref.png	\
-	filter-nearest-offset-ps3-ref.png	\
-	filter-nearest-offset-svg11-ref.png	\
-	filter-nearest-offset-svg12-ref.png	\
-	filter-nearest-transformed-ref.png	\
-	filter-nearest-transformed-pdf-ref.png	\
-	filter-nearest-transformed-svg11-ref.png	\
-	filter-nearest-transformed-svg12-ref.png	\
-	finer-grained-fallbacks-ref.png			\
-	finer-grained-fallbacks-rgb24-ref.png		\
-	finer-grained-fallbacks-ps2-ref.png	\
-	finer-grained-fallbacks-ps2-rgb24-ref.png	\
-	finer-grained-fallbacks-ps3-ref.png	\
-	finer-grained-fallbacks-ps3-rgb24-ref.png	\
-	font-matrix-translation-ps2-argb32-ref.png	\
-	font-matrix-translation-ps3-argb32-ref.png	\
-	font-matrix-translation-ps2-rgb24-ref.png	\
-	font-matrix-translation-ps3-rgb24-ref.png	\
-	font-matrix-translation-ref.png	\
-	font-matrix-translation-svg12-ref.png	\
-	font-matrix-translation-svg11-ref.png	\
-	font-matrix-translation-quartz-ref.png \
-	ft-text-antialias-none-ps2-argb32-ref.png	\
-	ft-text-antialias-none-ps3-argb32-ref.png	\
-	ft-text-antialias-none-ref.png	\
-	ft-show-glyphs-positioning-ref.png		\
-	ft-show-glyphs-positioning-pdf-ref.png		\
-	ft-show-glyphs-positioning-ps2-ref.png		\
-	ft-show-glyphs-positioning-ps3-ref.png		\
-	ft-show-glyphs-positioning-svg12-ref.png		\
-	ft-show-glyphs-positioning-svg11-ref.png		\
-	ft-show-glyphs-table-ref.png			\
-	ft-show-glyphs-table-ps2-ref.png			\
-	ft-show-glyphs-table-ps3-ref.png			\
-	ft-text-vertical-layout-type1-pdf-ref.png	\
-	ft-text-vertical-layout-type1-ps2-ref.png	\
-	ft-text-vertical-layout-type1-ps3-ref.png	\
-	ft-text-vertical-layout-type1-ref.png	\
-	ft-text-vertical-layout-type1-svg12-ref.png	\
-	ft-text-vertical-layout-type1-svg11-ref.png	\
-	ft-text-vertical-layout-type3-pdf-ref.png	\
-	ft-text-vertical-layout-type3-ps2-ref.png	\
-	ft-text-vertical-layout-type3-ps3-ref.png	\
-	ft-text-vertical-layout-type3-ref.png	\
-	ft-text-vertical-layout-type3-svg12-ref.png	\
-	ft-text-vertical-layout-type3-svg11-ref.png	\
-	get-group-target-ref.png	\
-	glitz-surface-source-ref.png \
-	glyph-cache-pressure-ref.png	\
-	glyph-cache-pressure-ps2-ref.png	\
-	glyph-cache-pressure-ps3-ref.png	\
-	glyph-cache-pressure-quartz-ref.png	\
-	gradient-alpha-pdf-argb32-ref.png	\
-	gradient-alpha-pdf-rgb24-ref.png	\
-	gradient-alpha-ps2-argb32-ref.png	\
-	gradient-alpha-ps3-argb32-ref.png	\
-	gradient-alpha-ps2-rgb24-ref.png	\
-	gradient-alpha-ps3-rgb24-ref.png	\
-	gradient-alpha-ref.png	\
-	gradient-alpha-rgb24-ref.png	\
-	gradient-constant-alpha-pdf-argb32-ref.png	\
-	gradient-constant-alpha-pdf-rgb24-ref.png	\
-	gradient-constant-alpha-ps3-ref.png		\
-	gradient-constant-alpha-ps3-rgb24-ref.png	\
-	gradient-constant-alpha-ref.png	\
-	gradient-constant-alpha-rgb24-ref.png	\
-	gradient-zero-stops-ref.png	\
-	gradient-zero-stops-rgb24-ref.png	\
-	group-paint-ref.png	\
-	huge-pattern-ref.png	\
-	huge-pattern-ps3-ref.png	\
-	huge-pattern-pdf-ref.png	\
-	huge-pattern-pdf-rgb24-ref.png	\
-	image-surface-source-ref.png \
-	image-surface-source-ps2-ref.png \
-	image-surface-source-ps3-ref.png \
-	infinite-join-ref.png	\
-	infinite-join-ps2-ref.png	\
-	infinite-join-ps3-ref.png	\
-	large-clip-ref.png	\
-	large-font-ref.png	\
-	large-source-ref.png	\
-	leaky-dash-ps2-argb32-ref.png	\
-	leaky-dash-ps3-argb32-ref.png	\
-	leaky-dash-ps2-rgb24-ref.png	\
-	leaky-dash-ps3-rgb24-ref.png	\
-	leaky-dash-quartz-ref.png	\
-	leaky-dash-ref.png	\
-	leaky-dashed-rectangle-ref.png		\
-	leaky-dashed-rectangle-ps2-ref.png	\
-	leaky-dashed-rectangle-ps3-ref.png	\
-	leaky-dashed-stroke-ref.png		\
-	leaky-dashed-stroke-ps2-ref.png		\
-	leaky-dashed-stroke-ps3-ref.png		\
-	leaky-polygon-ref.png	\
-	leaky-polygon-ps2-ref.png	\
-	leaky-polygon-ps3-ref.png	\
-	linear-gradient-reflect-ref.png	\
-	linear-gradient-reflect-pdf-argb32-ref.png	\
-	linear-gradient-reflect-pdf-rgb24-ref.png	\
-	linear-gradient-reflect-ps3-ref.png	\
-	linear-gradient-reflect-quartz-ref.png	\
-	linear-gradient-pdf-ref.png	\
-	linear-gradient-ps3-ref.png	\
-	linear-gradient-quartz-ref.png	\
-	linear-gradient-ref.png	\
-	linear-gradient-svg12-ref.png	\
-	linear-gradient-svg11-ref.png	\
-	line-width-ref.png	\
-	line-width-scale-ps2-ref.png	\
-	line-width-scale-ps3-ref.png	\
-	line-width-scale-quartz-ref.png	\
-	line-width-scale-ref.png	\
-	long-dashed-lines-ref.png	\
-	long-dashed-lines-ps2-ref.png	\
-	long-dashed-lines-ps3-ref.png	\
-	long-dashed-lines-quartz-ref.png	\
-	long-lines-ref.png	\
-	mask-alpha-ref.png	\
-	mask-alpha-svg11-argb32-ref.png	\
-	mask-alpha-svg12-argb32-ref.png	\
-	mask-alpha-rgb24-ref.png	\
-	mask-alpha-quartz-argb32-ref.png \
-	mask-ctm-ref.png	\
-	mask-ctm-rgb24-ref.png	\
-	mask-ctm-svg11-argb32-ref.png	\
-	mask-ctm-svg12-argb32-ref.png	\
-	mask-ref.png	\
-	mask-rgb24-ref.png	\
-	mask-pdf-argb32-ref.png	\
-	mask-pdf-rgb24-ref.png	\
-	mask-quartz-ref.png	\
-	mask-quartz-rgb24-ref.png	\
-	mask-surface-ctm-ref.png	\
-	mask-surface-ctm-rgb24-ref.png	\
-	mask-surface-ctm-svg11-argb32-ref.png	\
-	mask-surface-ctm-svg12-argb32-ref.png	\
-	mask-svg11-rgb24-ref.png	\
-	mask-svg11-argb32-ref.png	\
-	mask-svg12-rgb24-ref.png	\
-	mask-svg12-argb32-ref.png	\
-	mask-transformed-image-ref.png	\
-	mask-transformed-similar-ref.png	\
-	mask-transformed-similar-pdf-ref.png	\
-	mask-transformed-similar-svg12-ref.png	\
-	mask-transformed-similar-svg11-ref.png	\
-	meta-surface-pattern-ref.png		\
-	meta-surface-pattern-rgb24-ref.png	\
-	meta-surface-pattern-pdf-ref.png	\
-	meta-surface-pattern-pdf-rgb24-ref.png	\
-	meta-surface-pattern-ps2-argb32-ref.png	\
-	meta-surface-pattern-ps2-rgb24-ref.png	\
-	meta-surface-pattern-ps3-argb32-ref.png	\
-	meta-surface-pattern-ps3-rgb24-ref.png	\
-	meta-surface-pattern-quartz-ref.png	\
-	meta-surface-pattern-quartz-rgb24-ref.png	\
-	meta-surface-pattern-svg11-argb32-ref.png	\
-	meta-surface-pattern-svg11-rgb24-ref.png	\
-	meta-surface-pattern-svg12-argb32-ref.png	\
-	meta-surface-pattern-svg12-rgb24-ref.png	\
-	miter-precision-ref.png \
-	miter-precision-ps2-ref.png	\
-	miter-precision-ps3-ref.png	\
-	move-to-show-surface-ref.png	\
-	new-sub-path-ps2-argb32-ref.png	\
-	new-sub-path-ps3-argb32-ref.png	\
-	new-sub-path-ps2-rgb24-ref.png	\
-	new-sub-path-ps3-rgb24-ref.png	\
-	new-sub-path-quartz-ref.png	\
-	new-sub-path-quartz-rgb24-ref.png	\
-	new-sub-path-ref.png	\
-	new-sub-path-rgb24-ref.png	\
-	nil-surface-ref.png	\
-	nil-surface-rgb24-ref.png	\
-	operator-ref.png	\
-	operator-rgb24-ref.png	\
-	operator-alpha-ref.png	\
-	operator-alpha-rgb24-ref.png	\
-	operator-clear-quartz-ref.png	\
-	operator-clear-quartz-rgb24-ref.png	\
-	operator-clear-ref.png	\
-	operator-clear-rgb24-ref.png	\
-	operator-clear-pdf-argb32-ref.png	\
-	operator-clear-pdf-rgb24-ref.png	\
-	operator-source-pdf-argb32-ref.png	\
-	operator-source-pdf-rgb24-ref.png	\
-	operator-source-ref.png	\
-	operator-source-rgb24-ref.png	\
-	operator-source-quartz-ref.png \
-	operator-source-quartz-rgb24-ref.png \
-	over-above-source-ps2-argb32-ref.png       \
-	over-above-source-ps3-argb32-ref.png       \
-	over-above-source-quartz-ref.png	  \
-	over-above-source-quartz-rgb24-ref.png	  \
-	over-above-source-ref.png                 \
-	over-above-source-rgb24-ref.png           \
-	over-around-source-ps2-argb32-ref.png       \
-	over-around-source-ps3-argb32-ref.png       \
-	over-around-source-ps2-rgb24-ref.png        \
-	over-around-source-ps3-rgb24-ref.png        \
-	over-around-source-quartz-ref.png	   \
-	over-around-source-quartz-rgb24-ref.png	   \
-	over-around-source-ref.png                 \
-	over-around-source-rgb24-ref.png           \
-	over-below-source-ps2-argb32-ref.png       \
-	over-below-source-ps3-argb32-ref.png       \
-	over-below-source-ref.png                 \
-	over-below-source-rgb24-ref.png           \
-	over-between-source-ps2-argb32-ref.png     \
-	over-between-source-ps3-argb32-ref.png     \
-	over-between-source-quartz-ref.png        \
-	over-between-source-quartz-rgb24-ref.png  \
-	over-between-source-ref.png                 \
-	over-between-source-rgb24-ref.png           \
-	paint-ref.png	\
-	paint-repeat-ref.png	\
-	paint-source-alpha-pdf-argb32-ref.png	\
-	paint-source-alpha-ref.png	\
-	paint-source-alpha-svg12-ref.png	\
-	paint-source-alpha-svg11-ref.png	\
-	paint-with-alpha-ref.png	\
-	paint-with-alpha-svg12-ref.png	\
-	paint-with-alpha-svg11-ref.png	\
-	paint-source-alpha-pdf-ref.png \
-	paint-with-alpha-pdf-ref.png \
-	pass-through-ref.png \
-	pass-through-rgb24-ref.png \
-	pattern-getters-ref.png	\
-	pdf-surface-source-ref.png \
-	pixman-rotate-ref.png	\
-	pixman-rotate-rgb24-ref.png	\
-	ps-surface-source-ref.png \
-	push-group-pdf-ref.png \
-	push-group-pdf-rgb24-ref.png \
-	push-group-ref.png	\
-	push-group-rgb24-ref.png	\
-	push-group-svg11-argb32-ref.png	\
-	push-group-svg12-argb32-ref.png	\
-	radial-gradient-ref.png	\
-	radial-gradient-pdf-ref.png \
-	radial-gradient-quartz-ref.png \
-	radial-gradient-svg12-ref.png	\
-	radial-gradient-svg11-ref.png	\
-	random-intersections-ref.png	\
-	random-intersections-ps2-ref.png \
-	random-intersections-ps3-ref.png \
-	random-intersections-quartz-ref.png \
-	rgb24-ignore-alpha-ref.png \
-	rectangle-rounding-error-ref.png	\
-	rectilinear-fill-ref.png	\
-	rectilinear-miter-limit-ref.png		\
-	rectilinear-miter-limit-ps2-ref.png	\
-	rectilinear-miter-limit-ps3-ref.png	\
-	rectilinear-stroke-ref.png	\
-	reflected-stroke-ref.png	\
-	reflected-stroke-ps2-ref.png	\
-	reflected-stroke-ps3-ref.png	\
-	reflected-stroke-quartz-ref.png	\
-	rel-path-quartz-ref.png	\
-	rel-path-quartz-rgb24-ref.png	\
-	rel-path-ps2-rgb24-ref.png	\
-	rel-path-ps3-rgb24-ref.png	\
-	rel-path-ref.png	\
-	rel-path-rgb24-ref.png	\
-	rotate-image-surface-paint-pdf-rgb24-ref.png \
-	rotate-image-surface-paint-ps2-ref.png \
-	rotate-image-surface-paint-ps3-ref.png \
-	rotate-image-surface-paint-pdf-argb32-ref.png	\
-	rotate-image-surface-paint-quartz-ref.png	\
-	rotate-image-surface-paint-ref.png	\
-	rotate-image-surface-paint-svg12-ref.png	\
-	rotate-image-surface-paint-svg11-ref.png	\
-	scale-down-source-surface-paint-ref.png	\
-	scale-source-surface-paint-pdf-argb32-ref.png	\
-	scale-source-surface-paint-ref.png	\
-	scale-source-surface-paint-rgb24-ref.png	\
-	scale-source-surface-paint-svg11-argb32-ref.png	\
-	scale-source-surface-paint-svg11-rgb24-ref.png	\
-	scale-source-surface-paint-svg12-argb32-ref.png	\
-	scale-source-surface-paint-svg12-rgb24-ref.png	\
-	scale-source-surface-paint-pdf-rgb24-ref.png \
-	stroke-ctm-caps-ref.png \
-	stroke-ctm-caps-quartz-ref.png \
-	select-font-face-ref.png	\
-	select-font-face-ps2-ref.png \
-	select-font-face-ps3-ref.png \
-	select-font-face-quartz-ref.png \
-	self-copy-ref.png	\
-	self-copy-ps2-ref.png	\
-	self-copy-ps3-ref.png	\
-	self-copy-overlap-ref.png	\
-	self-copy-overlap-rgb24-ref.png	\
-	self-intersecting-ref.png	\
-	self-intersecting-rgb24-ref.png	\
-	set-source-ref.png	\
-	set-source-rgb24-ref.png	\
-	set-source-svg11-argb32-ref.png	\
-	set-source-svg12-argb32-ref.png	\
-	show-glyphs-many-ref.png	\
-	show-text-current-point-ref.png	\
-	show-text-current-point-ps2-ref.png \
-	show-text-current-point-ps3-ref.png \
-	show-text-current-point-quartz-ref.png \
-	skew-extreme-ref.png \
-	skew-extreme-ps2-ref.png \
-	skew-extreme-ps3-ref.png \
-	smask-ref.png			\
-	smask-pdf-ref.png		\
-	smask-ps2-ref.png		\
-	smask-ps3-ref.png		\
-	smask-svg12-ref.png		\
-	smask-svg11-ref.png		\
-	smask-fill-ref.png		\
-	smask-fill-pdf-ref.png		\
-	smask-fill-svg12-ref.png	\
-	smask-fill-svg11-ref.png	\
-	smask-image-mask-ref.png	\
-	smask-image-mask-pdf-ref.png	\
-	smask-mask-ref.png		\
-	smask-mask-pdf-ref.png		\
-	smask-mask-svg12-ref.png	\
-	smask-mask-svg11-ref.png	\
-	smask-paint-ref.png		\
-	smask-paint-pdf-ref.png		\
-	smask-paint-svg12-ref.png	\
-	smask-paint-svg11-ref.png	\
-	smask-stroke-ref.png		\
-	smask-stroke-pdf-ref.png	\
-	smask-text-ref.png		\
-	smask-text-pdf-ref.png		\
-	smask-text-ps2-ref.png		\
-	smask-text-ps3-ref.png		\
-	smask-text-svg12-ref.png	\
-	smask-text-svg11-ref.png	\
-	stroke-image-ref.png \
-	stroke-image-pdf-ref.png \
-	stroke-image-ps2-ref.png \
-	stroke-image-ps3-ref.png \
-	stroke-image-quartz-ref.png \
-	solid-pattern-cache-stress-ref.png	\
-	source-clip-ref.png	\
-	source-clip-scale-quartz-ref.png	\
-	source-clip-scale-ps2-argb32-ref.png	\
-	source-clip-scale-ps3-argb32-ref.png	\
-	source-clip-scale-ps2-rgb24-ref.png	\
-	source-clip-scale-ps3-rgb24-ref.png	\
-	source-clip-scale-ref.png	\
-	source-clip-scale-svg12-ref.png	\
-	source-clip-scale-svg11-ref.png	\
-	source-clip-scale-pdf-ref.png \
-	source-surface-scale-paint-ref.png	\
-	source-surface-scale-paint-rgb24-ref.png	\
-	spline-decomposition-ref.png \
-	spline-decomposition-ps2-ref.png \
-	spline-decomposition-ps3-ref.png \
-	spline-decomposition-pdf-ref.png \
-	spline-decomposition-svg11-ref.png \
-	spline-decomposition-svg12-ref.png \
-	stroke-ctm-caps-ps2-ref.png \
-	stroke-ctm-caps-ps3-ref.png \
-	surface-pattern-big-scale-down-ref.png	\
-	surface-pattern-pdf-ref.png	\
-	surface-pattern-ps2-ref.png	\
-	surface-pattern-ps3-ref.png	\
-	surface-pattern-ref.png	\
-	surface-pattern-scale-down-pdf-argb32-ref.png	\
-	surface-pattern-scale-down-pdf-rgb24-ref.png	\
-	surface-pattern-scale-down-ps2-ref.png	\
-	surface-pattern-scale-down-ps3-ref.png	\
-	surface-pattern-scale-down-ref.png	\
-	surface-pattern-scale-down-quartz-ref.png	\
-	surface-pattern-scale-up-pdf-argb32-ref.png	\
-	surface-pattern-scale-up-pdf-rgb24-ref.png	\
-	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	\
-	svg-surface-source-ref.png \
-	text-antialias-gray-ref.png	\
-	text-antialias-gray-quartz-ref.png	\
-	text-antialias-none-ref.png	\
-	text-antialias-none-quartz-ref.png	\
-	text-antialias-subpixel-ref.png	\
-	text-antialias-subpixel-quartz-ref.png	\
-	text-glyph-range-ref.png	\
-	text-glyph-range-ps2-ref.png	\
-	text-glyph-range-ps3-ref.png	\
-	text-pattern-ps3-argb32-ref.png	\
-	text-pattern-ps3-rgb24-ref.png	\
-	text-pattern-ref.png	\
-	text-pattern-rgb24-ref.png	\
-	text-pattern-svg11-argb32-ref.png	\
-	text-pattern-svg11-rgb24-ref.png	\
-	text-pattern-svg12-argb32-ref.png	\
-	text-pattern-svg12-rgb24-ref.png	\
-	text-pattern-pdf-argb32-ref.png \
-	text-pattern-pdf-rgb24-ref.png \
-	text-pattern-quartz-ref.png \
-	text-pattern-quartz-rgb24-ref.png \
-	text-rotate-ref.png	\
-	text-rotate-pdf-ref.png \
-	text-rotate-ps2-ref.png	\
-	text-rotate-ps3-ref.png	\
-	text-rotate-svg12-ref.png \
-	text-rotate-svg11-ref.png \
-	text-rotate-quartz-ref.png \
-	text-transform-ref.png		\
-	text-transform-pdf-ref.png	\
-	text-transform-ps2-ref.png	\
-	text-transform-ps3-ref.png	\
-	transforms-ref.png	\
-	transforms-ps2-ref.png	\
-	transforms-ps3-ref.png	\
-	translate-show-surface-ref.png	\
-	trap-clip-quartz-ref.png	\
-	trap-clip-quartz-rgb24-ref.png	\
-	trap-clip-ps3-argb32-ref.png	\
-	trap-clip-ps3-rgb24-ref.png	\
-	trap-clip-ref.png	\
-	trap-clip-rgb24-ref.png	\
-	trap-clip-pdf-argb32-ref.png \
-	trap-clip-pdf-rgb24-ref.png \
-	trap-clip-ps2-argb32-ref.png \
-	trap-clip-ps2-rgb24-ref.png \
-	twin-ref.png \
-	twin-ps2-ref.png \
-	twin-ps3-ref.png \
-	twin-svg11-ref.png \
-	twin-svg12-ref.png \
-	unantialiased-shapes-ref.png	\
-	unantialiased-shapes-quartz-ref.png \
-	unbounded-operator-ref.png	\
-	unbounded-operator-rgb24-ref.png	\
-	user-font-ref.png	\
-	user-font-ps2-ref.png \
-	user-font-ps3-ref.png \
-	user-font-svg12-ref.png	\
-	user-font-svg11-ref.png	\
-	user-font-mask-ref.png		\
-	user-font-mask-pdf-ref.png	\
-	user-font-mask-ps2-ref.png	\
-	user-font-mask-ps3-ref.png	\
-	user-font-mask-svg11-ref.png	\
-	user-font-proxy-ref.png	\
-	user-font-proxy-pdf-ref.png	\
-	user-font-proxy-ps2-ref.png	\
-	user-font-proxy-ps3-ref.png	\
-	user-font-proxy-svg12-ref.png	\
-	user-font-proxy-svg11-ref.png	\
-	user-font-rescale-ref.png	\
-	user-font-rescale-ps2-ref.png	\
-	user-font-rescale-ps3-ref.png	\
-	user-font-rescale-svg12-ref.png	\
-	user-font-rescale-svg11-ref.png	\
-	unbounded-operator-quartz-ref.png	\
-	unbounded-operator-quartz-rgb24-ref.png	\
-	xlib-expose-event-ref.png \
-	xlib-surface-source-ref.png \
-	xlib-surface-source-ps2-ref.png \
-	xlib-surface-source-ps3-ref.png \
-	zero-alpha-ref.png
+	a1-image-sample.ref.png		\
+	a1-mask.ref.png	\
+	a1-traps-sample.ref.png		\
+	a8-mask.ref.png	\
+	alpha-similar.ref.png	\
+	alpha-similar.rgb24.ref.png	\
+	big-line.ref.png		\
+	big-line.rgb24.ref.png		\
+	big-line.ps2.ref.png		\
+	big-line.ps3.ref.png		\
+	big-line.ps2.rgb24.ref.png	\
+	big-line.ps3.rgb24.ref.png	\
+	big-line.quartz.ref.png		\
+	big-line.quartz.rgb24.ref.png	\
+	bilevel-image.ref.png		\
+	bitmap-font.ref.png	\
+	bitmap-font.rgb24.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.ref.png	\
+	caps-joins.ps2.ref.png	\
+	caps-joins.ps3.ref.png	\
+	caps-sub-paths.ref.png	\
+	clip-all.ref.png	\
+	clip-empty.ref.png	\
+	clip-fill-rule-pixel-aligned.ref.png	\
+	clip-fill-rule-pixel-aligned.rgb24.ref.png	\
+	clip-fill-rule.ps2.argb32.ref.png	\
+	clip-fill-rule.ps3.argb32.ref.png	\
+	clip-fill-rule.ps2.rgb24.ref.png		\
+	clip-fill-rule.ps3.rgb24.ref.png		\
+	clip-fill-rule.ref.png	\
+	clip-fill-rule.rgb24.ref.png	\
+	clip-nesting.ps2.argb32.ref.png	\
+	clip-nesting.ps3.argb32.ref.png	\
+	clip-nesting.ps2.rgb24.ref.png	\
+	clip-nesting.ps3.rgb24.ref.png	\
+	clip-nesting.quartz.ref.png	\
+	clip-nesting.quartz.rgb24.ref.png	\
+	clip-nesting.ref.png	\
+	clip-nesting.rgb24.ref.png	\
+	clip-operator.ref.png	\
+	clip-operator.pdf.argb32.ref.png \
+	clip-operator.pdf.rgb24.ref.png \
+	clip-operator.ps2.rgb24.ref.png	\
+	clip-operator.ps3.rgb24.ref.png	\
+	clip-operator.ps3.ref.png	\
+	clip-operator.rgb24.ref.png	\
+	clip-operator.quartz.ref.png	\
+	clip-operator.quartz.rgb24.ref.png	\
+	clip-push-group.ps2.argb32.ref.png	\
+	clip-push-group.ps3.argb32.ref.png	\
+	clip-push-group.ps2.rgb24.ref.png	\
+	clip-push-group.ps3.rgb24.ref.png	\
+	clip-push-group.quartz.ref.png	\
+	clip-push-group.ref.png	\
+	clip-twice.ps2.argb32.ref.png	\
+	clip-twice.ps3.argb32.ref.png	\
+	clip-twice.ps2.rgb24.ref.png	\
+	clip-twice.ps3.rgb24.ref.png	\
+	clip-twice.quartz.ref.png	\
+	clip-twice.quartz.rgb24.ref.png	\
+	clip-twice.ref.png	\
+	clip-twice.rgb24.ref.png	\
+	clipped-group.ref.png	\
+	clipped-group.ps2.ref.png	\
+	clipped-group.ps3.ref.png	\
+	clipped-surface.ref.png	\
+	close-path.ref.png	\
+	close-path.ps2.ref.png	\
+	close-path.ps3.ref.png	\
+	composite-integer-translate-over.ref.png	\
+	composite-integer-translate-over.ps2.ref.png	\
+	composite-integer-translate-over.ps3.ref.png	\
+	composite-integer-translate-over-repeat.ref.png	\
+	composite-integer-translate-over-repeat.ps2.ref.png	\
+	composite-integer-translate-over-repeat.ps3.ref.png	\
+	composite-integer-translate-source.ref.png	\
+	composite-integer-translate-source.ps2.ref.png	\
+	composite-integer-translate-source.ps3.ref.png	\
+	copy-path.ps2.ref.png	\
+	copy-path.ps3.ref.png	\
+	copy-path.ref.png	\
+	create-from-png.ref.png			\
+	create-from-png.alpha.ref.png		\
+	create-from-png.gray.ref.png		\
+	create-from-png.gray-alpha.ref.png	\
+	create-from-png.indexed.ref.png		\
+	create-from-png.indexed-alpha.ref.png	\
+	create-from-png-stream.ref.png	\
+	dash-caps-joins.ps2.argb32.ref.png	\
+	dash-caps-joins.ps3.argb32.ref.png	\
+	dash-caps-joins.ps2.rgb24.ref.png	\
+	dash-caps-joins.ps3.rgb24.ref.png	\
+	dash-caps-joins.quartz.ref.png	\
+	dash-caps-joins.ref.png	\
+	dash-curve.ref.png	\
+	dash-curve.ps2.ref.png \
+	dash-curve.ps3.ref.png \
+	dash-curve.quartz.ref.png \
+	dash-no-dash.ref.png	\
+	dash-offset-negative.ref.png	\
+	dash-scale.ps2.argb32.ref.png	\
+	dash-scale.ps3.argb32.ref.png	\
+	dash-scale.ps2.rgb24.ref.png	\
+	dash-scale.ps3.rgb24.ref.png	\
+	dash-scale.quartz.ref.png	\
+	dash-scale.ref.png	\
+	dash-state.ps2.ref.png	\
+	dash-state.ps3.ref.png	\
+	dash-state.ref.png	\
+	dash-state.quartz.ref.png	\
+	dash-zero-length.ps2.ref.png	\
+	dash-zero-length.ps3.ref.png	\
+	dash-zero-length.ps2.rgb24.ref.png	\
+	dash-zero-length.ps3.rgb24.ref.png	\
+	dash-zero-length.ref.png	\
+	dash-zero-length.rgb24.ref.png	\
+	degenerate-arc.ref.png		\
+	degenerate-arc.ps2.ref.png	\
+	degenerate-arc.ps3.ref.png	\
+	degenerate-dash.ref.png		\
+	degenerate-pen.ref.png		\
+	degenerate-pen.ps2.ref.png	\
+	degenerate-pen.ps3.ref.png	\
+	degenerate-pen.quartz.ref.png	\
+	degenerate-path.ps2.argb32.ref.png	\
+	degenerate-path.ps2.rgb24.ref.png	\
+	degenerate-path.ps3.argb32.ref.png	\
+	degenerate-path.ps3.rgb24.ref.png	\
+	degenerate-path.ref.png	\
+	degenerate-path.rgb24.ref.png	\
+	degenerate-path.quartz.ref.png	\
+	degenerate-path.quartz.rgb24.ref.png	\
+	device-offset-fractional.ref.png	\
+	device-offset-fractional.pdf.ref.png	\
+	device-offset-fractional.ps2.ref.png	\
+	device-offset-fractional.ps3.ref.png	\
+	device-offset-positive.ref.png	\
+	device-offset-positive.rgb24.ref.png	\
+	device-offset.ref.png	\
+	device-offset.rgb24.ref.png	\
+	device-offset-scale.ref.png	\
+	extend-pad.ref.png	\
+	extend-reflect.ref.png	\
+	extend-reflect-similar.ref.png	\
+	extend-reflect-similar.ps2.ref.png	\
+	extend-reflect-similar.ps3.ref.png	\
+	extend-reflect.ps2.ref.png \
+	extend-reflect.ps3.ref.png \
+	extend-repeat.ref.png	\
+	extend-repeat.ps2.ref.png	\
+	extend-repeat.ps3.ref.png	\
+	extend-repeat-similar.ref.png	\
+	extend-repeat-similar.ps2.ref.png	\
+	extend-repeat-similar.ps3.ref.png	\
+	fallback-resolution.ppi37.5x37.5.ref.png \
+	fallback-resolution.ppi37.5x72.ref.png \
+	fallback-resolution.ppi37.5x75.ref.png \
+	fallback-resolution.ppi37.5x150.ref.png \
+	fallback-resolution.ppi37.5x300.ref.png \
+	fallback-resolution.ppi37.5x600.ref.png \
+	fallback-resolution.ppi72x37.5.ref.png \
+	fallback-resolution.ppi72x72.ref.png \
+	fallback-resolution.ppi72x75.ref.png \
+	fallback-resolution.ppi72x150.ref.png \
+	fallback-resolution.ppi72x300.ref.png \
+	fallback-resolution.ppi72x600.ref.png \
+	fallback-resolution.ppi75x37.5.ref.png \
+	fallback-resolution.ppi75x72.ref.png \
+	fallback-resolution.ppi75x75.ref.png \
+	fallback-resolution.ppi75x150.ref.png \
+	fallback-resolution.ppi75x300.ref.png \
+	fallback-resolution.ppi75x600.ref.png \
+	fallback-resolution.ppi150x37.5.ref.png \
+	fallback-resolution.ppi150x72.ref.png \
+	fallback-resolution.ppi150x75.ref.png \
+	fallback-resolution.ppi150x150.ref.png \
+	fallback-resolution.ppi150x300.ref.png \
+	fallback-resolution.ppi150x600.ref.png \
+	fallback-resolution.ppi300x37.5.ref.png \
+	fallback-resolution.ppi300x72.ref.png \
+	fallback-resolution.ppi300x75.ref.png \
+	fallback-resolution.ppi300x150.ref.png \
+	fallback-resolution.ppi300x300.ref.png \
+	fallback-resolution.ppi300x600.ref.png \
+	fallback-resolution.ppi600x37.5.ref.png \
+	fallback-resolution.ppi600x72.ref.png \
+	fallback-resolution.ppi600x75.ref.png \
+	fallback-resolution.ppi600x150.ref.png \
+	fallback-resolution.ppi600x300.ref.png \
+	fallback-resolution.ppi600x600.ref.png \
+	fill-alpha.ref.png	\
+	fill-alpha-pattern.ref.png	\
+	fill-alpha-pattern.pdf.argb32.ref.png	\
+	fill-alpha-pattern.pdf.rgb24.ref.png	\
+	fill-alpha-pattern.ps3.ref.png	\
+	fill-and-stroke-alpha-add.quartz.ref.png	\
+	fill-and-stroke-alpha-add.ref.png	\
+	fill-and-stroke-alpha.quartz.ref.png	\
+	fill-and-stroke-alpha.ref.png	\
+	fill-and-stroke.ps2.argb32.ref.png	\
+	fill-and-stroke.ps3.argb32.ref.png	\
+	fill-and-stroke.ps2.rgb24.ref.png	\
+	fill-and-stroke.ps3.rgb24.ref.png	\
+	fill-and-stroke.quartz.ref.png	\
+	fill-and-stroke.quartz.rgb24.ref.png	\
+	fill-and-stroke.ref.png	\
+	fill-and-stroke.rgb24.ref.png	\
+	fill-degenerate-sort-order.quartz.ref.png	\
+	fill-degenerate-sort-order.quartz.rgb24.ref.png	\
+	fill-degenerate-sort-order.ref.png	\
+	fill-degenerate-sort-order.rgb24.ref.png	\
+	fill-missed-stop.ps2.argb32.ref.png	\
+	fill-missed-stop.ps3.argb32.ref.png	\
+	fill-missed-stop.ps2.rgb24.ref.png	\
+	fill-missed-stop.ps3.rgb24.ref.png	\
+	fill-missed-stop.ref.png	\
+	fill-missed-stop.rgb24.ref.png	\
+	fill-rule.ps2.argb32.ref.png	\
+	fill-rule.ps3.argb32.ref.png	\
+	fill-rule.ps2.rgb24.ref.png \
+	fill-rule.ps3.rgb24.ref.png \
+	fill-rule.quartz.ref.png	\
+	fill-rule.quartz.rgb24.ref.png	\
+	fill-rule.ref.png	\
+	fill-rule.rgb24.ref.png	\
+	filter-bilinear-extents.ref.png \
+	filter-bilinear-extents.pdf.ref.png \
+	filter-bilinear-extents.ps2.ref.png \
+	filter-bilinear-extents.ps3.ref.png \
+	filter-nearest-offset.ref.png	\
+	filter-nearest-offset.pdf.ref.png	\
+	filter-nearest-offset.ps2.ref.png	\
+	filter-nearest-offset.ps3.ref.png	\
+	filter-nearest-offset.svg11.ref.png	\
+	filter-nearest-offset.svg12.ref.png	\
+	filter-nearest-transformed.ref.png	\
+	filter-nearest-transformed.pdf.ref.png	\
+	filter-nearest-transformed.svg11.ref.png	\
+	filter-nearest-transformed.svg12.ref.png	\
+	finer-grained-fallbacks.ref.png			\
+	finer-grained-fallbacks.rgb24.ref.png		\
+	finer-grained-fallbacks.ps2.ref.png	\
+	finer-grained-fallbacks.ps2.rgb24.ref.png	\
+	finer-grained-fallbacks.ps3.ref.png	\
+	finer-grained-fallbacks.ps3.rgb24.ref.png	\
+	font-matrix-translation.ps2.argb32.ref.png	\
+	font-matrix-translation.ps3.argb32.ref.png	\
+	font-matrix-translation.ps2.rgb24.ref.png	\
+	font-matrix-translation.ps3.rgb24.ref.png	\
+	font-matrix-translation.ref.png	\
+	font-matrix-translation.svg12.ref.png	\
+	font-matrix-translation.svg11.ref.png	\
+	font-matrix-translation.quartz.ref.png \
+	ft-text-antialias-none.ps2.argb32.ref.png	\
+	ft-text-antialias-none.ps3.argb32.ref.png	\
+	ft-text-antialias-none.ref.png	\
+	ft-show-glyphs-positioning.ref.png		\
+	ft-show-glyphs-positioning.pdf.ref.png		\
+	ft-show-glyphs-positioning.ps2.ref.png		\
+	ft-show-glyphs-positioning.ps3.ref.png		\
+	ft-show-glyphs-positioning.svg12.ref.png		\
+	ft-show-glyphs-positioning.svg11.ref.png		\
+	ft-show-glyphs-table.ref.png			\
+	ft-show-glyphs-table.ps2.ref.png			\
+	ft-show-glyphs-table.ps3.ref.png			\
+	ft-text-vertical-layout-type1.pdf.ref.png	\
+	ft-text-vertical-layout-type1.ps2.ref.png	\
+	ft-text-vertical-layout-type1.ps3.ref.png	\
+	ft-text-vertical-layout-type1.ref.png	\
+	ft-text-vertical-layout-type1.svg12.ref.png	\
+	ft-text-vertical-layout-type1.svg11.ref.png	\
+	ft-text-vertical-layout-type3.pdf.ref.png	\
+	ft-text-vertical-layout-type3.ps2.ref.png	\
+	ft-text-vertical-layout-type3.ps3.ref.png	\
+	ft-text-vertical-layout-type3.ref.png	\
+	ft-text-vertical-layout-type3.svg12.ref.png	\
+	ft-text-vertical-layout-type3.svg11.ref.png	\
+	get-group-target.ref.png	\
+	glitz-surface-source.ref.png \
+	glyph-cache-pressure.ref.png	\
+	glyph-cache-pressure.ps2.ref.png	\
+	glyph-cache-pressure.ps3.ref.png	\
+	glyph-cache-pressure.quartz.ref.png	\
+	gradient-alpha.pdf.argb32.ref.png	\
+	gradient-alpha.pdf.rgb24.ref.png	\
+	gradient-alpha.ps2.argb32.ref.png	\
+	gradient-alpha.ps3.argb32.ref.png	\
+	gradient-alpha.ps2.rgb24.ref.png	\
+	gradient-alpha.ps3.rgb24.ref.png	\
+	gradient-alpha.ref.png	\
+	gradient-alpha.rgb24.ref.png	\
+	gradient-constant-alpha.pdf.argb32.ref.png	\
+	gradient-constant-alpha.pdf.rgb24.ref.png	\
+	gradient-constant-alpha.ps3.ref.png		\
+	gradient-constant-alpha.ps3.rgb24.ref.png	\
+	gradient-constant-alpha.ref.png	\
+	gradient-constant-alpha.rgb24.ref.png	\
+	gradient-zero-stops.ref.png	\
+	gradient-zero-stops.rgb24.ref.png	\
+	group-paint.ref.png	\
+	huge-pattern.ref.png	\
+	huge-pattern.ps3.ref.png	\
+	huge-pattern.pdf.ref.png	\
+	huge-pattern.pdf.rgb24.ref.png	\
+	image-surface-source.ref.png \
+	image-surface-source.ps2.ref.png \
+	image-surface-source.ps3.ref.png \
+	infinite-join.ref.png	\
+	infinite-join.ps2.ref.png	\
+	infinite-join.ps3.ref.png	\
+	large-clip.ref.png	\
+	large-font.ref.png	\
+	large-source.ref.png	\
+	leaky-dash.ps2.argb32.ref.png	\
+	leaky-dash.ps3.argb32.ref.png	\
+	leaky-dash.ps2.rgb24.ref.png	\
+	leaky-dash.ps3.rgb24.ref.png	\
+	leaky-dash.quartz.ref.png	\
+	leaky-dash.ref.png	\
+	leaky-dashed-rectangle.ref.png		\
+	leaky-dashed-rectangle.ps2.ref.png	\
+	leaky-dashed-rectangle.ps3.ref.png	\
+	leaky-dashed-stroke.ref.png		\
+	leaky-dashed-stroke.ps2.ref.png		\
+	leaky-dashed-stroke.ps3.ref.png		\
+	leaky-polygon.ref.png	\
+	leaky-polygon.ps2.ref.png	\
+	leaky-polygon.ps3.ref.png	\
+	linear-gradient-reflect.ref.png	\
+	linear-gradient-reflect.pdf.argb32.ref.png	\
+	linear-gradient-reflect.pdf.rgb24.ref.png	\
+	linear-gradient-reflect.ps3.ref.png	\
+	linear-gradient-reflect.quartz.ref.png	\
+	linear-gradient.pdf.ref.png	\
+	linear-gradient.ps3.ref.png	\
+	linear-gradient.quartz.ref.png	\
+	linear-gradient.ref.png	\
+	linear-gradient.svg12.ref.png	\
+	linear-gradient.svg11.ref.png	\
+	line-width.ref.png	\
+	line-width-scale.ps2.ref.png	\
+	line-width-scale.ps3.ref.png	\
+	line-width-scale.quartz.ref.png	\
+	line-width-scale.ref.png	\
+	long-dashed-lines.ref.png	\
+	long-dashed-lines.ps2.ref.png	\
+	long-dashed-lines.ps3.ref.png	\
+	long-dashed-lines.quartz.ref.png	\
+	long-lines.ref.png	\
+	mask-alpha.ref.png	\
+	mask-alpha.svg11.argb32.ref.png	\
+	mask-alpha.svg12.argb32.ref.png	\
+	mask-alpha.rgb24.ref.png	\
+	mask-alpha.quartz.argb32.ref.png \
+	mask-ctm.ref.png	\
+	mask-ctm.rgb24.ref.png	\
+	mask-ctm.svg11.argb32.ref.png	\
+	mask-ctm.svg12.argb32.ref.png	\
+	mask.ref.png	\
+	mask.rgb24.ref.png	\
+	mask.pdf.argb32.ref.png	\
+	mask.pdf.rgb24.ref.png	\
+	mask.quartz.ref.png	\
+	mask.quartz.rgb24.ref.png	\
+	mask-surface-ctm.ref.png	\
+	mask-surface-ctm.rgb24.ref.png	\
+	mask-surface-ctm.svg11.argb32.ref.png	\
+	mask-surface-ctm.svg12.argb32.ref.png	\
+	mask.svg11.rgb24.ref.png	\
+	mask.svg11.argb32.ref.png	\
+	mask.svg12.rgb24.ref.png	\
+	mask.svg12.argb32.ref.png	\
+	mask-transformed-image.ref.png	\
+	mask-transformed-similar.ref.png	\
+	mask-transformed-similar.pdf.ref.png	\
+	mask-transformed-similar.svg12.ref.png	\
+	mask-transformed-similar.svg11.ref.png	\
+	meta-surface-pattern.ref.png		\
+	meta-surface-pattern.rgb24.ref.png	\
+	meta-surface-pattern.pdf.ref.png	\
+	meta-surface-pattern.pdf.rgb24.ref.png	\
+	meta-surface-pattern.ps2.argb32.ref.png	\
+	meta-surface-pattern.ps2.rgb24.ref.png	\
+	meta-surface-pattern.ps3.argb32.ref.png	\
+	meta-surface-pattern.ps3.rgb24.ref.png	\
+	meta-surface-pattern.quartz.ref.png	\
+	meta-surface-pattern.quartz.rgb24.ref.png	\
+	meta-surface-pattern.svg11.argb32.ref.png	\
+	meta-surface-pattern.svg11.rgb24.ref.png	\
+	meta-surface-pattern.svg12.argb32.ref.png	\
+	meta-surface-pattern.svg12.rgb24.ref.png	\
+	miter-precision.ref.png \
+	miter-precision.ps2.ref.png	\
+	miter-precision.ps3.ref.png	\
+	move-to-show-surface.ref.png	\
+	new-sub-path.ps2.argb32.ref.png	\
+	new-sub-path.ps3.argb32.ref.png	\
+	new-sub-path.ps2.rgb24.ref.png	\
+	new-sub-path.ps3.rgb24.ref.png	\
+	new-sub-path.quartz.ref.png	\
+	new-sub-path.quartz.rgb24.ref.png	\
+	new-sub-path.ref.png	\
+	new-sub-path.rgb24.ref.png	\
+	nil-surface.ref.png	\
+	nil-surface.rgb24.ref.png	\
+	operator.ref.png	\
+	operator.rgb24.ref.png	\
+	operator-alpha.ref.png	\
+	operator-alpha.rgb24.ref.png	\
+	operator-clear.quartz.ref.png	\
+	operator-clear.quartz.rgb24.ref.png	\
+	operator-clear.ref.png	\
+	operator-clear.rgb24.ref.png	\
+	operator-clear.pdf.argb32.ref.png	\
+	operator-clear.pdf.rgb24.ref.png	\
+	operator-source.pdf.argb32.ref.png	\
+	operator-source.pdf.rgb24.ref.png	\
+	operator-source.ref.png	\
+	operator-source.rgb24.ref.png	\
+	operator-source.quartz.ref.png \
+	operator-source.quartz.rgb24.ref.png \
+	over-above-source.ps2.argb32.ref.png       \
+	over-above-source.ps3.argb32.ref.png       \
+	over-above-source.quartz.ref.png	  \
+	over-above-source.quartz.rgb24.ref.png	  \
+	over-above-source.ref.png                 \
+	over-above-source.rgb24.ref.png           \
+	over-around-source.ps2.argb32.ref.png       \
+	over-around-source.ps3.argb32.ref.png       \
+	over-around-source.ps2.rgb24.ref.png        \
+	over-around-source.ps3.rgb24.ref.png        \
+	over-around-source.quartz.ref.png	   \
+	over-around-source.quartz.rgb24.ref.png	   \
+	over-around-source.ref.png                 \
+	over-around-source.rgb24.ref.png           \
+	over-below-source.ps2.argb32.ref.png       \
+	over-below-source.ps3.argb32.ref.png       \
+	over-below-source.ref.png                 \
+	over-below-source.rgb24.ref.png           \
+	over-between-source.ps2.argb32.ref.png     \
+	over-between-source.ps3.argb32.ref.png     \
+	over-between-source.quartz.ref.png        \
+	over-between-source.quartz.rgb24.ref.png  \
+	over-between-source.ref.png                 \
+	over-between-source.rgb24.ref.png           \
+	paint.ref.png	\
+	paint-repeat.ref.png	\
+	paint-source-alpha.pdf.argb32.ref.png	\
+	paint-source-alpha.ref.png	\
+	paint-source-alpha.svg12.ref.png	\
+	paint-source-alpha.svg11.ref.png	\
+	paint-with-alpha.ref.png	\
+	paint-with-alpha.svg12.ref.png	\
+	paint-with-alpha.svg11.ref.png	\
+	paint-source-alpha.pdf.ref.png \
+	paint-with-alpha.pdf.ref.png \
+	pass-through.ref.png \
+	pass-through.rgb24.ref.png \
+	pattern-getters.ref.png	\
+	pdf-surface-source.ref.png \
+	pixman-rotate.ref.png	\
+	pixman-rotate.rgb24.ref.png	\
+	ps-surface-source.ref.png \
+	push-group.pdf.ref.png \
+	push-group.pdf.rgb24.ref.png \
+	push-group.ref.png	\
+	push-group.rgb24.ref.png	\
+	push-group.svg11.argb32.ref.png	\
+	push-group.svg12.argb32.ref.png	\
+	radial-gradient.ref.png	\
+	radial-gradient.pdf.ref.png \
+	radial-gradient.quartz.ref.png \
+	radial-gradient.svg12.ref.png	\
+	radial-gradient.svg11.ref.png	\
+	random-intersections.ref.png	\
+	random-intersections.ps2.ref.png \
+	random-intersections.ps3.ref.png \
+	random-intersections.quartz.ref.png \
+	rgb24-ignore-alpha.ref.png \
+	rectangle-rounding-error.ref.png	\
+	rectilinear-fill.ref.png	\
+	rectilinear-miter-limit.ref.png		\
+	rectilinear-miter-limit.ps2.ref.png	\
+	rectilinear-miter-limit.ps3.ref.png	\
+	rectilinear-stroke.ref.png	\
+	reflected-stroke.ref.png	\
+	reflected-stroke.ps2.ref.png	\
+	reflected-stroke.ps3.ref.png	\
+	reflected-stroke.quartz.ref.png	\
+	rel-path.quartz.ref.png	\
+	rel-path.quartz.rgb24.ref.png	\
+	rel-path.ps2.rgb24.ref.png	\
+	rel-path.ps3.rgb24.ref.png	\
+	rel-path.ref.png	\
+	rel-path.rgb24.ref.png	\
+	rotate-image-surface-paint.pdf.rgb24.ref.png \
+	rotate-image-surface-paint.ps2.ref.png \
+	rotate-image-surface-paint.ps3.ref.png \
+	rotate-image-surface-paint.pdf.argb32.ref.png	\
+	rotate-image-surface-paint.quartz.ref.png	\
+	rotate-image-surface-paint.ref.png	\
+	rotate-image-surface-paint.svg12.ref.png	\
+	rotate-image-surface-paint.svg11.ref.png	\
+	scale-down-source-surface-paint.ref.png	\
+	scale-source-surface-paint.pdf.argb32.ref.png	\
+	scale-source-surface-paint.ref.png	\
+	scale-source-surface-paint.rgb24.ref.png	\
+	scale-source-surface-paint.svg11.argb32.ref.png	\
+	scale-source-surface-paint.svg11.rgb24.ref.png	\
+	scale-source-surface-paint.svg12.argb32.ref.png	\
+	scale-source-surface-paint.svg12.rgb24.ref.png	\
+	scale-source-surface-paint.pdf.rgb24.ref.png \
+	stroke-ctm-caps.ref.png \
+	stroke-ctm-caps.quartz.ref.png \
+	select-font-face.ref.png	\
+	select-font-face.ps2.ref.png \
+	select-font-face.ps3.ref.png \
+	select-font-face.quartz.ref.png \
+	self-copy.ref.png	\
+	self-copy.ps2.ref.png	\
+	self-copy.ps3.ref.png	\
+	self-copy-overlap.ref.png	\
+	self-copy-overlap.rgb24.ref.png	\
+	self-intersecting.ref.png	\
+	self-intersecting.rgb24.ref.png	\
+	set-source.ref.png	\
+	set-source.rgb24.ref.png	\
+	set-source.svg11.argb32.ref.png	\
+	set-source.svg12.argb32.ref.png	\
+	show-glyphs-many.ref.png	\
+	show-text-current-point.ref.png	\
+	show-text-current-point.ps2.ref.png \
+	show-text-current-point.ps3.ref.png \
+	show-text-current-point.quartz.ref.png \
+	skew-extreme.ref.png \
+	skew-extreme.ps2.ref.png \
+	skew-extreme.ps3.ref.png \
+	smask.ref.png			\
+	smask.pdf.ref.png		\
+	smask.ps2.ref.png		\
+	smask.ps3.ref.png		\
+	smask.svg12.ref.png		\
+	smask.svg11.ref.png		\
+	smask-fill.ref.png		\
+	smask-fill.pdf.ref.png		\
+	smask-fill.svg12.ref.png	\
+	smask-fill.svg11.ref.png	\
+	smask-image-mask.ref.png	\
+	smask-image-mask.pdf.ref.png	\
+	smask-mask.ref.png		\
+	smask-mask.pdf.ref.png		\
+	smask-mask.svg12.ref.png	\
+	smask-mask.svg11.ref.png	\
+	smask-paint.ref.png		\
+	smask-paint.pdf.ref.png		\
+	smask-paint.svg12.ref.png	\
+	smask-paint.svg11.ref.png	\
+	smask-stroke.ref.png		\
+	smask-stroke.pdf.ref.png	\
+	smask-text.ref.png		\
+	smask-text.pdf.ref.png		\
+	smask-text.ps2.ref.png		\
+	smask-text.ps3.ref.png		\
+	smask-text.svg12.ref.png	\
+	smask-text.svg11.ref.png	\
+	stroke-image.ref.png \
+	stroke-image.pdf.ref.png \
+	stroke-image.ps2.ref.png \
+	stroke-image.ps3.ref.png \
+	stroke-image.quartz.ref.png \
+	solid-pattern-cache-stress.ref.png	\
+	source-clip.ref.png	\
+	source-clip-scale.quartz.ref.png	\
+	source-clip-scale.ps2.argb32.ref.png	\
+	source-clip-scale.ps3.argb32.ref.png	\
+	source-clip-scale.ps2.rgb24.ref.png	\
+	source-clip-scale.ps3.rgb24.ref.png	\
+	source-clip-scale.ref.png	\
+	source-clip-scale.svg12.ref.png	\
+	source-clip-scale.svg11.ref.png	\
+	source-clip-scale.pdf.ref.png \
+	source-surface-scale-paint.ref.png	\
+	source-surface-scale-paint.rgb24.ref.png	\
+	spline-decomposition.ref.png \
+	spline-decomposition.ps2.ref.png \
+	spline-decomposition.ps3.ref.png \
+	spline-decomposition.pdf.ref.png \
+	spline-decomposition.svg11.ref.png \
+	spline-decomposition.svg12.ref.png \
+	stroke-ctm-caps.ps2.ref.png \
+	stroke-ctm-caps.ps3.ref.png \
+	surface-pattern-big-scale-down.ref.png	\
+	surface-pattern.pdf.ref.png	\
+	surface-pattern.ps2.ref.png	\
+	surface-pattern.ps3.ref.png	\
+	surface-pattern.ref.png	\
+	surface-pattern-scale-down.pdf.argb32.ref.png	\
+	surface-pattern-scale-down.pdf.rgb24.ref.png	\
+	surface-pattern-scale-down.ps2.ref.png	\
+	surface-pattern-scale-down.ps3.ref.png	\
+	surface-pattern-scale-down.ref.png	\
+	surface-pattern-scale-down.quartz.ref.png	\
+	surface-pattern-scale-up.pdf.argb32.ref.png	\
+	surface-pattern-scale-up.pdf.rgb24.ref.png	\
+	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	\
+	svg-surface-source.ref.png \
+	text-antialias-gray.ref.png	\
+	text-antialias-gray.quartz.ref.png	\
+	text-antialias-none.ref.png	\
+	text-antialias-none.quartz.ref.png	\
+	text-antialias-subpixel.ref.png	\
+	text-antialias-subpixel.quartz.ref.png	\
+	text-glyph-range.ref.png	\
+	text-glyph-range.ps2.ref.png	\
+	text-glyph-range.ps3.ref.png	\
+	text-pattern.ps3.argb32.ref.png	\
+	text-pattern.ps3.rgb24.ref.png	\
+	text-pattern.ref.png	\
+	text-pattern.rgb24.ref.png	\
+	text-pattern.svg11.argb32.ref.png	\
+	text-pattern.svg11.rgb24.ref.png	\
+	text-pattern.svg12.argb32.ref.png	\
+	text-pattern.svg12.rgb24.ref.png	\
+	text-pattern.pdf.argb32.ref.png \
+	text-pattern.pdf.rgb24.ref.png \
+	text-pattern.quartz.ref.png \
+	text-pattern.quartz.rgb24.ref.png \
+	text-rotate.ref.png	\
+	text-rotate.pdf.ref.png \
+	text-rotate.ps2.ref.png	\
+	text-rotate.ps3.ref.png	\
+	text-rotate.svg12.ref.png \
+	text-rotate.svg11.ref.png \
+	text-rotate.quartz.ref.png \
+	text-transform.ref.png		\
+	text-transform.pdf.ref.png	\
+	text-transform.ps2.ref.png	\
+	text-transform.ps3.ref.png	\
+	transforms.ref.png	\
+	transforms.ps2.ref.png	\
+	transforms.ps3.ref.png	\
+	translate-show-surface.ref.png	\
+	trap-clip.quartz.ref.png	\
+	trap-clip.quartz.rgb24.ref.png	\
+	trap-clip.ps3.argb32.ref.png	\
+	trap-clip.ps3.rgb24.ref.png	\
+	trap-clip.ref.png	\
+	trap-clip.rgb24.ref.png	\
+	trap-clip.pdf.argb32.ref.png \
+	trap-clip.pdf.rgb24.ref.png \
+	trap-clip.ps2.argb32.ref.png \
+	trap-clip.ps2.rgb24.ref.png \
+	twin.ref.png \
+	twin.ps2.ref.png \
+	twin.ps3.ref.png \
+	twin.svg11.ref.png \
+	twin.svg12.ref.png \
+	unantialiased-shapes.ref.png	\
+	unantialiased-shapes.quartz.ref.png \
+	unbounded-operator.ref.png	\
+	unbounded-operator.rgb24.ref.png	\
+	user-font.ref.png	\
+	user-font.ps2.ref.png \
+	user-font.ps3.ref.png \
+	user-font.svg12.ref.png	\
+	user-font.svg11.ref.png	\
+	user-font-mask.ref.png		\
+	user-font-mask.pdf.ref.png	\
+	user-font-mask.ps2.ref.png	\
+	user-font-mask.ps3.ref.png	\
+	user-font-mask.svg11.ref.png	\
+	user-font-proxy.ref.png	\
+	user-font-proxy.pdf.ref.png	\
+	user-font-proxy.ps2.ref.png	\
+	user-font-proxy.ps3.ref.png	\
+	user-font-proxy.svg12.ref.png	\
+	user-font-proxy.svg11.ref.png	\
+	user-font-rescale.ref.png	\
+	user-font-rescale.ps2.ref.png	\
+	user-font-rescale.ps3.ref.png	\
+	user-font-rescale.svg12.ref.png	\
+	user-font-rescale.svg11.ref.png	\
+	unbounded-operator.quartz.ref.png	\
+	unbounded-operator.quartz.rgb24.ref.png	\
+	xlib-expose-event.ref.png \
+	xlib-surface-source.ref.png \
+	xlib-surface-source.ps2.ref.png \
+	xlib-surface-source.ps3.ref.png \
+	zero-alpha.ref.png
 
 EXTRA_DIST +=		\
 6x13.pcf		\
@@ -1286,13 +1286,13 @@ index.html: $(srcdir)/make-html.pl $(test_sources:.c=.log)
 # Identify identical reference images
 check-ref-dups:
 	@LANG=C; \
-	( cd "$(scrdir)" && sha1sum *-ref.png | sort ) > ref.hash; \
-	join ref.hash ref.hash | grep -v -E '( .*-ref.png).*\1' | cut -d' ' -f 1-2 | sort -u
+	( cd "$(scrdir)" && sha1sum *.ref.png | sort ) > ref.hash; \
+	join ref.hash ref.hash | grep -v -E '( .*.ref.png).*\1' | cut -d' ' -f 1-2 | sort -u
 
 # Not exactly the best script in the world...
 check-ref-missing:
 	@cd "$(srcdir)"; \
-	REFS=`git ls-files "*-ref.png"`; \
+	REFS=`git ls-files "*.ref.png"`; \
 	ret=true; \
 	missing=""; \
 	for i in $$REFS; do \
@@ -1306,7 +1306,7 @@ check-ref-missing:
 		ret=false; \
 	fi >&2; \
 	if $$ret; then \
-	    REFS=`ls *-ref.png`; \
+	    REFS=`ls *.ref.png`; \
 	    for i in $$REFS; do \
 		echo "" $(REFERENCE_IMAGES) "" | grep -sq " $$i " || missing="$$missing $$i" ; \
 	    done ; \
diff --git a/test/a1-image-sample-ref.png b/test/a1-image-sample.ref.png
similarity index 100%
rename from test/a1-image-sample-ref.png
rename to test/a1-image-sample.ref.png
diff --git a/test/a1-mask-ref.png b/test/a1-mask.ref.png
similarity index 100%
rename from test/a1-mask-ref.png
rename to test/a1-mask.ref.png
diff --git a/test/a1-traps-sample-ref.png b/test/a1-traps-sample.ref.png
similarity index 100%
rename from test/a1-traps-sample-ref.png
rename to test/a1-traps-sample.ref.png
diff --git a/test/a8-mask-ref.png b/test/a8-mask.ref.png
similarity index 100%
rename from test/a8-mask-ref.png
rename to test/a8-mask.ref.png
diff --git a/test/alpha-similar-ref.png b/test/alpha-similar.ref.png
similarity index 100%
rename from test/alpha-similar-ref.png
rename to test/alpha-similar.ref.png
diff --git a/test/alpha-similar-rgb24-ref.png b/test/alpha-similar.rgb24.ref.png
similarity index 100%
rename from test/alpha-similar-rgb24-ref.png
rename to test/alpha-similar.rgb24.ref.png
diff --git a/test/big-line-ps2-ref.png b/test/big-line.ps2.ref.png
similarity index 100%
rename from test/big-line-ps2-ref.png
rename to test/big-line.ps2.ref.png
diff --git a/test/big-line-ps2-rgb24-ref.png b/test/big-line.ps2.rgb24.ref.png
similarity index 100%
rename from test/big-line-ps2-rgb24-ref.png
rename to test/big-line.ps2.rgb24.ref.png
diff --git a/test/big-line-ps3-ref.png b/test/big-line.ps3.ref.png
similarity index 100%
rename from test/big-line-ps3-ref.png
rename to test/big-line.ps3.ref.png
diff --git a/test/big-line-ps3-rgb24-ref.png b/test/big-line.ps3.rgb24.ref.png
similarity index 100%
rename from test/big-line-ps3-rgb24-ref.png
rename to test/big-line.ps3.rgb24.ref.png
diff --git a/test/big-line-quartz-ref.png b/test/big-line.quartz.ref.png
similarity index 100%
rename from test/big-line-quartz-ref.png
rename to test/big-line.quartz.ref.png
diff --git a/test/big-line-quartz-rgb24-ref.png b/test/big-line.quartz.rgb24.ref.png
similarity index 100%
rename from test/big-line-quartz-rgb24-ref.png
rename to test/big-line.quartz.rgb24.ref.png
diff --git a/test/big-line-ref.png b/test/big-line.ref.png
similarity index 100%
rename from test/big-line-ref.png
rename to test/big-line.ref.png
diff --git a/test/big-line-rgb24-ref.png b/test/big-line.rgb24.ref.png
similarity index 100%
rename from test/big-line-rgb24-ref.png
rename to test/big-line.rgb24.ref.png
diff --git a/test/bilevel-image-ref.png b/test/bilevel-image.ref.png
similarity index 100%
rename from test/bilevel-image-ref.png
rename to test/bilevel-image.ref.png
diff --git a/test/bitmap-font-ref.png b/test/bitmap-font.ref.png
similarity index 100%
rename from test/bitmap-font-ref.png
rename to test/bitmap-font.ref.png
diff --git a/test/bitmap-font-rgb24-ref.png b/test/bitmap-font.rgb24.ref.png
similarity index 100%
rename from test/bitmap-font-rgb24-ref.png
rename to test/bitmap-font.rgb24.ref.png
diff --git a/test/cairo-test.c b/test/cairo-test.c
index 4802a1802..11ca650de 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -95,9 +95,9 @@ static const char *fail_face = "", *xfail_face="", *normal_face = "";
 static cairo_bool_t print_fail_on_stdout;
 
 #define CAIRO_TEST_LOG_SUFFIX ".log"
-#define CAIRO_TEST_PNG_SUFFIX "-out.png"
-#define CAIRO_TEST_REF_SUFFIX "-ref.png"
-#define CAIRO_TEST_DIFF_SUFFIX "-diff.png"
+#define CAIRO_TEST_PNG_SUFFIX ".out.png"
+#define CAIRO_TEST_REF_SUFFIX ".ref.png"
+#define CAIRO_TEST_DIFF_SUFFIX ".diff.png"
 #define CAIRO_TEST_OUTPUT_DIR "output"
 
 #define NUM_DEVICE_OFFSETS 2
@@ -325,6 +325,7 @@ cairo_test_reference_image_filename (const cairo_test_context_t *ctx,
 	                             const char *base_name,
 				     const char *test_name,
 				     const char *target_name,
+				     const char *base_target_name,
 				     const char *format)
 {
     char *ref_name = NULL;
@@ -342,7 +343,8 @@ cairo_test_reference_image_filename (const cairo_test_context_t *ctx,
     }
 
     /* Next look for a target/format-specific reference image. */
-    xasprintf (&ref_name, "%s/%s-%s-%s%s", ctx->srcdir,
+    xasprintf (&ref_name, "%s/%s.%s.%s%s",
+	       ctx->srcdir,
 	       test_name,
 	       target_name,
 	       format,
@@ -353,7 +355,8 @@ cairo_test_reference_image_filename (const cairo_test_context_t *ctx,
 	goto done;
 
     /* Next, look for target-specific reference image. */
-    xasprintf (&ref_name, "%s/%s-%s%s", ctx->srcdir,
+    xasprintf (&ref_name, "%s/%s.%s%s",
+	       ctx->srcdir,
 	       test_name,
 	       target_name,
 	       CAIRO_TEST_REF_SUFFIX);
@@ -362,8 +365,32 @@ cairo_test_reference_image_filename (const cairo_test_context_t *ctx,
     else
 	goto done;
 
+    /* Next look for a base/format-specific reference image. */
+    xasprintf (&ref_name, "%s/%s.%s.%s%s",
+	       ctx->srcdir,
+	       test_name,
+	       base_target_name,
+	       format,
+	       CAIRO_TEST_REF_SUFFIX);
+    if (access (ref_name, F_OK) != 0)
+	free (ref_name);
+    else
+	goto done;
+
+    /* Next, look for base-specific reference image. */
+    xasprintf (&ref_name, "%s/%s.%s%s",
+	       ctx->srcdir,
+	       test_name,
+	       base_target_name,
+	       CAIRO_TEST_REF_SUFFIX);
+    if (access (ref_name, F_OK) != 0)
+	free (ref_name);
+    else
+	goto done;
+
     /* Next, look for format-specific reference image. */
-    xasprintf (&ref_name, "%s/%s-%s%s", ctx->srcdir,
+    xasprintf (&ref_name, "%s/%s.%s%s",
+	       ctx->srcdir,
 	       test_name,
 	       format,
 	       CAIRO_TEST_REF_SUFFIX);
@@ -641,19 +668,19 @@ cairo_test_for_target (cairo_test_context_t		 *ctx,
     /* Get the strings ready that we'll need. */
     format = cairo_boilerplate_content_name (target->content);
     if (dev_offset)
-	xasprintf (&offset_str, "-%d", dev_offset);
+	xasprintf (&offset_str, ".%d", dev_offset);
     else
 	offset_str = (char *) empty_str;
     if (ctx->thread)
-	xasprintf (&thread_str, "-thread%d", ctx->thread);
+	xasprintf (&thread_str, ".thread%d", ctx->thread);
     else
 	thread_str = (char *) empty_str;
 
-    xasprintf (&base_name, "%s-%s-%s%s%s%s",
+    xasprintf (&base_name, "%s.%s.%s%s%s%s",
 	       ctx->test_name,
 	       target->name,
 	       format,
-	       similar ? "-similar" : "",
+	       similar ? ".similar" : "",
 	       offset_str,
 	       thread_str);
 
@@ -667,6 +694,7 @@ cairo_test_for_target (cairo_test_context_t		 *ctx,
 						    base_name,
 						    ctx->test_name,
 						    target->name,
+						    target->basename,
 						    format);
     have_output_dir = _cairo_test_mkdir (CAIRO_TEST_OUTPUT_DIR);
     xasprintf (&base_path, "%s/%s",
@@ -890,11 +918,11 @@ cairo_test_for_target (cairo_test_context_t		 *ctx,
 	}
 
 	if (target->file_extension != NULL) { /* compare vector surfaces */
-	    xasprintf (&test_filename, "%s-out%s",
+	    xasprintf (&test_filename, "%s.out%s",
 		       base_path, target->file_extension);
-	    xasprintf (&pass_filename, "%s-pass%s",
+	    xasprintf (&pass_filename, "%s.pass%s",
 		       base_path, target->file_extension);
-	    xasprintf (&fail_filename, "%s-fail%s",
+	    xasprintf (&fail_filename, "%s.fail%s",
 		       base_path, target->file_extension);
 
 	    if (cairo_test_file_is_older (pass_filename, ref_path))
@@ -944,8 +972,8 @@ cairo_test_for_target (cairo_test_context_t		 *ctx,
 	/* binary compare png files (no decompression) */
 	if (target->file_extension == NULL) {
 	    xasprintf (&test_filename, "%s", png_path);
-	    xasprintf (&pass_filename, "%s-pass.png", base_path);
-	    xasprintf (&fail_filename, "%s-fail.png", base_path);
+	    xasprintf (&pass_filename, "%s.pass.png", base_path);
+	    xasprintf (&fail_filename, "%s.fail.png", base_path);
 
 	    if (cairo_test_files_equal (test_filename, pass_filename)) {
 		/* identical output as last known PASS, pass */
@@ -1133,7 +1161,7 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
 		    dev_offset);
 
     if (ctx->thread == 0) {
-	printf ("%s-%s-%s [%d]%s:\t", ctx->test_name, target->name,
+	printf ("%s.%s.%s [%d]%s:\t", ctx->test_name, target->name,
 		cairo_boilerplate_content_name (target->content),
 		dev_offset,
 		similar ? " (similar)": "");
@@ -1200,7 +1228,7 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
 		fflush (stdout);
 	    }
 	    cairo_test_log (ctx, "CRASHED\n");
-	    fprintf (stderr, "%s-%s-%s [%d]%s:\t%s!!!CRASHED!!!%s\n",
+	    fprintf (stderr, "%s.%s.%s [%d]%s:\t%s!!!CRASHED!!!%s\n",
 		     ctx->test_name, target->name,
 		     cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "",
 		     fail_face, normal_face);
@@ -1216,7 +1244,7 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
 		    printf ("\r");
 		    fflush (stdout);
 		}
-		fprintf (stderr, "%s-%s-%s [%d]%s:\t%sXFAIL%s\n",
+		fprintf (stderr, "%s.%s.%s [%d]%s:\t%sXFAIL%s\n",
 			 ctx->test_name, target->name,
 			 cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "",
 			 xfail_face, normal_face);
@@ -1229,7 +1257,7 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
 		    printf ("\r");
 		    fflush (stdout);
 		}
-		fprintf (stderr, "%s-%s-%s [%d]%s:\t%sFAIL%s\n",
+		fprintf (stderr, "%s.%s.%s [%d]%s:\t%sFAIL%s\n",
 			 ctx->test_name, target->name,
 			 cairo_boilerplate_content_name (target->content), dev_offset, similar ? " (similar)" : "",
 			 fail_face, normal_face);
@@ -1242,7 +1270,7 @@ _cairo_test_context_run_for_target (cairo_test_context_t *ctx,
 #if _POSIX_THREAD_SAFE_FUNCTIONS
 	flockfile (stdout);
 #endif
-	printf ("%s-%s-%s %d [%d]:\t",
+	printf ("%s.%s.%s %d [%d]:\t",
 		ctx->test_name, target->name,
 		cairo_boilerplate_content_name (target->content),
 		ctx->thread,
diff --git a/test/cairo-test.h b/test/cairo-test.h
index f1b57cc18..5bb23ae99 100644
--- a/test/cairo-test.h
+++ b/test/cairo-test.h
@@ -232,6 +232,7 @@ cairo_test_reference_image_filename (const cairo_test_context_t *ctx,
 	                             const char *base_name,
 				     const char *test_name,
 				     const char *target_name,
+				     const char *base_target_name,
 				     const char *format);
 
 cairo_surface_t *
diff --git a/test/caps-joins-alpha-quartz-ref.png b/test/caps-joins-alpha.quartz.ref.png
similarity index 100%
rename from test/caps-joins-alpha-quartz-ref.png
rename to test/caps-joins-alpha.quartz.ref.png
diff --git a/test/caps-joins-alpha-ref.png b/test/caps-joins-alpha.ref.png
similarity index 100%
rename from test/caps-joins-alpha-ref.png
rename to test/caps-joins-alpha.ref.png
diff --git a/test/caps-joins-alpha-svg11-ref.png b/test/caps-joins-alpha.svg11.ref.png
similarity index 100%
rename from test/caps-joins-alpha-svg11-ref.png
rename to test/caps-joins-alpha.svg11.ref.png
diff --git a/test/caps-joins-alpha-svg12-ref.png b/test/caps-joins-alpha.svg12.ref.png
similarity index 100%
rename from test/caps-joins-alpha-svg12-ref.png
rename to test/caps-joins-alpha.svg12.ref.png
diff --git a/test/caps-joins-ps2-ref.png b/test/caps-joins.ps2.ref.png
similarity index 100%
rename from test/caps-joins-ps2-ref.png
rename to test/caps-joins.ps2.ref.png
diff --git a/test/caps-joins-ps3-ref.png b/test/caps-joins.ps3.ref.png
similarity index 100%
rename from test/caps-joins-ps3-ref.png
rename to test/caps-joins.ps3.ref.png
diff --git a/test/caps-joins-ref.png b/test/caps-joins.ref.png
similarity index 100%
rename from test/caps-joins-ref.png
rename to test/caps-joins.ref.png
diff --git a/test/caps-sub-paths-ref.png b/test/caps-sub-paths.ref.png
similarity index 100%
rename from test/caps-sub-paths-ref.png
rename to test/caps-sub-paths.ref.png
diff --git a/test/clip-all-ref.png b/test/clip-all.ref.png
similarity index 100%
rename from test/clip-all-ref.png
rename to test/clip-all.ref.png
diff --git a/test/clip-empty-ref.png b/test/clip-empty.ref.png
similarity index 100%
rename from test/clip-empty-ref.png
rename to test/clip-empty.ref.png
diff --git a/test/clip-fill-rule-pixel-aligned-ref.png b/test/clip-fill-rule-pixel-aligned.ref.png
similarity index 100%
rename from test/clip-fill-rule-pixel-aligned-ref.png
rename to test/clip-fill-rule-pixel-aligned.ref.png
diff --git a/test/clip-fill-rule-pixel-aligned-rgb24-ref.png b/test/clip-fill-rule-pixel-aligned.rgb24.ref.png
similarity index 100%
rename from test/clip-fill-rule-pixel-aligned-rgb24-ref.png
rename to test/clip-fill-rule-pixel-aligned.rgb24.ref.png
diff --git a/test/clip-fill-rule-ps2-argb32-ref.png b/test/clip-fill-rule.ps2.argb32.ref.png
similarity index 100%
rename from test/clip-fill-rule-ps2-argb32-ref.png
rename to test/clip-fill-rule.ps2.argb32.ref.png
diff --git a/test/clip-fill-rule-ps2-rgb24-ref.png b/test/clip-fill-rule.ps2.rgb24.ref.png
similarity index 100%
rename from test/clip-fill-rule-ps2-rgb24-ref.png
rename to test/clip-fill-rule.ps2.rgb24.ref.png
diff --git a/test/clip-fill-rule-ps3-argb32-ref.png b/test/clip-fill-rule.ps3.argb32.ref.png
similarity index 100%
rename from test/clip-fill-rule-ps3-argb32-ref.png
rename to test/clip-fill-rule.ps3.argb32.ref.png
diff --git a/test/clip-fill-rule-ps3-rgb24-ref.png b/test/clip-fill-rule.ps3.rgb24.ref.png
similarity index 100%
rename from test/clip-fill-rule-ps3-rgb24-ref.png
rename to test/clip-fill-rule.ps3.rgb24.ref.png
diff --git a/test/clip-fill-rule-ref.png b/test/clip-fill-rule.ref.png
similarity index 100%
rename from test/clip-fill-rule-ref.png
rename to test/clip-fill-rule.ref.png
diff --git a/test/clip-fill-rule-rgb24-ref.png b/test/clip-fill-rule.rgb24.ref.png
similarity index 100%
rename from test/clip-fill-rule-rgb24-ref.png
rename to test/clip-fill-rule.rgb24.ref.png
diff --git a/test/clip-nesting-ps2-argb32-ref.png b/test/clip-nesting.ps2.argb32.ref.png
similarity index 100%
rename from test/clip-nesting-ps2-argb32-ref.png
rename to test/clip-nesting.ps2.argb32.ref.png
diff --git a/test/clip-nesting-ps2-rgb24-ref.png b/test/clip-nesting.ps2.rgb24.ref.png
similarity index 100%
rename from test/clip-nesting-ps2-rgb24-ref.png
rename to test/clip-nesting.ps2.rgb24.ref.png
diff --git a/test/clip-nesting-ps3-argb32-ref.png b/test/clip-nesting.ps3.argb32.ref.png
similarity index 100%
rename from test/clip-nesting-ps3-argb32-ref.png
rename to test/clip-nesting.ps3.argb32.ref.png
diff --git a/test/clip-nesting-ps3-rgb24-ref.png b/test/clip-nesting.ps3.rgb24.ref.png
similarity index 100%
rename from test/clip-nesting-ps3-rgb24-ref.png
rename to test/clip-nesting.ps3.rgb24.ref.png
diff --git a/test/clip-nesting-quartz-ref.png b/test/clip-nesting.quartz.ref.png
similarity index 100%
rename from test/clip-nesting-quartz-ref.png
rename to test/clip-nesting.quartz.ref.png
diff --git a/test/clip-nesting-quartz-rgb24-ref.png b/test/clip-nesting.quartz.rgb24.ref.png
similarity index 100%
rename from test/clip-nesting-quartz-rgb24-ref.png
rename to test/clip-nesting.quartz.rgb24.ref.png
diff --git a/test/clip-nesting-ref.png b/test/clip-nesting.ref.png
similarity index 100%
rename from test/clip-nesting-ref.png
rename to test/clip-nesting.ref.png
diff --git a/test/clip-nesting-rgb24-ref.png b/test/clip-nesting.rgb24.ref.png
similarity index 100%
rename from test/clip-nesting-rgb24-ref.png
rename to test/clip-nesting.rgb24.ref.png
diff --git a/test/clip-operator-pdf-argb32-ref.png b/test/clip-operator.pdf.argb32.ref.png
similarity index 100%
rename from test/clip-operator-pdf-argb32-ref.png
rename to test/clip-operator.pdf.argb32.ref.png
diff --git a/test/clip-operator-pdf-rgb24-ref.png b/test/clip-operator.pdf.rgb24.ref.png
similarity index 100%
rename from test/clip-operator-pdf-rgb24-ref.png
rename to test/clip-operator.pdf.rgb24.ref.png
diff --git a/test/clip-operator-ps2-rgb24-ref.png b/test/clip-operator.ps2.rgb24.ref.png
similarity index 100%
rename from test/clip-operator-ps2-rgb24-ref.png
rename to test/clip-operator.ps2.rgb24.ref.png
diff --git a/test/clip-operator-ps3-ref.png b/test/clip-operator.ps3.ref.png
similarity index 100%
rename from test/clip-operator-ps3-ref.png
rename to test/clip-operator.ps3.ref.png
diff --git a/test/clip-operator-ps3-rgb24-ref.png b/test/clip-operator.ps3.rgb24.ref.png
similarity index 100%
rename from test/clip-operator-ps3-rgb24-ref.png
rename to test/clip-operator.ps3.rgb24.ref.png
diff --git a/test/clip-operator-quartz-ref.png b/test/clip-operator.quartz.ref.png
similarity index 100%
rename from test/clip-operator-quartz-ref.png
rename to test/clip-operator.quartz.ref.png
diff --git a/test/clip-operator-quartz-rgb24-ref.png b/test/clip-operator.quartz.rgb24.ref.png
similarity index 100%
rename from test/clip-operator-quartz-rgb24-ref.png
rename to test/clip-operator.quartz.rgb24.ref.png
diff --git a/test/clip-operator-ref.png b/test/clip-operator.ref.png
similarity index 100%
rename from test/clip-operator-ref.png
rename to test/clip-operator.ref.png
diff --git a/test/clip-operator-rgb24-ref.png b/test/clip-operator.rgb24.ref.png
similarity index 100%
rename from test/clip-operator-rgb24-ref.png
rename to test/clip-operator.rgb24.ref.png
diff --git a/test/clip-push-group-ps2-argb32-ref.png b/test/clip-push-group.ps2.argb32.ref.png
similarity index 100%
rename from test/clip-push-group-ps2-argb32-ref.png
rename to test/clip-push-group.ps2.argb32.ref.png
diff --git a/test/clip-push-group-ps2-rgb24-ref.png b/test/clip-push-group.ps2.rgb24.ref.png
similarity index 100%
rename from test/clip-push-group-ps2-rgb24-ref.png
rename to test/clip-push-group.ps2.rgb24.ref.png
diff --git a/test/clip-push-group-ps3-argb32-ref.png b/test/clip-push-group.ps3.argb32.ref.png
similarity index 100%
rename from test/clip-push-group-ps3-argb32-ref.png
rename to test/clip-push-group.ps3.argb32.ref.png
diff --git a/test/clip-push-group-ps3-rgb24-ref.png b/test/clip-push-group.ps3.rgb24.ref.png
similarity index 100%
rename from test/clip-push-group-ps3-rgb24-ref.png
rename to test/clip-push-group.ps3.rgb24.ref.png
diff --git a/test/clip-push-group-quartz-ref.png b/test/clip-push-group.quartz.ref.png
similarity index 100%
rename from test/clip-push-group-quartz-ref.png
rename to test/clip-push-group.quartz.ref.png
diff --git a/test/clip-push-group-ref.png b/test/clip-push-group.ref.png
similarity index 100%
rename from test/clip-push-group-ref.png
rename to test/clip-push-group.ref.png
diff --git a/test/clip-twice-ps2-argb32-ref.png b/test/clip-twice.ps2.argb32.ref.png
similarity index 100%
rename from test/clip-twice-ps2-argb32-ref.png
rename to test/clip-twice.ps2.argb32.ref.png
diff --git a/test/clip-twice-ps2-rgb24-ref.png b/test/clip-twice.ps2.rgb24.ref.png
similarity index 100%
rename from test/clip-twice-ps2-rgb24-ref.png
rename to test/clip-twice.ps2.rgb24.ref.png
diff --git a/test/clip-twice-ps3-argb32-ref.png b/test/clip-twice.ps3.argb32.ref.png
similarity index 100%
rename from test/clip-twice-ps3-argb32-ref.png
rename to test/clip-twice.ps3.argb32.ref.png
diff --git a/test/clip-twice-ps3-rgb24-ref.png b/test/clip-twice.ps3.rgb24.ref.png
similarity index 100%
rename from test/clip-twice-ps3-rgb24-ref.png
rename to test/clip-twice.ps3.rgb24.ref.png
diff --git a/test/clip-twice-quartz-ref.png b/test/clip-twice.quartz.ref.png
similarity index 100%
rename from test/clip-twice-quartz-ref.png
rename to test/clip-twice.quartz.ref.png
diff --git a/test/clip-twice-quartz-rgb24-ref.png b/test/clip-twice.quartz.rgb24.ref.png
similarity index 100%
rename from test/clip-twice-quartz-rgb24-ref.png
rename to test/clip-twice.quartz.rgb24.ref.png
diff --git a/test/clip-twice-ref.png b/test/clip-twice.ref.png
similarity index 100%
rename from test/clip-twice-ref.png
rename to test/clip-twice.ref.png
diff --git a/test/clip-twice-rgb24-ref.png b/test/clip-twice.rgb24.ref.png
similarity index 100%
rename from test/clip-twice-rgb24-ref.png
rename to test/clip-twice.rgb24.ref.png
diff --git a/test/clipped-group-ps2-ref.png b/test/clipped-group.ps2.ref.png
similarity index 100%
rename from test/clipped-group-ps2-ref.png
rename to test/clipped-group.ps2.ref.png
diff --git a/test/clipped-group-ps3-ref.png b/test/clipped-group.ps3.ref.png
similarity index 100%
rename from test/clipped-group-ps3-ref.png
rename to test/clipped-group.ps3.ref.png
diff --git a/test/clipped-group-ref.png b/test/clipped-group.ref.png
similarity index 100%
rename from test/clipped-group-ref.png
rename to test/clipped-group.ref.png
diff --git a/test/clipped-surface-ref.png b/test/clipped-surface.ref.png
similarity index 100%
rename from test/clipped-surface-ref.png
rename to test/clipped-surface.ref.png
diff --git a/test/close-path-ps2-ref.png b/test/close-path.ps2.ref.png
similarity index 100%
rename from test/close-path-ps2-ref.png
rename to test/close-path.ps2.ref.png
diff --git a/test/close-path-ps3-ref.png b/test/close-path.ps3.ref.png
similarity index 100%
rename from test/close-path-ps3-ref.png
rename to test/close-path.ps3.ref.png
diff --git a/test/close-path-ref.png b/test/close-path.ref.png
similarity index 100%
rename from test/close-path-ref.png
rename to test/close-path.ref.png
diff --git a/test/composite-integer-translate-over-repeat-ps2-ref.png b/test/composite-integer-translate-over-repeat.ps2.ref.png
similarity index 100%
rename from test/composite-integer-translate-over-repeat-ps2-ref.png
rename to test/composite-integer-translate-over-repeat.ps2.ref.png
diff --git a/test/composite-integer-translate-over-repeat-ps3-ref.png b/test/composite-integer-translate-over-repeat.ps3.ref.png
similarity index 100%
rename from test/composite-integer-translate-over-repeat-ps3-ref.png
rename to test/composite-integer-translate-over-repeat.ps3.ref.png
diff --git a/test/composite-integer-translate-over-repeat-ref.png b/test/composite-integer-translate-over-repeat.ref.png
similarity index 100%
rename from test/composite-integer-translate-over-repeat-ref.png
rename to test/composite-integer-translate-over-repeat.ref.png
diff --git a/test/composite-integer-translate-over-ps2-ref.png b/test/composite-integer-translate-over.ps2.ref.png
similarity index 100%
rename from test/composite-integer-translate-over-ps2-ref.png
rename to test/composite-integer-translate-over.ps2.ref.png
diff --git a/test/composite-integer-translate-over-ps3-ref.png b/test/composite-integer-translate-over.ps3.ref.png
similarity index 100%
rename from test/composite-integer-translate-over-ps3-ref.png
rename to test/composite-integer-translate-over.ps3.ref.png
diff --git a/test/composite-integer-translate-over-ref.png b/test/composite-integer-translate-over.ref.png
similarity index 100%
rename from test/composite-integer-translate-over-ref.png
rename to test/composite-integer-translate-over.ref.png
diff --git a/test/composite-integer-translate-source-ps2-ref.png b/test/composite-integer-translate-source.ps2.ref.png
similarity index 100%
rename from test/composite-integer-translate-source-ps2-ref.png
rename to test/composite-integer-translate-source.ps2.ref.png
diff --git a/test/composite-integer-translate-source-ps3-ref.png b/test/composite-integer-translate-source.ps3.ref.png
similarity index 100%
rename from test/composite-integer-translate-source-ps3-ref.png
rename to test/composite-integer-translate-source.ps3.ref.png
diff --git a/test/composite-integer-translate-source-ref.png b/test/composite-integer-translate-source.ref.png
similarity index 100%
rename from test/composite-integer-translate-source-ref.png
rename to test/composite-integer-translate-source.ref.png
diff --git a/test/copy-path-ps2-ref.png b/test/copy-path.ps2.ref.png
similarity index 100%
rename from test/copy-path-ps2-ref.png
rename to test/copy-path.ps2.ref.png
diff --git a/test/copy-path-ps3-ref.png b/test/copy-path.ps3.ref.png
similarity index 100%
rename from test/copy-path-ps3-ref.png
rename to test/copy-path.ps3.ref.png
diff --git a/test/copy-path-ref.png b/test/copy-path.ref.png
similarity index 100%
rename from test/copy-path-ref.png
rename to test/copy-path.ref.png
diff --git a/test/create-for-stream.c b/test/create-for-stream.c
index f39e9cfb5..3dde378c0 100644
--- a/test/create-for-stream.c
+++ b/test/create-for-stream.c
@@ -57,7 +57,7 @@
 #define WIDTH_IN_POINTS  (WIDTH_IN_INCHES  * 72.0)
 #define HEIGHT_IN_POINTS (HEIGHT_IN_INCHES * 72.0)
 
-#define BASENAME "create-for-stream-out"
+#define BASENAME "create-for-stream.out"
 
 static cairo_test_status_t
 draw (cairo_t *cr, int width, int height)
diff --git a/test/create-from-png-stream.c b/test/create-from-png-stream.c
index e03ccc748..3d1957dba 100644
--- a/test/create-from-png-stream.c
+++ b/test/create-from-png-stream.c
@@ -53,7 +53,7 @@ draw (cairo_t *cr, int width, int height)
     cairo_surface_t *surface;
 
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-stream-ref.png");
+	       "create-from-png-stream.ref.png");
 
     file = fopen (filename, "rb");
     if (file == NULL) {
diff --git a/test/create-from-png-stream-ref.png b/test/create-from-png-stream.ref.png
similarity index 100%
rename from test/create-from-png-stream-ref.png
rename to test/create-from-png-stream.ref.png
diff --git a/test/create-from-png-alpha-ref.png b/test/create-from-png.alpha.ref.png
similarity index 100%
rename from test/create-from-png-alpha-ref.png
rename to test/create-from-png.alpha.ref.png
diff --git a/test/create-from-png.c b/test/create-from-png.c
index 647ef1395..d9d2e548b 100644
--- a/test/create-from-png.c
+++ b/test/create-from-png.c
@@ -50,7 +50,7 @@ draw (cairo_t *cr, int width, int height)
     cairo_surface_t *surface;
 
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-ref.png");
+	       "create-from-png.ref.png");
 
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
@@ -105,7 +105,7 @@ preamble (cairo_test_context_t *ctx)
 
     /* cheekily test error propagation from the user write funcs as well ... */
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-ref.png");
+	       "create-from-png.ref.png");
 
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
@@ -144,7 +144,7 @@ preamble (cairo_test_context_t *ctx)
 
     /* check that loading alpha/opaque PNGs generate the correct surfaces */
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-alpha-ref.png");
+	       "create-from-png.alpha.ref.png");
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
 	cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
@@ -160,7 +160,7 @@ preamble (cairo_test_context_t *ctx)
     cairo_surface_destroy (surface);
 
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-ref.png");
+	       "create-from-png.ref.png");
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
 	cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
@@ -177,7 +177,7 @@ preamble (cairo_test_context_t *ctx)
 
     /* check paletted PNGs */
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-indexed-alpha-ref.png");
+	       "create-from-png.indexed-alpha.ref.png");
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
 	cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
@@ -193,7 +193,7 @@ preamble (cairo_test_context_t *ctx)
     cairo_surface_destroy (surface);
 
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-indexed-ref.png");
+	       "create-from-png.indexed.ref.png");
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
 	cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
@@ -210,7 +210,7 @@ preamble (cairo_test_context_t *ctx)
 
     /* check grayscale PNGs */
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-gray-alpha-ref.png");
+	       "create-from-png.gray-alpha.ref.png");
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
 	cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
@@ -226,7 +226,7 @@ preamble (cairo_test_context_t *ctx)
     cairo_surface_destroy (surface);
 
     xasprintf (&filename, "%s/%s", ctx->srcdir,
-	       "create-from-png-gray-ref.png");
+	       "create-from-png.gray.ref.png");
     surface = cairo_image_surface_create_from_png (filename);
     if (cairo_surface_status (surface)) {
 	cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
diff --git a/test/create-from-png-gray-alpha-ref.png b/test/create-from-png.gray-alpha.ref.png
similarity index 100%
rename from test/create-from-png-gray-alpha-ref.png
rename to test/create-from-png.gray-alpha.ref.png
diff --git a/test/create-from-png-gray-ref.png b/test/create-from-png.gray.ref.png
similarity index 100%
rename from test/create-from-png-gray-ref.png
rename to test/create-from-png.gray.ref.png
diff --git a/test/create-from-png-indexed-alpha-ref.png b/test/create-from-png.indexed-alpha.ref.png
similarity index 100%
rename from test/create-from-png-indexed-alpha-ref.png
rename to test/create-from-png.indexed-alpha.ref.png
diff --git a/test/create-from-png-indexed-ref.png b/test/create-from-png.indexed.ref.png
similarity index 100%
rename from test/create-from-png-indexed-ref.png
rename to test/create-from-png.indexed.ref.png
diff --git a/test/create-from-png-ref.png b/test/create-from-png.ref.png
similarity index 100%
rename from test/create-from-png-ref.png
rename to test/create-from-png.ref.png
diff --git a/test/dash-caps-joins-ps2-argb32-ref.png b/test/dash-caps-joins.ps2.argb32.ref.png
similarity index 100%
rename from test/dash-caps-joins-ps2-argb32-ref.png
rename to test/dash-caps-joins.ps2.argb32.ref.png
diff --git a/test/dash-caps-joins-ps2-rgb24-ref.png b/test/dash-caps-joins.ps2.rgb24.ref.png
similarity index 100%
rename from test/dash-caps-joins-ps2-rgb24-ref.png
rename to test/dash-caps-joins.ps2.rgb24.ref.png
diff --git a/test/dash-caps-joins-ps3-argb32-ref.png b/test/dash-caps-joins.ps3.argb32.ref.png
similarity index 100%
rename from test/dash-caps-joins-ps3-argb32-ref.png
rename to test/dash-caps-joins.ps3.argb32.ref.png
diff --git a/test/dash-caps-joins-ps3-rgb24-ref.png b/test/dash-caps-joins.ps3.rgb24.ref.png
similarity index 100%
rename from test/dash-caps-joins-ps3-rgb24-ref.png
rename to test/dash-caps-joins.ps3.rgb24.ref.png
diff --git a/test/dash-caps-joins-quartz-ref.png b/test/dash-caps-joins.quartz.ref.png
similarity index 100%
rename from test/dash-caps-joins-quartz-ref.png
rename to test/dash-caps-joins.quartz.ref.png
diff --git a/test/dash-caps-joins-ref.png b/test/dash-caps-joins.ref.png
similarity index 100%
rename from test/dash-caps-joins-ref.png
rename to test/dash-caps-joins.ref.png
diff --git a/test/dash-curve-ps2-ref.png b/test/dash-curve.ps2.ref.png
similarity index 100%
rename from test/dash-curve-ps2-ref.png
rename to test/dash-curve.ps2.ref.png
diff --git a/test/dash-curve-ps3-ref.png b/test/dash-curve.ps3.ref.png
similarity index 100%
rename from test/dash-curve-ps3-ref.png
rename to test/dash-curve.ps3.ref.png
diff --git a/test/dash-curve-quartz-ref.png b/test/dash-curve.quartz.ref.png
similarity index 100%
rename from test/dash-curve-quartz-ref.png
rename to test/dash-curve.quartz.ref.png
diff --git a/test/dash-curve-ref.png b/test/dash-curve.ref.png
similarity index 100%
rename from test/dash-curve-ref.png
rename to test/dash-curve.ref.png
diff --git a/test/dash-no-dash-ref.png b/test/dash-no-dash.ref.png
similarity index 100%
rename from test/dash-no-dash-ref.png
rename to test/dash-no-dash.ref.png
diff --git a/test/dash-offset-negative-ref.png b/test/dash-offset-negative.ref.png
similarity index 100%
rename from test/dash-offset-negative-ref.png
rename to test/dash-offset-negative.ref.png
diff --git a/test/dash-scale-ps2-argb32-ref.png b/test/dash-scale.ps2.argb32.ref.png
similarity index 100%
rename from test/dash-scale-ps2-argb32-ref.png
rename to test/dash-scale.ps2.argb32.ref.png
diff --git a/test/dash-scale-ps2-rgb24-ref.png b/test/dash-scale.ps2.rgb24.ref.png
similarity index 100%
rename from test/dash-scale-ps2-rgb24-ref.png
rename to test/dash-scale.ps2.rgb24.ref.png
diff --git a/test/dash-scale-ps3-argb32-ref.png b/test/dash-scale.ps3.argb32.ref.png
similarity index 100%
rename from test/dash-scale-ps3-argb32-ref.png
rename to test/dash-scale.ps3.argb32.ref.png
diff --git a/test/dash-scale-ps3-rgb24-ref.png b/test/dash-scale.ps3.rgb24.ref.png
similarity index 100%
rename from test/dash-scale-ps3-rgb24-ref.png
rename to test/dash-scale.ps3.rgb24.ref.png
diff --git a/test/dash-scale-quartz-ref.png b/test/dash-scale.quartz.ref.png
similarity index 100%
rename from test/dash-scale-quartz-ref.png
rename to test/dash-scale.quartz.ref.png
diff --git a/test/dash-scale-ref.png b/test/dash-scale.ref.png
similarity index 100%
rename from test/dash-scale-ref.png
rename to test/dash-scale.ref.png
diff --git a/test/dash-state-ps2-ref.png b/test/dash-state.ps2.ref.png
similarity index 100%
rename from test/dash-state-ps2-ref.png
rename to test/dash-state.ps2.ref.png
diff --git a/test/dash-state-ps3-ref.png b/test/dash-state.ps3.ref.png
similarity index 100%
rename from test/dash-state-ps3-ref.png
rename to test/dash-state.ps3.ref.png
diff --git a/test/dash-state-quartz-ref.png b/test/dash-state.quartz.ref.png
similarity index 100%
rename from test/dash-state-quartz-ref.png
rename to test/dash-state.quartz.ref.png
diff --git a/test/dash-state-ref.png b/test/dash-state.ref.png
similarity index 100%
rename from test/dash-state-ref.png
rename to test/dash-state.ref.png
diff --git a/test/dash-zero-length-ps2-ref.png b/test/dash-zero-length.ps2.ref.png
similarity index 100%
rename from test/dash-zero-length-ps2-ref.png
rename to test/dash-zero-length.ps2.ref.png
diff --git a/test/dash-zero-length-ps2-rgb24-ref.png b/test/dash-zero-length.ps2.rgb24.ref.png
similarity index 100%
rename from test/dash-zero-length-ps2-rgb24-ref.png
rename to test/dash-zero-length.ps2.rgb24.ref.png
diff --git a/test/dash-zero-length-ps3-ref.png b/test/dash-zero-length.ps3.ref.png
similarity index 100%
rename from test/dash-zero-length-ps3-ref.png
rename to test/dash-zero-length.ps3.ref.png
diff --git a/test/dash-zero-length-ps3-rgb24-ref.png b/test/dash-zero-length.ps3.rgb24.ref.png
similarity index 100%
rename from test/dash-zero-length-ps3-rgb24-ref.png
rename to test/dash-zero-length.ps3.rgb24.ref.png
diff --git a/test/dash-zero-length-ref.png b/test/dash-zero-length.ref.png
similarity index 100%
rename from test/dash-zero-length-ref.png
rename to test/dash-zero-length.ref.png
diff --git a/test/dash-zero-length-rgb24-ref.png b/test/dash-zero-length.rgb24.ref.png
similarity index 100%
rename from test/dash-zero-length-rgb24-ref.png
rename to test/dash-zero-length.rgb24.ref.png
diff --git a/test/degenerate-arc-ps2-ref.png b/test/degenerate-arc.ps2.ref.png
similarity index 100%
rename from test/degenerate-arc-ps2-ref.png
rename to test/degenerate-arc.ps2.ref.png
diff --git a/test/degenerate-arc-ps3-ref.png b/test/degenerate-arc.ps3.ref.png
similarity index 100%
rename from test/degenerate-arc-ps3-ref.png
rename to test/degenerate-arc.ps3.ref.png
diff --git a/test/degenerate-arc-ref.png b/test/degenerate-arc.ref.png
similarity index 100%
rename from test/degenerate-arc-ref.png
rename to test/degenerate-arc.ref.png
diff --git a/test/degenerate-dash-ref.png b/test/degenerate-dash.ref.png
similarity index 100%
rename from test/degenerate-dash-ref.png
rename to test/degenerate-dash.ref.png
diff --git a/test/degenerate-path-ps2-argb32-ref.png b/test/degenerate-path.ps2.argb32.ref.png
similarity index 100%
rename from test/degenerate-path-ps2-argb32-ref.png
rename to test/degenerate-path.ps2.argb32.ref.png
diff --git a/test/degenerate-path-ps2-rgb24-ref.png b/test/degenerate-path.ps2.rgb24.ref.png
similarity index 100%
rename from test/degenerate-path-ps2-rgb24-ref.png
rename to test/degenerate-path.ps2.rgb24.ref.png
diff --git a/test/degenerate-path-ps3-argb32-ref.png b/test/degenerate-path.ps3.argb32.ref.png
similarity index 100%
rename from test/degenerate-path-ps3-argb32-ref.png
rename to test/degenerate-path.ps3.argb32.ref.png
diff --git a/test/degenerate-path-ps3-rgb24-ref.png b/test/degenerate-path.ps3.rgb24.ref.png
similarity index 100%
rename from test/degenerate-path-ps3-rgb24-ref.png
rename to test/degenerate-path.ps3.rgb24.ref.png
diff --git a/test/degenerate-path-quartz-ref.png b/test/degenerate-path.quartz.ref.png
similarity index 100%
rename from test/degenerate-path-quartz-ref.png
rename to test/degenerate-path.quartz.ref.png
diff --git a/test/degenerate-path-quartz-rgb24-ref.png b/test/degenerate-path.quartz.rgb24.ref.png
similarity index 100%
rename from test/degenerate-path-quartz-rgb24-ref.png
rename to test/degenerate-path.quartz.rgb24.ref.png
diff --git a/test/degenerate-path-ref.png b/test/degenerate-path.ref.png
similarity index 100%
rename from test/degenerate-path-ref.png
rename to test/degenerate-path.ref.png
diff --git a/test/degenerate-path-rgb24-ref.png b/test/degenerate-path.rgb24.ref.png
similarity index 100%
rename from test/degenerate-path-rgb24-ref.png
rename to test/degenerate-path.rgb24.ref.png
diff --git a/test/degenerate-pen-ps2-ref.png b/test/degenerate-pen.ps2.ref.png
similarity index 100%
rename from test/degenerate-pen-ps2-ref.png
rename to test/degenerate-pen.ps2.ref.png
diff --git a/test/degenerate-pen-ps3-ref.png b/test/degenerate-pen.ps3.ref.png
similarity index 100%
rename from test/degenerate-pen-ps3-ref.png
rename to test/degenerate-pen.ps3.ref.png
diff --git a/test/degenerate-pen-quartz-ref.png b/test/degenerate-pen.quartz.ref.png
similarity index 100%
rename from test/degenerate-pen-quartz-ref.png
rename to test/degenerate-pen.quartz.ref.png
diff --git a/test/degenerate-pen-ref.png b/test/degenerate-pen.ref.png
similarity index 100%
rename from test/degenerate-pen-ref.png
rename to test/degenerate-pen.ref.png
diff --git a/test/device-offset-fractional-pdf-ref.png b/test/device-offset-fractional.pdf.ref.png
similarity index 100%
rename from test/device-offset-fractional-pdf-ref.png
rename to test/device-offset-fractional.pdf.ref.png
diff --git a/test/device-offset-fractional-ps2-ref.png b/test/device-offset-fractional.ps2.ref.png
similarity index 100%
rename from test/device-offset-fractional-ps2-ref.png
rename to test/device-offset-fractional.ps2.ref.png
diff --git a/test/device-offset-fractional-ps3-ref.png b/test/device-offset-fractional.ps3.ref.png
similarity index 100%
rename from test/device-offset-fractional-ps3-ref.png
rename to test/device-offset-fractional.ps3.ref.png
diff --git a/test/device-offset-fractional-ref.png b/test/device-offset-fractional.ref.png
similarity index 100%
rename from test/device-offset-fractional-ref.png
rename to test/device-offset-fractional.ref.png
diff --git a/test/device-offset-positive-ref.png b/test/device-offset-positive.ref.png
similarity index 100%
rename from test/device-offset-positive-ref.png
rename to test/device-offset-positive.ref.png
diff --git a/test/device-offset-positive-rgb24-ref.png b/test/device-offset-positive.rgb24.ref.png
similarity index 100%
rename from test/device-offset-positive-rgb24-ref.png
rename to test/device-offset-positive.rgb24.ref.png
diff --git a/test/device-offset-scale-ref.png b/test/device-offset-scale.ref.png
similarity index 100%
rename from test/device-offset-scale-ref.png
rename to test/device-offset-scale.ref.png
diff --git a/test/device-offset-ref.png b/test/device-offset.ref.png
similarity index 100%
rename from test/device-offset-ref.png
rename to test/device-offset.ref.png
diff --git a/test/device-offset-rgb24-ref.png b/test/device-offset.rgb24.ref.png
similarity index 100%
rename from test/device-offset-rgb24-ref.png
rename to test/device-offset.rgb24.ref.png
diff --git a/test/extend-pad-ref.png b/test/extend-pad.ref.png
similarity index 100%
rename from test/extend-pad-ref.png
rename to test/extend-pad.ref.png
diff --git a/test/extend-reflect-ps2-ref.png b/test/extend-reflect-similar.ps2.ref.png
similarity index 100%
rename from test/extend-reflect-ps2-ref.png
rename to test/extend-reflect-similar.ps2.ref.png
diff --git a/test/extend-reflect-ps3-ref.png b/test/extend-reflect-similar.ps3.ref.png
similarity index 100%
rename from test/extend-reflect-ps3-ref.png
rename to test/extend-reflect-similar.ps3.ref.png
diff --git a/test/extend-reflect-ref.png b/test/extend-reflect-similar.ref.png
similarity index 100%
rename from test/extend-reflect-ref.png
rename to test/extend-reflect-similar.ref.png
diff --git a/test/extend-reflect-similar-ps2-ref.png b/test/extend-reflect.ps2.ref.png
similarity index 100%
rename from test/extend-reflect-similar-ps2-ref.png
rename to test/extend-reflect.ps2.ref.png
diff --git a/test/extend-reflect-similar-ps3-ref.png b/test/extend-reflect.ps3.ref.png
similarity index 100%
rename from test/extend-reflect-similar-ps3-ref.png
rename to test/extend-reflect.ps3.ref.png
diff --git a/test/extend-reflect-similar-ref.png b/test/extend-reflect.ref.png
similarity index 100%
rename from test/extend-reflect-similar-ref.png
rename to test/extend-reflect.ref.png
diff --git a/test/extend-repeat-ps2-ref.png b/test/extend-repeat-similar.ps2.ref.png
similarity index 100%
rename from test/extend-repeat-ps2-ref.png
rename to test/extend-repeat-similar.ps2.ref.png
diff --git a/test/extend-repeat-ps3-ref.png b/test/extend-repeat-similar.ps3.ref.png
similarity index 100%
rename from test/extend-repeat-ps3-ref.png
rename to test/extend-repeat-similar.ps3.ref.png
diff --git a/test/extend-repeat-ref.png b/test/extend-repeat-similar.ref.png
similarity index 100%
rename from test/extend-repeat-ref.png
rename to test/extend-repeat-similar.ref.png
diff --git a/test/extend-repeat-similar-ps2-ref.png b/test/extend-repeat.ps2.ref.png
similarity index 100%
rename from test/extend-repeat-similar-ps2-ref.png
rename to test/extend-repeat.ps2.ref.png
diff --git a/test/extend-repeat-similar-ps3-ref.png b/test/extend-repeat.ps3.ref.png
similarity index 100%
rename from test/extend-repeat-similar-ps3-ref.png
rename to test/extend-repeat.ps3.ref.png
diff --git a/test/extend-repeat-similar-ref.png b/test/extend-repeat.ref.png
similarity index 100%
rename from test/extend-repeat-similar-ref.png
rename to test/extend-repeat.ref.png
diff --git a/test/fallback-resolution.c b/test/fallback-resolution.c
index ab6a0edec..c8b994498 100644
--- a/test/fallback-resolution.c
+++ b/test/fallback-resolution.c
@@ -165,8 +165,8 @@ check_result (cairo_test_context_t *ctx,
 	}
     }
 
-    xasprintf (&png_name,  "%s-out.png", base_name);
-    xasprintf (&diff_name, "%s-diff.png", base_name);
+    xasprintf (&png_name,  "%s.out.png", base_name);
+    xasprintf (&diff_name, "%s.diff.png", base_name);
 
     test_image = target->get_image_surface (surface, 0, SIZE, SIZE);
     if (cairo_surface_status (test_image)) {
@@ -194,6 +194,7 @@ check_result (cairo_test_context_t *ctx,
 	                                            base_name,
 						    test_name,
 						    target->name,
+						    target->basename,
 						    format);
     if (ref_name == NULL) {
 	cairo_test_log (ctx, "Error: Cannot find reference image for %s\n",
@@ -310,7 +311,7 @@ preamble (cairo_test_context_t *ctx)
     for (ppi_x = 0; ppi_x < num_ppi; ppi_x++) {
 	for (ppi_y = 0; ppi_y < num_ppi; ppi_y++) {
 	    char *ref_name;
-	    xasprintf (&ref_name, "fallback-resolution-ppi%gx%g-ref.png",
+	    xasprintf (&ref_name, "fallback-resolution.ppi%gx%g.ref.png",
 		       ppi[ppi_x], ppi[ppi_y]);
 	    generate_reference (ppi[ppi_x], ppi[ppi_y], ref_name);
 	    free (ref_name);
@@ -330,7 +331,7 @@ preamble (cairo_test_context_t *ctx)
 	    continue;
 
 	format = cairo_boilerplate_content_name (target->content);
-	xasprintf (&base_name, "fallback-resolution-%s-%s",
+	xasprintf (&base_name, "fallback-resolution.%s-%s",
 		   target->name,
 		   format);
 
@@ -363,7 +364,7 @@ preamble (cairo_test_context_t *ctx)
 		char *test_name;
 		cairo_bool_t pass;
 
-		xasprintf (&test_name, "fallback-resolution-ppi%gx%g",
+		xasprintf (&test_name, "fallback-resolution.ppi%gx%g",
 			   ppi[ppi_x], ppi[ppi_y]);
 		xasprintf (&base_name, "%s-%s-%s",
 			   test_name,
diff --git a/test/fallback-resolution-ppi150x150-ref.png b/test/fallback-resolution.ppi150x150.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi150x150-ref.png
rename to test/fallback-resolution.ppi150x150.ref.png
diff --git a/test/fallback-resolution-ppi150x300-ref.png b/test/fallback-resolution.ppi150x300.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi150x300-ref.png
rename to test/fallback-resolution.ppi150x300.ref.png
diff --git a/test/fallback-resolution-ppi150x37.5-ref.png b/test/fallback-resolution.ppi150x37.5.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi150x37.5-ref.png
rename to test/fallback-resolution.ppi150x37.5.ref.png
diff --git a/test/fallback-resolution-ppi150x600-ref.png b/test/fallback-resolution.ppi150x600.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi150x600-ref.png
rename to test/fallback-resolution.ppi150x600.ref.png
diff --git a/test/fallback-resolution-ppi150x72-ref.png b/test/fallback-resolution.ppi150x72.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi150x72-ref.png
rename to test/fallback-resolution.ppi150x72.ref.png
diff --git a/test/fallback-resolution-ppi150x75-ref.png b/test/fallback-resolution.ppi150x75.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi150x75-ref.png
rename to test/fallback-resolution.ppi150x75.ref.png
diff --git a/test/fallback-resolution-ppi300x150-ref.png b/test/fallback-resolution.ppi300x150.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi300x150-ref.png
rename to test/fallback-resolution.ppi300x150.ref.png
diff --git a/test/fallback-resolution-ppi300x300-ref.png b/test/fallback-resolution.ppi300x300.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi300x300-ref.png
rename to test/fallback-resolution.ppi300x300.ref.png
diff --git a/test/fallback-resolution-ppi300x37.5-ref.png b/test/fallback-resolution.ppi300x37.5.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi300x37.5-ref.png
rename to test/fallback-resolution.ppi300x37.5.ref.png
diff --git a/test/fallback-resolution-ppi300x600-ref.png b/test/fallback-resolution.ppi300x600.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi300x600-ref.png
rename to test/fallback-resolution.ppi300x600.ref.png
diff --git a/test/fallback-resolution-ppi300x72-ref.png b/test/fallback-resolution.ppi300x72.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi300x72-ref.png
rename to test/fallback-resolution.ppi300x72.ref.png
diff --git a/test/fallback-resolution-ppi300x75-ref.png b/test/fallback-resolution.ppi300x75.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi300x75-ref.png
rename to test/fallback-resolution.ppi300x75.ref.png
diff --git a/test/fallback-resolution-ppi37.5x150-ref.png b/test/fallback-resolution.ppi37.5x150.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi37.5x150-ref.png
rename to test/fallback-resolution.ppi37.5x150.ref.png
diff --git a/test/fallback-resolution-ppi37.5x300-ref.png b/test/fallback-resolution.ppi37.5x300.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi37.5x300-ref.png
rename to test/fallback-resolution.ppi37.5x300.ref.png
diff --git a/test/fallback-resolution-ppi37.5x37.5-ref.png b/test/fallback-resolution.ppi37.5x37.5.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi37.5x37.5-ref.png
rename to test/fallback-resolution.ppi37.5x37.5.ref.png
diff --git a/test/fallback-resolution-ppi37.5x600-ref.png b/test/fallback-resolution.ppi37.5x600.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi37.5x600-ref.png
rename to test/fallback-resolution.ppi37.5x600.ref.png
diff --git a/test/fallback-resolution-ppi37.5x72-ref.png b/test/fallback-resolution.ppi37.5x72.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi37.5x72-ref.png
rename to test/fallback-resolution.ppi37.5x72.ref.png
diff --git a/test/fallback-resolution-ppi37.5x75-ref.png b/test/fallback-resolution.ppi37.5x75.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi37.5x75-ref.png
rename to test/fallback-resolution.ppi37.5x75.ref.png
diff --git a/test/fallback-resolution-ppi600x150-ref.png b/test/fallback-resolution.ppi600x150.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi600x150-ref.png
rename to test/fallback-resolution.ppi600x150.ref.png
diff --git a/test/fallback-resolution-ppi600x300-ref.png b/test/fallback-resolution.ppi600x300.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi600x300-ref.png
rename to test/fallback-resolution.ppi600x300.ref.png
diff --git a/test/fallback-resolution-ppi600x37.5-ref.png b/test/fallback-resolution.ppi600x37.5.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi600x37.5-ref.png
rename to test/fallback-resolution.ppi600x37.5.ref.png
diff --git a/test/fallback-resolution-ppi600x600-ref.png b/test/fallback-resolution.ppi600x600.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi600x600-ref.png
rename to test/fallback-resolution.ppi600x600.ref.png
diff --git a/test/fallback-resolution-ppi600x72-ref.png b/test/fallback-resolution.ppi600x72.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi600x72-ref.png
rename to test/fallback-resolution.ppi600x72.ref.png
diff --git a/test/fallback-resolution-ppi600x75-ref.png b/test/fallback-resolution.ppi600x75.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi600x75-ref.png
rename to test/fallback-resolution.ppi600x75.ref.png
diff --git a/test/fallback-resolution-ppi72x150-ref.png b/test/fallback-resolution.ppi72x150.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi72x150-ref.png
rename to test/fallback-resolution.ppi72x150.ref.png
diff --git a/test/fallback-resolution-ppi72x300-ref.png b/test/fallback-resolution.ppi72x300.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi72x300-ref.png
rename to test/fallback-resolution.ppi72x300.ref.png
diff --git a/test/fallback-resolution-ppi72x37.5-ref.png b/test/fallback-resolution.ppi72x37.5.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi72x37.5-ref.png
rename to test/fallback-resolution.ppi72x37.5.ref.png
diff --git a/test/fallback-resolution-ppi72x600-ref.png b/test/fallback-resolution.ppi72x600.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi72x600-ref.png
rename to test/fallback-resolution.ppi72x600.ref.png
diff --git a/test/fallback-resolution-ppi72x72-ref.png b/test/fallback-resolution.ppi72x72.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi72x72-ref.png
rename to test/fallback-resolution.ppi72x72.ref.png
diff --git a/test/fallback-resolution-ppi72x75-ref.png b/test/fallback-resolution.ppi72x75.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi72x75-ref.png
rename to test/fallback-resolution.ppi72x75.ref.png
diff --git a/test/fallback-resolution-ppi75x150-ref.png b/test/fallback-resolution.ppi75x150.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi75x150-ref.png
rename to test/fallback-resolution.ppi75x150.ref.png
diff --git a/test/fallback-resolution-ppi75x300-ref.png b/test/fallback-resolution.ppi75x300.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi75x300-ref.png
rename to test/fallback-resolution.ppi75x300.ref.png
diff --git a/test/fallback-resolution-ppi75x37.5-ref.png b/test/fallback-resolution.ppi75x37.5.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi75x37.5-ref.png
rename to test/fallback-resolution.ppi75x37.5.ref.png
diff --git a/test/fallback-resolution-ppi75x600-ref.png b/test/fallback-resolution.ppi75x600.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi75x600-ref.png
rename to test/fallback-resolution.ppi75x600.ref.png
diff --git a/test/fallback-resolution-ppi75x72-ref.png b/test/fallback-resolution.ppi75x72.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi75x72-ref.png
rename to test/fallback-resolution.ppi75x72.ref.png
diff --git a/test/fallback-resolution-ppi75x75-ref.png b/test/fallback-resolution.ppi75x75.ref.png
similarity index 100%
rename from test/fallback-resolution-ppi75x75-ref.png
rename to test/fallback-resolution.ppi75x75.ref.png
diff --git a/test/fill-alpha-pattern-pdf-argb32-ref.png b/test/fill-alpha-pattern.pdf.argb32.ref.png
similarity index 100%
rename from test/fill-alpha-pattern-pdf-argb32-ref.png
rename to test/fill-alpha-pattern.pdf.argb32.ref.png
diff --git a/test/fill-alpha-pattern-pdf-rgb24-ref.png b/test/fill-alpha-pattern.pdf.rgb24.ref.png
similarity index 100%
rename from test/fill-alpha-pattern-pdf-rgb24-ref.png
rename to test/fill-alpha-pattern.pdf.rgb24.ref.png
diff --git a/test/fill-alpha-pattern-ps3-ref.png b/test/fill-alpha-pattern.ps3.ref.png
similarity index 100%
rename from test/fill-alpha-pattern-ps3-ref.png
rename to test/fill-alpha-pattern.ps3.ref.png
diff --git a/test/fill-alpha-pattern-ref.png b/test/fill-alpha-pattern.ref.png
similarity index 100%
rename from test/fill-alpha-pattern-ref.png
rename to test/fill-alpha-pattern.ref.png
diff --git a/test/fill-alpha-ref.png b/test/fill-alpha.ref.png
similarity index 100%
rename from test/fill-alpha-ref.png
rename to test/fill-alpha.ref.png
diff --git a/test/fill-and-stroke-alpha-add-quartz-ref.png b/test/fill-and-stroke-alpha-add.quartz.ref.png
similarity index 100%
rename from test/fill-and-stroke-alpha-add-quartz-ref.png
rename to test/fill-and-stroke-alpha-add.quartz.ref.png
diff --git a/test/fill-and-stroke-alpha-add-ref.png b/test/fill-and-stroke-alpha-add.ref.png
similarity index 100%
rename from test/fill-and-stroke-alpha-add-ref.png
rename to test/fill-and-stroke-alpha-add.ref.png
diff --git a/test/fill-and-stroke-alpha-quartz-ref.png b/test/fill-and-stroke-alpha.quartz.ref.png
similarity index 100%
rename from test/fill-and-stroke-alpha-quartz-ref.png
rename to test/fill-and-stroke-alpha.quartz.ref.png
diff --git a/test/fill-and-stroke-alpha-ref.png b/test/fill-and-stroke-alpha.ref.png
similarity index 100%
rename from test/fill-and-stroke-alpha-ref.png
rename to test/fill-and-stroke-alpha.ref.png
diff --git a/test/fill-and-stroke-ps2-argb32-ref.png b/test/fill-and-stroke.ps2.argb32.ref.png
similarity index 100%
rename from test/fill-and-stroke-ps2-argb32-ref.png
rename to test/fill-and-stroke.ps2.argb32.ref.png
diff --git a/test/fill-and-stroke-ps2-rgb24-ref.png b/test/fill-and-stroke.ps2.rgb24.ref.png
similarity index 100%
rename from test/fill-and-stroke-ps2-rgb24-ref.png
rename to test/fill-and-stroke.ps2.rgb24.ref.png
diff --git a/test/fill-and-stroke-ps3-argb32-ref.png b/test/fill-and-stroke.ps3.argb32.ref.png
similarity index 100%
rename from test/fill-and-stroke-ps3-argb32-ref.png
rename to test/fill-and-stroke.ps3.argb32.ref.png
diff --git a/test/fill-and-stroke-ps3-rgb24-ref.png b/test/fill-and-stroke.ps3.rgb24.ref.png
similarity index 100%
rename from test/fill-and-stroke-ps3-rgb24-ref.png
rename to test/fill-and-stroke.ps3.rgb24.ref.png
diff --git a/test/fill-and-stroke-quartz-ref.png b/test/fill-and-stroke.quartz.ref.png
similarity index 100%
rename from test/fill-and-stroke-quartz-ref.png
rename to test/fill-and-stroke.quartz.ref.png
diff --git a/test/fill-and-stroke-quartz-rgb24-ref.png b/test/fill-and-stroke.quartz.rgb24.ref.png
similarity index 100%
rename from test/fill-and-stroke-quartz-rgb24-ref.png
rename to test/fill-and-stroke.quartz.rgb24.ref.png
diff --git a/test/fill-and-stroke-ref.png b/test/fill-and-stroke.ref.png
similarity index 100%
rename from test/fill-and-stroke-ref.png
rename to test/fill-and-stroke.ref.png
diff --git a/test/fill-and-stroke-rgb24-ref.png b/test/fill-and-stroke.rgb24.ref.png
similarity index 100%
rename from test/fill-and-stroke-rgb24-ref.png
rename to test/fill-and-stroke.rgb24.ref.png
diff --git a/test/fill-degenerate-sort-order-quartz-ref.png b/test/fill-degenerate-sort-order.quartz.ref.png
similarity index 100%
rename from test/fill-degenerate-sort-order-quartz-ref.png
rename to test/fill-degenerate-sort-order.quartz.ref.png
diff --git a/test/fill-degenerate-sort-order-quartz-rgb24-ref.png b/test/fill-degenerate-sort-order.quartz.rgb24.ref.png
similarity index 100%
rename from test/fill-degenerate-sort-order-quartz-rgb24-ref.png
rename to test/fill-degenerate-sort-order.quartz.rgb24.ref.png
diff --git a/test/fill-degenerate-sort-order-ref.png b/test/fill-degenerate-sort-order.ref.png
similarity index 100%
rename from test/fill-degenerate-sort-order-ref.png
rename to test/fill-degenerate-sort-order.ref.png
diff --git a/test/fill-degenerate-sort-order-rgb24-ref.png b/test/fill-degenerate-sort-order.rgb24.ref.png
similarity index 100%
rename from test/fill-degenerate-sort-order-rgb24-ref.png
rename to test/fill-degenerate-sort-order.rgb24.ref.png
diff --git a/test/fill-missed-stop-ps2-argb32-ref.png b/test/fill-missed-stop.ps2.argb32.ref.png
similarity index 100%
rename from test/fill-missed-stop-ps2-argb32-ref.png
rename to test/fill-missed-stop.ps2.argb32.ref.png
diff --git a/test/fill-missed-stop-ps2-rgb24-ref.png b/test/fill-missed-stop.ps2.rgb24.ref.png
similarity index 100%
rename from test/fill-missed-stop-ps2-rgb24-ref.png
rename to test/fill-missed-stop.ps2.rgb24.ref.png
diff --git a/test/fill-missed-stop-ps3-argb32-ref.png b/test/fill-missed-stop.ps3.argb32.ref.png
similarity index 100%
rename from test/fill-missed-stop-ps3-argb32-ref.png
rename to test/fill-missed-stop.ps3.argb32.ref.png
diff --git a/test/fill-missed-stop-ps3-rgb24-ref.png b/test/fill-missed-stop.ps3.rgb24.ref.png
similarity index 100%
rename from test/fill-missed-stop-ps3-rgb24-ref.png
rename to test/fill-missed-stop.ps3.rgb24.ref.png
diff --git a/test/fill-missed-stop-ref.png b/test/fill-missed-stop.ref.png
similarity index 100%
rename from test/fill-missed-stop-ref.png
rename to test/fill-missed-stop.ref.png
diff --git a/test/fill-missed-stop-rgb24-ref.png b/test/fill-missed-stop.rgb24.ref.png
similarity index 100%
rename from test/fill-missed-stop-rgb24-ref.png
rename to test/fill-missed-stop.rgb24.ref.png
diff --git a/test/fill-rule-ps2-argb32-ref.png b/test/fill-rule.ps2.argb32.ref.png
similarity index 100%
rename from test/fill-rule-ps2-argb32-ref.png
rename to test/fill-rule.ps2.argb32.ref.png
diff --git a/test/fill-rule-ps2-rgb24-ref.png b/test/fill-rule.ps2.rgb24.ref.png
similarity index 100%
rename from test/fill-rule-ps2-rgb24-ref.png
rename to test/fill-rule.ps2.rgb24.ref.png
diff --git a/test/fill-rule-ps3-argb32-ref.png b/test/fill-rule.ps3.argb32.ref.png
similarity index 100%
rename from test/fill-rule-ps3-argb32-ref.png
rename to test/fill-rule.ps3.argb32.ref.png
diff --git a/test/fill-rule-ps3-rgb24-ref.png b/test/fill-rule.ps3.rgb24.ref.png
similarity index 100%
rename from test/fill-rule-ps3-rgb24-ref.png
rename to test/fill-rule.ps3.rgb24.ref.png
diff --git a/test/fill-rule-quartz-ref.png b/test/fill-rule.quartz.ref.png
similarity index 100%
rename from test/fill-rule-quartz-ref.png
rename to test/fill-rule.quartz.ref.png
diff --git a/test/fill-rule-quartz-rgb24-ref.png b/test/fill-rule.quartz.rgb24.ref.png
similarity index 100%
rename from test/fill-rule-quartz-rgb24-ref.png
rename to test/fill-rule.quartz.rgb24.ref.png
diff --git a/test/fill-rule-ref.png b/test/fill-rule.ref.png
similarity index 100%
rename from test/fill-rule-ref.png
rename to test/fill-rule.ref.png
diff --git a/test/fill-rule-rgb24-ref.png b/test/fill-rule.rgb24.ref.png
similarity index 100%
rename from test/fill-rule-rgb24-ref.png
rename to test/fill-rule.rgb24.ref.png
diff --git a/test/filter-bilinear-extents-pdf-ref.png b/test/filter-bilinear-extents.pdf.ref.png
similarity index 100%
rename from test/filter-bilinear-extents-pdf-ref.png
rename to test/filter-bilinear-extents.pdf.ref.png
diff --git a/test/filter-bilinear-extents-ps2-ref.png b/test/filter-bilinear-extents.ps2.ref.png
similarity index 100%
rename from test/filter-bilinear-extents-ps2-ref.png
rename to test/filter-bilinear-extents.ps2.ref.png
diff --git a/test/filter-bilinear-extents-ps3-ref.png b/test/filter-bilinear-extents.ps3.ref.png
similarity index 100%
rename from test/filter-bilinear-extents-ps3-ref.png
rename to test/filter-bilinear-extents.ps3.ref.png
diff --git a/test/filter-bilinear-extents-ref.png b/test/filter-bilinear-extents.ref.png
similarity index 100%
rename from test/filter-bilinear-extents-ref.png
rename to test/filter-bilinear-extents.ref.png
diff --git a/test/filter-nearest-offset-pdf-ref.png b/test/filter-nearest-offset.pdf.ref.png
similarity index 100%
rename from test/filter-nearest-offset-pdf-ref.png
rename to test/filter-nearest-offset.pdf.ref.png
diff --git a/test/filter-nearest-offset-ps2-ref.png b/test/filter-nearest-offset.ps2.ref.png
similarity index 100%
rename from test/filter-nearest-offset-ps2-ref.png
rename to test/filter-nearest-offset.ps2.ref.png
diff --git a/test/filter-nearest-offset-ps3-ref.png b/test/filter-nearest-offset.ps3.ref.png
similarity index 100%
rename from test/filter-nearest-offset-ps3-ref.png
rename to test/filter-nearest-offset.ps3.ref.png
diff --git a/test/filter-nearest-offset-ref.png b/test/filter-nearest-offset.ref.png
similarity index 100%
rename from test/filter-nearest-offset-ref.png
rename to test/filter-nearest-offset.ref.png
diff --git a/test/filter-nearest-offset-svg11-ref.png b/test/filter-nearest-offset.svg11.ref.png
similarity index 100%
rename from test/filter-nearest-offset-svg11-ref.png
rename to test/filter-nearest-offset.svg11.ref.png
diff --git a/test/filter-nearest-offset-svg12-ref.png b/test/filter-nearest-offset.svg12.ref.png
similarity index 100%
rename from test/filter-nearest-offset-svg12-ref.png
rename to test/filter-nearest-offset.svg12.ref.png
diff --git a/test/filter-nearest-transformed-pdf-ref.png b/test/filter-nearest-transformed.pdf.ref.png
similarity index 100%
rename from test/filter-nearest-transformed-pdf-ref.png
rename to test/filter-nearest-transformed.pdf.ref.png
diff --git a/test/filter-nearest-transformed-ref.png b/test/filter-nearest-transformed.ref.png
similarity index 100%
rename from test/filter-nearest-transformed-ref.png
rename to test/filter-nearest-transformed.ref.png
diff --git a/test/filter-nearest-transformed-svg11-ref.png b/test/filter-nearest-transformed.svg11.ref.png
similarity index 100%
rename from test/filter-nearest-transformed-svg11-ref.png
rename to test/filter-nearest-transformed.svg11.ref.png
diff --git a/test/filter-nearest-transformed-svg12-ref.png b/test/filter-nearest-transformed.svg12.ref.png
similarity index 100%
rename from test/filter-nearest-transformed-svg12-ref.png
rename to test/filter-nearest-transformed.svg12.ref.png
diff --git a/test/finer-grained-fallbacks-ps2-ref.png b/test/finer-grained-fallbacks.ps2.ref.png
similarity index 100%
rename from test/finer-grained-fallbacks-ps2-ref.png
rename to test/finer-grained-fallbacks.ps2.ref.png
diff --git a/test/finer-grained-fallbacks-ps2-rgb24-ref.png b/test/finer-grained-fallbacks.ps2.rgb24.ref.png
similarity index 100%
rename from test/finer-grained-fallbacks-ps2-rgb24-ref.png
rename to test/finer-grained-fallbacks.ps2.rgb24.ref.png
diff --git a/test/finer-grained-fallbacks-ps3-ref.png b/test/finer-grained-fallbacks.ps3.ref.png
similarity index 100%
rename from test/finer-grained-fallbacks-ps3-ref.png
rename to test/finer-grained-fallbacks.ps3.ref.png
diff --git a/test/finer-grained-fallbacks-ps3-rgb24-ref.png b/test/finer-grained-fallbacks.ps3.rgb24.ref.png
similarity index 100%
rename from test/finer-grained-fallbacks-ps3-rgb24-ref.png
rename to test/finer-grained-fallbacks.ps3.rgb24.ref.png
diff --git a/test/finer-grained-fallbacks-ref.png b/test/finer-grained-fallbacks.ref.png
similarity index 100%
rename from test/finer-grained-fallbacks-ref.png
rename to test/finer-grained-fallbacks.ref.png
diff --git a/test/finer-grained-fallbacks-rgb24-ref.png b/test/finer-grained-fallbacks.rgb24.ref.png
similarity index 100%
rename from test/finer-grained-fallbacks-rgb24-ref.png
rename to test/finer-grained-fallbacks.rgb24.ref.png
diff --git a/test/font-matrix-translation-ps2-argb32-ref.png b/test/font-matrix-translation.ps2.argb32.ref.png
similarity index 100%
rename from test/font-matrix-translation-ps2-argb32-ref.png
rename to test/font-matrix-translation.ps2.argb32.ref.png
diff --git a/test/font-matrix-translation-ps2-rgb24-ref.png b/test/font-matrix-translation.ps2.rgb24.ref.png
similarity index 100%
rename from test/font-matrix-translation-ps2-rgb24-ref.png
rename to test/font-matrix-translation.ps2.rgb24.ref.png
diff --git a/test/font-matrix-translation-ps3-argb32-ref.png b/test/font-matrix-translation.ps3.argb32.ref.png
similarity index 100%
rename from test/font-matrix-translation-ps3-argb32-ref.png
rename to test/font-matrix-translation.ps3.argb32.ref.png
diff --git a/test/font-matrix-translation-ps3-rgb24-ref.png b/test/font-matrix-translation.ps3.rgb24.ref.png
similarity index 100%
rename from test/font-matrix-translation-ps3-rgb24-ref.png
rename to test/font-matrix-translation.ps3.rgb24.ref.png
diff --git a/test/font-matrix-translation-quartz-ref.png b/test/font-matrix-translation.quartz.ref.png
similarity index 100%
rename from test/font-matrix-translation-quartz-ref.png
rename to test/font-matrix-translation.quartz.ref.png
diff --git a/test/font-matrix-translation-ref.png b/test/font-matrix-translation.ref.png
similarity index 100%
rename from test/font-matrix-translation-ref.png
rename to test/font-matrix-translation.ref.png
diff --git a/test/font-matrix-translation-svg11-ref.png b/test/font-matrix-translation.svg11.ref.png
similarity index 100%
rename from test/font-matrix-translation-svg11-ref.png
rename to test/font-matrix-translation.svg11.ref.png
diff --git a/test/font-matrix-translation-svg12-ref.png b/test/font-matrix-translation.svg12.ref.png
similarity index 100%
rename from test/font-matrix-translation-svg12-ref.png
rename to test/font-matrix-translation.svg12.ref.png
diff --git a/test/ft-show-glyphs-positioning-pdf-ref.png b/test/ft-show-glyphs-positioning.pdf.ref.png
similarity index 100%
rename from test/ft-show-glyphs-positioning-pdf-ref.png
rename to test/ft-show-glyphs-positioning.pdf.ref.png
diff --git a/test/ft-show-glyphs-positioning-ps2-ref.png b/test/ft-show-glyphs-positioning.ps2.ref.png
similarity index 100%
rename from test/ft-show-glyphs-positioning-ps2-ref.png
rename to test/ft-show-glyphs-positioning.ps2.ref.png
diff --git a/test/ft-show-glyphs-positioning-ps3-ref.png b/test/ft-show-glyphs-positioning.ps3.ref.png
similarity index 100%
rename from test/ft-show-glyphs-positioning-ps3-ref.png
rename to test/ft-show-glyphs-positioning.ps3.ref.png
diff --git a/test/ft-show-glyphs-positioning-ref.png b/test/ft-show-glyphs-positioning.ref.png
similarity index 100%
rename from test/ft-show-glyphs-positioning-ref.png
rename to test/ft-show-glyphs-positioning.ref.png
diff --git a/test/ft-show-glyphs-positioning-svg11-ref.png b/test/ft-show-glyphs-positioning.svg11.ref.png
similarity index 100%
rename from test/ft-show-glyphs-positioning-svg11-ref.png
rename to test/ft-show-glyphs-positioning.svg11.ref.png
diff --git a/test/ft-show-glyphs-positioning-svg12-ref.png b/test/ft-show-glyphs-positioning.svg12.ref.png
similarity index 100%
rename from test/ft-show-glyphs-positioning-svg12-ref.png
rename to test/ft-show-glyphs-positioning.svg12.ref.png
diff --git a/test/ft-show-glyphs-table-ps2-ref.png b/test/ft-show-glyphs-table.ps2.ref.png
similarity index 100%
rename from test/ft-show-glyphs-table-ps2-ref.png
rename to test/ft-show-glyphs-table.ps2.ref.png
diff --git a/test/ft-show-glyphs-table-ps3-ref.png b/test/ft-show-glyphs-table.ps3.ref.png
similarity index 100%
rename from test/ft-show-glyphs-table-ps3-ref.png
rename to test/ft-show-glyphs-table.ps3.ref.png
diff --git a/test/ft-show-glyphs-table-ref.png b/test/ft-show-glyphs-table.ref.png
similarity index 100%
rename from test/ft-show-glyphs-table-ref.png
rename to test/ft-show-glyphs-table.ref.png
diff --git a/test/ft-text-antialias-none-ps2-argb32-ref.png b/test/ft-text-antialias-none.ps2.argb32.ref.png
similarity index 100%
rename from test/ft-text-antialias-none-ps2-argb32-ref.png
rename to test/ft-text-antialias-none.ps2.argb32.ref.png
diff --git a/test/ft-text-antialias-none-ps3-argb32-ref.png b/test/ft-text-antialias-none.ps3.argb32.ref.png
similarity index 100%
rename from test/ft-text-antialias-none-ps3-argb32-ref.png
rename to test/ft-text-antialias-none.ps3.argb32.ref.png
diff --git a/test/ft-text-antialias-none-ref.png b/test/ft-text-antialias-none.ref.png
similarity index 100%
rename from test/ft-text-antialias-none-ref.png
rename to test/ft-text-antialias-none.ref.png
diff --git a/test/ft-text-vertical-layout-type1-pdf-ref.png b/test/ft-text-vertical-layout-type1.pdf.ref.png
similarity index 100%
rename from test/ft-text-vertical-layout-type1-pdf-ref.png
rename to test/ft-text-vertical-layout-type1.pdf.ref.png
diff --git a/test/ft-text-vertical-layout-type1-ps2-ref.png b/test/ft-text-vertical-layout-type1.ps2.ref.png
similarity index 100%
rename from test/ft-text-vertical-layout-type1-ps2-ref.png
rename to test/ft-text-vertical-layout-type1.ps2.ref.png
diff --git a/test/ft-text-vertical-layout-type1-ps3-ref.png b/test/ft-text-vertical-layout-type1.ps3.ref.png
similarity index 100%
rename from test/ft-text-vertical-layout-type1-ps3-ref.png
rename to test/ft-text-vertical-layout-type1.ps3.ref.png
diff --git a/test/ft-text-vertical-layout-type1-ref.png b/test/ft-text-vertical-layout-type1.ref.png
similarity index 100%
rename from test/ft-text-vertical-layout-type1-ref.png
rename to test/ft-text-vertical-layout-type1.ref.png
diff --git a/test/ft-text-vertical-layout-type1-svg11-ref.png b/test/ft-text-vertical-layout-type1.svg11.ref.png
similarity index 100%
rename from test/ft-text-vertical-layout-type1-svg11-ref.png
rename to test/ft-text-vertical-layout-type1.svg11.ref.png
diff --git a/test/ft-text-vertical-layout-type1-svg12-ref.png b/test/ft-text-vertical-layout-type1.svg12.ref.png
similarity index 100%
rename from test/ft-text-vertical-layout-type1-svg12-ref.png
rename to test/ft-text-vertical-layout-type1.svg12.ref.png
diff --git a/test/ft-text-vertical-layout-type3-pdf-ref.png b/test/ft-text-vertical-layout-type3.pdf.ref.png
similarity index 100%
rename from test/ft-text-vertical-layout-type3-pdf-ref.png
rename to test/ft-text-vertical-layout-type3.pdf.ref.png
diff --git a/test/ft-text-vertical-layout-type3-ps2-ref.png b/test/ft-text-vertical-layout-type3.ps2.ref.png
similarity index 100%
rename from test/ft-text-vertical-layout-type3-ps2-ref.png
rename to test/ft-text-vertical-layout-type3.ps2.ref.png
diff --git a/test/ft-text-vertical-layout-type3-ps3-ref.png b/test/ft-text-vertical-layout-type3.ps3.ref.png
similarity index 100%
rename from test/ft-text-vertical-layout-type3-ps3-ref.png
rename to test/ft-text-vertical-layout-type3.ps3.ref.png
diff --git a/test/ft-text-vertical-layout-type3-ref.png b/test/ft-text-vertical-layout-type3.ref.png
similarity index 100%
rename from test/ft-text-vertical-layout-type3-ref.png
rename to test/ft-text-vertical-layout-type3.ref.png
diff --git a/test/ft-text-vertical-layout-type3-svg11-ref.png b/test/ft-text-vertical-layout-type3.svg11.ref.png
similarity index 100%
rename from test/ft-text-vertical-layout-type3-svg11-ref.png
rename to test/ft-text-vertical-layout-type3.svg11.ref.png
diff --git a/test/ft-text-vertical-layout-type3-svg12-ref.png b/test/ft-text-vertical-layout-type3.svg12.ref.png
similarity index 100%
rename from test/ft-text-vertical-layout-type3-svg12-ref.png
rename to test/ft-text-vertical-layout-type3.svg12.ref.png
diff --git a/test/get-group-target-ref.png b/test/get-group-target.ref.png
similarity index 100%
rename from test/get-group-target-ref.png
rename to test/get-group-target.ref.png
diff --git a/test/glitz-surface-source-ref.png b/test/glitz-surface-source.ref.png
similarity index 100%
rename from test/glitz-surface-source-ref.png
rename to test/glitz-surface-source.ref.png
diff --git a/test/glyph-cache-pressure-ps2-ref.png b/test/glyph-cache-pressure.ps2.ref.png
similarity index 100%
rename from test/glyph-cache-pressure-ps2-ref.png
rename to test/glyph-cache-pressure.ps2.ref.png
diff --git a/test/glyph-cache-pressure-ps3-ref.png b/test/glyph-cache-pressure.ps3.ref.png
similarity index 100%
rename from test/glyph-cache-pressure-ps3-ref.png
rename to test/glyph-cache-pressure.ps3.ref.png
diff --git a/test/glyph-cache-pressure-quartz-ref.png b/test/glyph-cache-pressure.quartz.ref.png
similarity index 100%
rename from test/glyph-cache-pressure-quartz-ref.png
rename to test/glyph-cache-pressure.quartz.ref.png
diff --git a/test/glyph-cache-pressure-ref.png b/test/glyph-cache-pressure.ref.png
similarity index 100%
rename from test/glyph-cache-pressure-ref.png
rename to test/glyph-cache-pressure.ref.png
diff --git a/test/gradient-alpha-pdf-argb32-ref.png b/test/gradient-alpha.pdf.argb32.ref.png
similarity index 100%
rename from test/gradient-alpha-pdf-argb32-ref.png
rename to test/gradient-alpha.pdf.argb32.ref.png
diff --git a/test/gradient-alpha-pdf-rgb24-ref.png b/test/gradient-alpha.pdf.rgb24.ref.png
similarity index 100%
rename from test/gradient-alpha-pdf-rgb24-ref.png
rename to test/gradient-alpha.pdf.rgb24.ref.png
diff --git a/test/gradient-alpha-ps2-argb32-ref.png b/test/gradient-alpha.ps2.argb32.ref.png
similarity index 100%
rename from test/gradient-alpha-ps2-argb32-ref.png
rename to test/gradient-alpha.ps2.argb32.ref.png
diff --git a/test/gradient-alpha-ps2-rgb24-ref.png b/test/gradient-alpha.ps2.rgb24.ref.png
similarity index 100%
rename from test/gradient-alpha-ps2-rgb24-ref.png
rename to test/gradient-alpha.ps2.rgb24.ref.png
diff --git a/test/gradient-alpha-ps3-argb32-ref.png b/test/gradient-alpha.ps3.argb32.ref.png
similarity index 100%
rename from test/gradient-alpha-ps3-argb32-ref.png
rename to test/gradient-alpha.ps3.argb32.ref.png
diff --git a/test/gradient-alpha-ps3-rgb24-ref.png b/test/gradient-alpha.ps3.rgb24.ref.png
similarity index 100%
rename from test/gradient-alpha-ps3-rgb24-ref.png
rename to test/gradient-alpha.ps3.rgb24.ref.png
diff --git a/test/gradient-alpha-ref.png b/test/gradient-alpha.ref.png
similarity index 100%
rename from test/gradient-alpha-ref.png
rename to test/gradient-alpha.ref.png
diff --git a/test/gradient-alpha-rgb24-ref.png b/test/gradient-alpha.rgb24.ref.png
similarity index 100%
rename from test/gradient-alpha-rgb24-ref.png
rename to test/gradient-alpha.rgb24.ref.png
diff --git a/test/gradient-constant-alpha-pdf-argb32-ref.png b/test/gradient-constant-alpha.pdf.argb32.ref.png
similarity index 100%
rename from test/gradient-constant-alpha-pdf-argb32-ref.png
rename to test/gradient-constant-alpha.pdf.argb32.ref.png
diff --git a/test/gradient-constant-alpha-pdf-rgb24-ref.png b/test/gradient-constant-alpha.pdf.rgb24.ref.png
similarity index 100%
rename from test/gradient-constant-alpha-pdf-rgb24-ref.png
rename to test/gradient-constant-alpha.pdf.rgb24.ref.png
diff --git a/test/gradient-constant-alpha-ps3-ref.png b/test/gradient-constant-alpha.ps3.ref.png
similarity index 100%
rename from test/gradient-constant-alpha-ps3-ref.png
rename to test/gradient-constant-alpha.ps3.ref.png
diff --git a/test/gradient-constant-alpha-ps3-rgb24-ref.png b/test/gradient-constant-alpha.ps3.rgb24.ref.png
similarity index 100%
rename from test/gradient-constant-alpha-ps3-rgb24-ref.png
rename to test/gradient-constant-alpha.ps3.rgb24.ref.png
diff --git a/test/gradient-constant-alpha-ref.png b/test/gradient-constant-alpha.ref.png
similarity index 100%
rename from test/gradient-constant-alpha-ref.png
rename to test/gradient-constant-alpha.ref.png
diff --git a/test/gradient-constant-alpha-rgb24-ref.png b/test/gradient-constant-alpha.rgb24.ref.png
similarity index 100%
rename from test/gradient-constant-alpha-rgb24-ref.png
rename to test/gradient-constant-alpha.rgb24.ref.png
diff --git a/test/gradient-zero-stops-ref.png b/test/gradient-zero-stops.ref.png
similarity index 100%
rename from test/gradient-zero-stops-ref.png
rename to test/gradient-zero-stops.ref.png
diff --git a/test/gradient-zero-stops-rgb24-ref.png b/test/gradient-zero-stops.rgb24.ref.png
similarity index 100%
rename from test/gradient-zero-stops-rgb24-ref.png
rename to test/gradient-zero-stops.rgb24.ref.png
diff --git a/test/group-paint-ref.png b/test/group-paint.ref.png
similarity index 100%
rename from test/group-paint-ref.png
rename to test/group-paint.ref.png
diff --git a/test/huge-pattern-pdf-ref.png b/test/huge-pattern.pdf.ref.png
similarity index 100%
rename from test/huge-pattern-pdf-ref.png
rename to test/huge-pattern.pdf.ref.png
diff --git a/test/huge-pattern-pdf-rgb24-ref.png b/test/huge-pattern.pdf.rgb24.ref.png
similarity index 100%
rename from test/huge-pattern-pdf-rgb24-ref.png
rename to test/huge-pattern.pdf.rgb24.ref.png
diff --git a/test/huge-pattern-ps3-ref.png b/test/huge-pattern.ps3.ref.png
similarity index 100%
rename from test/huge-pattern-ps3-ref.png
rename to test/huge-pattern.ps3.ref.png
diff --git a/test/huge-pattern-ref.png b/test/huge-pattern.ref.png
similarity index 100%
rename from test/huge-pattern-ref.png
rename to test/huge-pattern.ref.png
diff --git a/test/image-surface-source-ps2-ref.png b/test/image-surface-source.ps2.ref.png
similarity index 100%
rename from test/image-surface-source-ps2-ref.png
rename to test/image-surface-source.ps2.ref.png
diff --git a/test/image-surface-source-ps3-ref.png b/test/image-surface-source.ps3.ref.png
similarity index 100%
rename from test/image-surface-source-ps3-ref.png
rename to test/image-surface-source.ps3.ref.png
diff --git a/test/image-surface-source-ref.png b/test/image-surface-source.ref.png
similarity index 100%
rename from test/image-surface-source-ref.png
rename to test/image-surface-source.ref.png
diff --git a/test/infinite-join-ps2-ref.png b/test/infinite-join.ps2.ref.png
similarity index 100%
rename from test/infinite-join-ps2-ref.png
rename to test/infinite-join.ps2.ref.png
diff --git a/test/infinite-join-ps3-ref.png b/test/infinite-join.ps3.ref.png
similarity index 100%
rename from test/infinite-join-ps3-ref.png
rename to test/infinite-join.ps3.ref.png
diff --git a/test/infinite-join-ref.png b/test/infinite-join.ref.png
similarity index 100%
rename from test/infinite-join-ref.png
rename to test/infinite-join.ref.png
diff --git a/test/large-clip-ref.png b/test/large-clip.ref.png
similarity index 100%
rename from test/large-clip-ref.png
rename to test/large-clip.ref.png
diff --git a/test/large-font-ref.png b/test/large-font.ref.png
similarity index 100%
rename from test/large-font-ref.png
rename to test/large-font.ref.png
diff --git a/test/large-source-ref.png b/test/large-source.ref.png
similarity index 100%
rename from test/large-source-ref.png
rename to test/large-source.ref.png
diff --git a/test/leaky-dash-ps2-argb32-ref.png b/test/leaky-dash.ps2.argb32.ref.png
similarity index 100%
rename from test/leaky-dash-ps2-argb32-ref.png
rename to test/leaky-dash.ps2.argb32.ref.png
diff --git a/test/leaky-dash-ps2-rgb24-ref.png b/test/leaky-dash.ps2.rgb24.ref.png
similarity index 100%
rename from test/leaky-dash-ps2-rgb24-ref.png
rename to test/leaky-dash.ps2.rgb24.ref.png
diff --git a/test/leaky-dash-ps3-argb32-ref.png b/test/leaky-dash.ps3.argb32.ref.png
similarity index 100%
rename from test/leaky-dash-ps3-argb32-ref.png
rename to test/leaky-dash.ps3.argb32.ref.png
diff --git a/test/leaky-dash-ps3-rgb24-ref.png b/test/leaky-dash.ps3.rgb24.ref.png
similarity index 100%
rename from test/leaky-dash-ps3-rgb24-ref.png
rename to test/leaky-dash.ps3.rgb24.ref.png
diff --git a/test/leaky-dash-quartz-ref.png b/test/leaky-dash.quartz.ref.png
similarity index 100%
rename from test/leaky-dash-quartz-ref.png
rename to test/leaky-dash.quartz.ref.png
diff --git a/test/leaky-dash-ref.png b/test/leaky-dash.ref.png
similarity index 100%
rename from test/leaky-dash-ref.png
rename to test/leaky-dash.ref.png
diff --git a/test/leaky-dashed-rectangle-ps2-ref.png b/test/leaky-dashed-rectangle.ps2.ref.png
similarity index 100%
rename from test/leaky-dashed-rectangle-ps2-ref.png
rename to test/leaky-dashed-rectangle.ps2.ref.png
diff --git a/test/leaky-dashed-rectangle-ps3-ref.png b/test/leaky-dashed-rectangle.ps3.ref.png
similarity index 100%
rename from test/leaky-dashed-rectangle-ps3-ref.png
rename to test/leaky-dashed-rectangle.ps3.ref.png
diff --git a/test/leaky-dashed-rectangle-ref.png b/test/leaky-dashed-rectangle.ref.png
similarity index 100%
rename from test/leaky-dashed-rectangle-ref.png
rename to test/leaky-dashed-rectangle.ref.png
diff --git a/test/leaky-dashed-stroke-ps2-ref.png b/test/leaky-dashed-stroke.ps2.ref.png
similarity index 100%
rename from test/leaky-dashed-stroke-ps2-ref.png
rename to test/leaky-dashed-stroke.ps2.ref.png
diff --git a/test/leaky-dashed-stroke-ps3-ref.png b/test/leaky-dashed-stroke.ps3.ref.png
similarity index 100%
rename from test/leaky-dashed-stroke-ps3-ref.png
rename to test/leaky-dashed-stroke.ps3.ref.png
diff --git a/test/leaky-dashed-stroke-ref.png b/test/leaky-dashed-stroke.ref.png
similarity index 100%
rename from test/leaky-dashed-stroke-ref.png
rename to test/leaky-dashed-stroke.ref.png
diff --git a/test/leaky-polygon-ps2-ref.png b/test/leaky-polygon.ps2.ref.png
similarity index 100%
rename from test/leaky-polygon-ps2-ref.png
rename to test/leaky-polygon.ps2.ref.png
diff --git a/test/leaky-polygon-ps3-ref.png b/test/leaky-polygon.ps3.ref.png
similarity index 100%
rename from test/leaky-polygon-ps3-ref.png
rename to test/leaky-polygon.ps3.ref.png
diff --git a/test/leaky-polygon-ref.png b/test/leaky-polygon.ref.png
similarity index 100%
rename from test/leaky-polygon-ref.png
rename to test/leaky-polygon.ref.png
diff --git a/test/line-width-scale-ps2-ref.png b/test/line-width-scale.ps2.ref.png
similarity index 100%
rename from test/line-width-scale-ps2-ref.png
rename to test/line-width-scale.ps2.ref.png
diff --git a/test/line-width-scale-ps3-ref.png b/test/line-width-scale.ps3.ref.png
similarity index 100%
rename from test/line-width-scale-ps3-ref.png
rename to test/line-width-scale.ps3.ref.png
diff --git a/test/line-width-scale-quartz-ref.png b/test/line-width-scale.quartz.ref.png
similarity index 100%
rename from test/line-width-scale-quartz-ref.png
rename to test/line-width-scale.quartz.ref.png
diff --git a/test/line-width-scale-ref.png b/test/line-width-scale.ref.png
similarity index 100%
rename from test/line-width-scale-ref.png
rename to test/line-width-scale.ref.png
diff --git a/test/line-width-ref.png b/test/line-width.ref.png
similarity index 100%
rename from test/line-width-ref.png
rename to test/line-width.ref.png
diff --git a/test/linear-gradient-reflect-pdf-argb32-ref.png b/test/linear-gradient-reflect.pdf.argb32.ref.png
similarity index 100%
rename from test/linear-gradient-reflect-pdf-argb32-ref.png
rename to test/linear-gradient-reflect.pdf.argb32.ref.png
diff --git a/test/linear-gradient-reflect-pdf-rgb24-ref.png b/test/linear-gradient-reflect.pdf.rgb24.ref.png
similarity index 100%
rename from test/linear-gradient-reflect-pdf-rgb24-ref.png
rename to test/linear-gradient-reflect.pdf.rgb24.ref.png
diff --git a/test/linear-gradient-reflect-ps3-ref.png b/test/linear-gradient-reflect.ps3.ref.png
similarity index 100%
rename from test/linear-gradient-reflect-ps3-ref.png
rename to test/linear-gradient-reflect.ps3.ref.png
diff --git a/test/linear-gradient-reflect-quartz-ref.png b/test/linear-gradient-reflect.quartz.ref.png
similarity index 100%
rename from test/linear-gradient-reflect-quartz-ref.png
rename to test/linear-gradient-reflect.quartz.ref.png
diff --git a/test/linear-gradient-reflect-ref.png b/test/linear-gradient-reflect.ref.png
similarity index 100%
rename from test/linear-gradient-reflect-ref.png
rename to test/linear-gradient-reflect.ref.png
diff --git a/test/linear-gradient-pdf-ref.png b/test/linear-gradient.pdf.ref.png
similarity index 100%
rename from test/linear-gradient-pdf-ref.png
rename to test/linear-gradient.pdf.ref.png
diff --git a/test/linear-gradient-ps3-ref.png b/test/linear-gradient.ps3.ref.png
similarity index 100%
rename from test/linear-gradient-ps3-ref.png
rename to test/linear-gradient.ps3.ref.png
diff --git a/test/linear-gradient-quartz-ref.png b/test/linear-gradient.quartz.ref.png
similarity index 100%
rename from test/linear-gradient-quartz-ref.png
rename to test/linear-gradient.quartz.ref.png
diff --git a/test/linear-gradient-ref.png b/test/linear-gradient.ref.png
similarity index 100%
rename from test/linear-gradient-ref.png
rename to test/linear-gradient.ref.png
diff --git a/test/linear-gradient-svg11-ref.png b/test/linear-gradient.svg11.ref.png
similarity index 100%
rename from test/linear-gradient-svg11-ref.png
rename to test/linear-gradient.svg11.ref.png
diff --git a/test/linear-gradient-svg12-ref.png b/test/linear-gradient.svg12.ref.png
similarity index 100%
rename from test/linear-gradient-svg12-ref.png
rename to test/linear-gradient.svg12.ref.png
diff --git a/test/long-dashed-lines-ps2-ref.png b/test/long-dashed-lines.ps2.ref.png
similarity index 100%
rename from test/long-dashed-lines-ps2-ref.png
rename to test/long-dashed-lines.ps2.ref.png
diff --git a/test/long-dashed-lines-ps3-ref.png b/test/long-dashed-lines.ps3.ref.png
similarity index 100%
rename from test/long-dashed-lines-ps3-ref.png
rename to test/long-dashed-lines.ps3.ref.png
diff --git a/test/long-dashed-lines-quartz-ref.png b/test/long-dashed-lines.quartz.ref.png
similarity index 100%
rename from test/long-dashed-lines-quartz-ref.png
rename to test/long-dashed-lines.quartz.ref.png
diff --git a/test/long-dashed-lines-ref.png b/test/long-dashed-lines.ref.png
similarity index 100%
rename from test/long-dashed-lines-ref.png
rename to test/long-dashed-lines.ref.png
diff --git a/test/long-lines-ref.png b/test/long-lines.ref.png
similarity index 100%
rename from test/long-lines-ref.png
rename to test/long-lines.ref.png
diff --git a/test/mask-alpha-quartz-argb32-ref.png b/test/mask-alpha.quartz.argb32.ref.png
similarity index 100%
rename from test/mask-alpha-quartz-argb32-ref.png
rename to test/mask-alpha.quartz.argb32.ref.png
diff --git a/test/mask-alpha-ref.png b/test/mask-alpha.ref.png
similarity index 100%
rename from test/mask-alpha-ref.png
rename to test/mask-alpha.ref.png
diff --git a/test/mask-alpha-rgb24-ref.png b/test/mask-alpha.rgb24.ref.png
similarity index 100%
rename from test/mask-alpha-rgb24-ref.png
rename to test/mask-alpha.rgb24.ref.png
diff --git a/test/mask-alpha-svg11-argb32-ref.png b/test/mask-alpha.svg11.argb32.ref.png
similarity index 100%
rename from test/mask-alpha-svg11-argb32-ref.png
rename to test/mask-alpha.svg11.argb32.ref.png
diff --git a/test/mask-alpha-svg12-argb32-ref.png b/test/mask-alpha.svg12.argb32.ref.png
similarity index 100%
rename from test/mask-alpha-svg12-argb32-ref.png
rename to test/mask-alpha.svg12.argb32.ref.png
diff --git a/test/mask-ctm-ref.png b/test/mask-ctm.ref.png
similarity index 100%
rename from test/mask-ctm-ref.png
rename to test/mask-ctm.ref.png
diff --git a/test/mask-ctm-rgb24-ref.png b/test/mask-ctm.rgb24.ref.png
similarity index 100%
rename from test/mask-ctm-rgb24-ref.png
rename to test/mask-ctm.rgb24.ref.png
diff --git a/test/mask-ctm-svg11-argb32-ref.png b/test/mask-ctm.svg11.argb32.ref.png
similarity index 100%
rename from test/mask-ctm-svg11-argb32-ref.png
rename to test/mask-ctm.svg11.argb32.ref.png
diff --git a/test/mask-ctm-svg12-argb32-ref.png b/test/mask-ctm.svg12.argb32.ref.png
similarity index 100%
rename from test/mask-ctm-svg12-argb32-ref.png
rename to test/mask-ctm.svg12.argb32.ref.png
diff --git a/test/mask-surface-ctm-ref.png b/test/mask-surface-ctm.ref.png
similarity index 100%
rename from test/mask-surface-ctm-ref.png
rename to test/mask-surface-ctm.ref.png
diff --git a/test/mask-surface-ctm-rgb24-ref.png b/test/mask-surface-ctm.rgb24.ref.png
similarity index 100%
rename from test/mask-surface-ctm-rgb24-ref.png
rename to test/mask-surface-ctm.rgb24.ref.png
diff --git a/test/mask-surface-ctm-svg11-argb32-ref.png b/test/mask-surface-ctm.svg11.argb32.ref.png
similarity index 100%
rename from test/mask-surface-ctm-svg11-argb32-ref.png
rename to test/mask-surface-ctm.svg11.argb32.ref.png
diff --git a/test/mask-surface-ctm-svg12-argb32-ref.png b/test/mask-surface-ctm.svg12.argb32.ref.png
similarity index 100%
rename from test/mask-surface-ctm-svg12-argb32-ref.png
rename to test/mask-surface-ctm.svg12.argb32.ref.png
diff --git a/test/mask-transformed-image-ref.png b/test/mask-transformed-image.ref.png
similarity index 100%
rename from test/mask-transformed-image-ref.png
rename to test/mask-transformed-image.ref.png
diff --git a/test/mask-transformed-similar-pdf-ref.png b/test/mask-transformed-similar.pdf.ref.png
similarity index 100%
rename from test/mask-transformed-similar-pdf-ref.png
rename to test/mask-transformed-similar.pdf.ref.png
diff --git a/test/mask-transformed-similar-ref.png b/test/mask-transformed-similar.ref.png
similarity index 100%
rename from test/mask-transformed-similar-ref.png
rename to test/mask-transformed-similar.ref.png
diff --git a/test/mask-transformed-similar-svg11-ref.png b/test/mask-transformed-similar.svg11.ref.png
similarity index 100%
rename from test/mask-transformed-similar-svg11-ref.png
rename to test/mask-transformed-similar.svg11.ref.png
diff --git a/test/mask-transformed-similar-svg12-ref.png b/test/mask-transformed-similar.svg12.ref.png
similarity index 100%
rename from test/mask-transformed-similar-svg12-ref.png
rename to test/mask-transformed-similar.svg12.ref.png
diff --git a/test/mask-pdf-argb32-ref.png b/test/mask.pdf.argb32.ref.png
similarity index 100%
rename from test/mask-pdf-argb32-ref.png
rename to test/mask.pdf.argb32.ref.png
diff --git a/test/mask-pdf-rgb24-ref.png b/test/mask.pdf.rgb24.ref.png
similarity index 100%
rename from test/mask-pdf-rgb24-ref.png
rename to test/mask.pdf.rgb24.ref.png
diff --git a/test/mask-quartz-ref.png b/test/mask.quartz.ref.png
similarity index 100%
rename from test/mask-quartz-ref.png
rename to test/mask.quartz.ref.png
diff --git a/test/mask-quartz-rgb24-ref.png b/test/mask.quartz.rgb24.ref.png
similarity index 100%
rename from test/mask-quartz-rgb24-ref.png
rename to test/mask.quartz.rgb24.ref.png
diff --git a/test/mask-ref.png b/test/mask.ref.png
similarity index 100%
rename from test/mask-ref.png
rename to test/mask.ref.png
diff --git a/test/mask-rgb24-ref.png b/test/mask.rgb24.ref.png
similarity index 100%
rename from test/mask-rgb24-ref.png
rename to test/mask.rgb24.ref.png
diff --git a/test/mask-svg11-argb32-ref.png b/test/mask.svg11.argb32.ref.png
similarity index 100%
rename from test/mask-svg11-argb32-ref.png
rename to test/mask.svg11.argb32.ref.png
diff --git a/test/mask-svg11-rgb24-ref.png b/test/mask.svg11.rgb24.ref.png
similarity index 100%
rename from test/mask-svg11-rgb24-ref.png
rename to test/mask.svg11.rgb24.ref.png
diff --git a/test/mask-svg12-argb32-ref.png b/test/mask.svg12.argb32.ref.png
similarity index 100%
rename from test/mask-svg12-argb32-ref.png
rename to test/mask.svg12.argb32.ref.png
diff --git a/test/mask-svg12-rgb24-ref.png b/test/mask.svg12.rgb24.ref.png
similarity index 100%
rename from test/mask-svg12-rgb24-ref.png
rename to test/mask.svg12.rgb24.ref.png
diff --git a/test/meta-surface-pattern-pdf-ref.png b/test/meta-surface-pattern.pdf.ref.png
similarity index 100%
rename from test/meta-surface-pattern-pdf-ref.png
rename to test/meta-surface-pattern.pdf.ref.png
diff --git a/test/meta-surface-pattern-pdf-rgb24-ref.png b/test/meta-surface-pattern.pdf.rgb24.ref.png
similarity index 100%
rename from test/meta-surface-pattern-pdf-rgb24-ref.png
rename to test/meta-surface-pattern.pdf.rgb24.ref.png
diff --git a/test/meta-surface-pattern-ps2-argb32-ref.png b/test/meta-surface-pattern.ps2.argb32.ref.png
similarity index 100%
rename from test/meta-surface-pattern-ps2-argb32-ref.png
rename to test/meta-surface-pattern.ps2.argb32.ref.png
diff --git a/test/meta-surface-pattern-ps2-rgb24-ref.png b/test/meta-surface-pattern.ps2.rgb24.ref.png
similarity index 100%
rename from test/meta-surface-pattern-ps2-rgb24-ref.png
rename to test/meta-surface-pattern.ps2.rgb24.ref.png
diff --git a/test/meta-surface-pattern-ps3-argb32-ref.png b/test/meta-surface-pattern.ps3.argb32.ref.png
similarity index 100%
rename from test/meta-surface-pattern-ps3-argb32-ref.png
rename to test/meta-surface-pattern.ps3.argb32.ref.png
diff --git a/test/meta-surface-pattern-ps3-rgb24-ref.png b/test/meta-surface-pattern.ps3.rgb24.ref.png
similarity index 100%
rename from test/meta-surface-pattern-ps3-rgb24-ref.png
rename to test/meta-surface-pattern.ps3.rgb24.ref.png
diff --git a/test/meta-surface-pattern-quartz-ref.png b/test/meta-surface-pattern.quartz.ref.png
similarity index 100%
rename from test/meta-surface-pattern-quartz-ref.png
rename to test/meta-surface-pattern.quartz.ref.png
diff --git a/test/meta-surface-pattern-quartz-rgb24-ref.png b/test/meta-surface-pattern.quartz.rgb24.ref.png
similarity index 100%
rename from test/meta-surface-pattern-quartz-rgb24-ref.png
rename to test/meta-surface-pattern.quartz.rgb24.ref.png
diff --git a/test/meta-surface-pattern-ref.png b/test/meta-surface-pattern.ref.png
similarity index 100%
rename from test/meta-surface-pattern-ref.png
rename to test/meta-surface-pattern.ref.png
diff --git a/test/meta-surface-pattern-rgb24-ref.png b/test/meta-surface-pattern.rgb24.ref.png
similarity index 100%
rename from test/meta-surface-pattern-rgb24-ref.png
rename to test/meta-surface-pattern.rgb24.ref.png
diff --git a/test/meta-surface-pattern-svg11-argb32-ref.png b/test/meta-surface-pattern.svg11.argb32.ref.png
similarity index 100%
rename from test/meta-surface-pattern-svg11-argb32-ref.png
rename to test/meta-surface-pattern.svg11.argb32.ref.png
diff --git a/test/meta-surface-pattern-svg11-rgb24-ref.png b/test/meta-surface-pattern.svg11.rgb24.ref.png
similarity index 100%
rename from test/meta-surface-pattern-svg11-rgb24-ref.png
rename to test/meta-surface-pattern.svg11.rgb24.ref.png
diff --git a/test/meta-surface-pattern-svg12-argb32-ref.png b/test/meta-surface-pattern.svg12.argb32.ref.png
similarity index 100%
rename from test/meta-surface-pattern-svg12-argb32-ref.png
rename to test/meta-surface-pattern.svg12.argb32.ref.png
diff --git a/test/meta-surface-pattern-svg12-rgb24-ref.png b/test/meta-surface-pattern.svg12.rgb24.ref.png
similarity index 100%
rename from test/meta-surface-pattern-svg12-rgb24-ref.png
rename to test/meta-surface-pattern.svg12.rgb24.ref.png
diff --git a/test/miter-precision-ps2-ref.png b/test/miter-precision.ps2.ref.png
similarity index 100%
rename from test/miter-precision-ps2-ref.png
rename to test/miter-precision.ps2.ref.png
diff --git a/test/miter-precision-ps3-ref.png b/test/miter-precision.ps3.ref.png
similarity index 100%
rename from test/miter-precision-ps3-ref.png
rename to test/miter-precision.ps3.ref.png
diff --git a/test/miter-precision-ref.png b/test/miter-precision.ref.png
similarity index 100%
rename from test/miter-precision-ref.png
rename to test/miter-precision.ref.png
diff --git a/test/move-to-show-surface-ref.png b/test/move-to-show-surface.ref.png
similarity index 100%
rename from test/move-to-show-surface-ref.png
rename to test/move-to-show-surface.ref.png
diff --git a/test/multi-page.c b/test/multi-page.c
index 89f00c7ab..0b7390268 100644
--- a/test/multi-page.c
+++ b/test/multi-page.c
@@ -142,7 +142,7 @@ preamble (cairo_test_context_t *ctx)
 	if (result == CAIRO_TEST_UNTESTED)
 	    result = CAIRO_TEST_SUCCESS;
 
-	filename = "multi-page-out.ps";
+	filename = "multi-page.out.ps";
 	surface = cairo_ps_surface_create (filename,
 					   WIDTH_IN_POINTS, HEIGHT_IN_POINTS);
 	status = cairo_surface_status (surface);
@@ -165,7 +165,7 @@ preamble (cairo_test_context_t *ctx)
 	if (result == CAIRO_TEST_UNTESTED)
 	    result = CAIRO_TEST_SUCCESS;
 
-	filename = "multi-page-out.pdf";
+	filename = "multi-page.out.pdf";
 	surface = cairo_pdf_surface_create (filename,
 					    WIDTH_IN_POINTS, HEIGHT_IN_POINTS);
 	status = cairo_surface_status (surface);
diff --git a/test/new-sub-path-ps2-argb32-ref.png b/test/new-sub-path.ps2.argb32.ref.png
similarity index 100%
rename from test/new-sub-path-ps2-argb32-ref.png
rename to test/new-sub-path.ps2.argb32.ref.png
diff --git a/test/new-sub-path-ps2-rgb24-ref.png b/test/new-sub-path.ps2.rgb24.ref.png
similarity index 100%
rename from test/new-sub-path-ps2-rgb24-ref.png
rename to test/new-sub-path.ps2.rgb24.ref.png
diff --git a/test/new-sub-path-ps3-argb32-ref.png b/test/new-sub-path.ps3.argb32.ref.png
similarity index 100%
rename from test/new-sub-path-ps3-argb32-ref.png
rename to test/new-sub-path.ps3.argb32.ref.png
diff --git a/test/new-sub-path-ps3-rgb24-ref.png b/test/new-sub-path.ps3.rgb24.ref.png
similarity index 100%
rename from test/new-sub-path-ps3-rgb24-ref.png
rename to test/new-sub-path.ps3.rgb24.ref.png
diff --git a/test/new-sub-path-quartz-ref.png b/test/new-sub-path.quartz.ref.png
similarity index 100%
rename from test/new-sub-path-quartz-ref.png
rename to test/new-sub-path.quartz.ref.png
diff --git a/test/new-sub-path-quartz-rgb24-ref.png b/test/new-sub-path.quartz.rgb24.ref.png
similarity index 100%
rename from test/new-sub-path-quartz-rgb24-ref.png
rename to test/new-sub-path.quartz.rgb24.ref.png
diff --git a/test/new-sub-path-ref.png b/test/new-sub-path.ref.png
similarity index 100%
rename from test/new-sub-path-ref.png
rename to test/new-sub-path.ref.png
diff --git a/test/new-sub-path-rgb24-ref.png b/test/new-sub-path.rgb24.ref.png
similarity index 100%
rename from test/new-sub-path-rgb24-ref.png
rename to test/new-sub-path.rgb24.ref.png
diff --git a/test/nil-surface-ref.png b/test/nil-surface.ref.png
similarity index 100%
rename from test/nil-surface-ref.png
rename to test/nil-surface.ref.png
diff --git a/test/nil-surface-rgb24-ref.png b/test/nil-surface.rgb24.ref.png
similarity index 100%
rename from test/nil-surface-rgb24-ref.png
rename to test/nil-surface.rgb24.ref.png
diff --git a/test/operator-alpha-ref.png b/test/operator-alpha.ref.png
similarity index 100%
rename from test/operator-alpha-ref.png
rename to test/operator-alpha.ref.png
diff --git a/test/operator-alpha-rgb24-ref.png b/test/operator-alpha.rgb24.ref.png
similarity index 100%
rename from test/operator-alpha-rgb24-ref.png
rename to test/operator-alpha.rgb24.ref.png
diff --git a/test/operator-clear-pdf-argb32-ref.png b/test/operator-clear.pdf.argb32.ref.png
similarity index 100%
rename from test/operator-clear-pdf-argb32-ref.png
rename to test/operator-clear.pdf.argb32.ref.png
diff --git a/test/operator-clear-pdf-rgb24-ref.png b/test/operator-clear.pdf.rgb24.ref.png
similarity index 100%
rename from test/operator-clear-pdf-rgb24-ref.png
rename to test/operator-clear.pdf.rgb24.ref.png
diff --git a/test/operator-clear-quartz-ref.png b/test/operator-clear.quartz.ref.png
similarity index 100%
rename from test/operator-clear-quartz-ref.png
rename to test/operator-clear.quartz.ref.png
diff --git a/test/operator-clear-quartz-rgb24-ref.png b/test/operator-clear.quartz.rgb24.ref.png
similarity index 100%
rename from test/operator-clear-quartz-rgb24-ref.png
rename to test/operator-clear.quartz.rgb24.ref.png
diff --git a/test/operator-clear-ref.png b/test/operator-clear.ref.png
similarity index 100%
rename from test/operator-clear-ref.png
rename to test/operator-clear.ref.png
diff --git a/test/operator-clear-rgb24-ref.png b/test/operator-clear.rgb24.ref.png
similarity index 100%
rename from test/operator-clear-rgb24-ref.png
rename to test/operator-clear.rgb24.ref.png
diff --git a/test/operator-source-pdf-argb32-ref.png b/test/operator-source.pdf.argb32.ref.png
similarity index 100%
rename from test/operator-source-pdf-argb32-ref.png
rename to test/operator-source.pdf.argb32.ref.png
diff --git a/test/operator-source-pdf-rgb24-ref.png b/test/operator-source.pdf.rgb24.ref.png
similarity index 100%
rename from test/operator-source-pdf-rgb24-ref.png
rename to test/operator-source.pdf.rgb24.ref.png
diff --git a/test/operator-source-quartz-ref.png b/test/operator-source.quartz.ref.png
similarity index 100%
rename from test/operator-source-quartz-ref.png
rename to test/operator-source.quartz.ref.png
diff --git a/test/operator-source-quartz-rgb24-ref.png b/test/operator-source.quartz.rgb24.ref.png
similarity index 100%
rename from test/operator-source-quartz-rgb24-ref.png
rename to test/operator-source.quartz.rgb24.ref.png
diff --git a/test/operator-source-ref.png b/test/operator-source.ref.png
similarity index 100%
rename from test/operator-source-ref.png
rename to test/operator-source.ref.png
diff --git a/test/operator-source-rgb24-ref.png b/test/operator-source.rgb24.ref.png
similarity index 100%
rename from test/operator-source-rgb24-ref.png
rename to test/operator-source.rgb24.ref.png
diff --git a/test/operator-ref.png b/test/operator.ref.png
similarity index 100%
rename from test/operator-ref.png
rename to test/operator.ref.png
diff --git a/test/operator-rgb24-ref.png b/test/operator.rgb24.ref.png
similarity index 100%
rename from test/operator-rgb24-ref.png
rename to test/operator.rgb24.ref.png
diff --git a/test/over-above-source-ps2-argb32-ref.png b/test/over-above-source.ps2.argb32.ref.png
similarity index 100%
rename from test/over-above-source-ps2-argb32-ref.png
rename to test/over-above-source.ps2.argb32.ref.png
diff --git a/test/over-above-source-ps3-argb32-ref.png b/test/over-above-source.ps3.argb32.ref.png
similarity index 100%
rename from test/over-above-source-ps3-argb32-ref.png
rename to test/over-above-source.ps3.argb32.ref.png
diff --git a/test/over-above-source-quartz-ref.png b/test/over-above-source.quartz.ref.png
similarity index 100%
rename from test/over-above-source-quartz-ref.png
rename to test/over-above-source.quartz.ref.png
diff --git a/test/over-above-source-quartz-rgb24-ref.png b/test/over-above-source.quartz.rgb24.ref.png
similarity index 100%
rename from test/over-above-source-quartz-rgb24-ref.png
rename to test/over-above-source.quartz.rgb24.ref.png
diff --git a/test/over-above-source-ref.png b/test/over-above-source.ref.png
similarity index 100%
rename from test/over-above-source-ref.png
rename to test/over-above-source.ref.png
diff --git a/test/over-above-source-rgb24-ref.png b/test/over-above-source.rgb24.ref.png
similarity index 100%
rename from test/over-above-source-rgb24-ref.png
rename to test/over-above-source.rgb24.ref.png
diff --git a/test/over-around-source-ps2-argb32-ref.png b/test/over-around-source.ps2.argb32.ref.png
similarity index 100%
rename from test/over-around-source-ps2-argb32-ref.png
rename to test/over-around-source.ps2.argb32.ref.png
diff --git a/test/over-around-source-ps2-rgb24-ref.png b/test/over-around-source.ps2.rgb24.ref.png
similarity index 100%
rename from test/over-around-source-ps2-rgb24-ref.png
rename to test/over-around-source.ps2.rgb24.ref.png
diff --git a/test/over-around-source-ps3-argb32-ref.png b/test/over-around-source.ps3.argb32.ref.png
similarity index 100%
rename from test/over-around-source-ps3-argb32-ref.png
rename to test/over-around-source.ps3.argb32.ref.png
diff --git a/test/over-around-source-ps3-rgb24-ref.png b/test/over-around-source.ps3.rgb24.ref.png
similarity index 100%
rename from test/over-around-source-ps3-rgb24-ref.png
rename to test/over-around-source.ps3.rgb24.ref.png
diff --git a/test/over-around-source-quartz-ref.png b/test/over-around-source.quartz.ref.png
similarity index 100%
rename from test/over-around-source-quartz-ref.png
rename to test/over-around-source.quartz.ref.png
diff --git a/test/over-around-source-quartz-rgb24-ref.png b/test/over-around-source.quartz.rgb24.ref.png
similarity index 100%
rename from test/over-around-source-quartz-rgb24-ref.png
rename to test/over-around-source.quartz.rgb24.ref.png
diff --git a/test/over-around-source-ref.png b/test/over-around-source.ref.png
similarity index 100%
rename from test/over-around-source-ref.png
rename to test/over-around-source.ref.png
diff --git a/test/over-around-source-rgb24-ref.png b/test/over-around-source.rgb24.ref.png
similarity index 100%
rename from test/over-around-source-rgb24-ref.png
rename to test/over-around-source.rgb24.ref.png
diff --git a/test/over-below-source-ps2-argb32-ref.png b/test/over-below-source.ps2.argb32.ref.png
similarity index 100%
rename from test/over-below-source-ps2-argb32-ref.png
rename to test/over-below-source.ps2.argb32.ref.png
diff --git a/test/over-below-source-ps3-argb32-ref.png b/test/over-below-source.ps3.argb32.ref.png
similarity index 100%
rename from test/over-below-source-ps3-argb32-ref.png
rename to test/over-below-source.ps3.argb32.ref.png
diff --git a/test/over-below-source-ref.png b/test/over-below-source.ref.png
similarity index 100%
rename from test/over-below-source-ref.png
rename to test/over-below-source.ref.png
diff --git a/test/over-below-source-rgb24-ref.png b/test/over-below-source.rgb24.ref.png
similarity index 100%
rename from test/over-below-source-rgb24-ref.png
rename to test/over-below-source.rgb24.ref.png
diff --git a/test/over-between-source-ps2-argb32-ref.png b/test/over-between-source.ps2.argb32.ref.png
similarity index 100%
rename from test/over-between-source-ps2-argb32-ref.png
rename to test/over-between-source.ps2.argb32.ref.png
diff --git a/test/over-between-source-ps3-argb32-ref.png b/test/over-between-source.ps3.argb32.ref.png
similarity index 100%
rename from test/over-between-source-ps3-argb32-ref.png
rename to test/over-between-source.ps3.argb32.ref.png
diff --git a/test/over-between-source-quartz-ref.png b/test/over-between-source.quartz.ref.png
similarity index 100%
rename from test/over-between-source-quartz-ref.png
rename to test/over-between-source.quartz.ref.png
diff --git a/test/over-between-source-quartz-rgb24-ref.png b/test/over-between-source.quartz.rgb24.ref.png
similarity index 100%
rename from test/over-between-source-quartz-rgb24-ref.png
rename to test/over-between-source.quartz.rgb24.ref.png
diff --git a/test/over-between-source-ref.png b/test/over-between-source.ref.png
similarity index 100%
rename from test/over-between-source-ref.png
rename to test/over-between-source.ref.png
diff --git a/test/over-between-source-rgb24-ref.png b/test/over-between-source.rgb24.ref.png
similarity index 100%
rename from test/over-between-source-rgb24-ref.png
rename to test/over-between-source.rgb24.ref.png
diff --git a/test/paint-repeat-ref.png b/test/paint-repeat.ref.png
similarity index 100%
rename from test/paint-repeat-ref.png
rename to test/paint-repeat.ref.png
diff --git a/test/paint-source-alpha-pdf-argb32-ref.png b/test/paint-source-alpha.pdf.argb32.ref.png
similarity index 100%
rename from test/paint-source-alpha-pdf-argb32-ref.png
rename to test/paint-source-alpha.pdf.argb32.ref.png
diff --git a/test/paint-source-alpha-pdf-ref.png b/test/paint-source-alpha.pdf.ref.png
similarity index 100%
rename from test/paint-source-alpha-pdf-ref.png
rename to test/paint-source-alpha.pdf.ref.png
diff --git a/test/paint-source-alpha-ref.png b/test/paint-source-alpha.ref.png
similarity index 100%
rename from test/paint-source-alpha-ref.png
rename to test/paint-source-alpha.ref.png
diff --git a/test/paint-source-alpha-svg11-ref.png b/test/paint-source-alpha.svg11.ref.png
similarity index 100%
rename from test/paint-source-alpha-svg11-ref.png
rename to test/paint-source-alpha.svg11.ref.png
diff --git a/test/paint-source-alpha-svg12-ref.png b/test/paint-source-alpha.svg12.ref.png
similarity index 100%
rename from test/paint-source-alpha-svg12-ref.png
rename to test/paint-source-alpha.svg12.ref.png
diff --git a/test/paint-with-alpha-pdf-ref.png b/test/paint-with-alpha.pdf.ref.png
similarity index 100%
rename from test/paint-with-alpha-pdf-ref.png
rename to test/paint-with-alpha.pdf.ref.png
diff --git a/test/paint-with-alpha-ref.png b/test/paint-with-alpha.ref.png
similarity index 100%
rename from test/paint-with-alpha-ref.png
rename to test/paint-with-alpha.ref.png
diff --git a/test/paint-with-alpha-svg11-ref.png b/test/paint-with-alpha.svg11.ref.png
similarity index 100%
rename from test/paint-with-alpha-svg11-ref.png
rename to test/paint-with-alpha.svg11.ref.png
diff --git a/test/paint-with-alpha-svg12-ref.png b/test/paint-with-alpha.svg12.ref.png
similarity index 100%
rename from test/paint-with-alpha-svg12-ref.png
rename to test/paint-with-alpha.svg12.ref.png
diff --git a/test/paint-ref.png b/test/paint.ref.png
similarity index 100%
rename from test/paint-ref.png
rename to test/paint.ref.png
diff --git a/test/pass-through-ref.png b/test/pass-through.ref.png
similarity index 100%
rename from test/pass-through-ref.png
rename to test/pass-through.ref.png
diff --git a/test/pass-through-rgb24-ref.png b/test/pass-through.rgb24.ref.png
similarity index 100%
rename from test/pass-through-rgb24-ref.png
rename to test/pass-through.rgb24.ref.png
diff --git a/test/pattern-getters-ref.png b/test/pattern-getters.ref.png
similarity index 100%
rename from test/pattern-getters-ref.png
rename to test/pattern-getters.ref.png
diff --git a/test/pdf-features.c b/test/pdf-features.c
index dbfa33205..cc25fceab 100644
--- a/test/pdf-features.c
+++ b/test/pdf-features.c
@@ -86,7 +86,7 @@ static struct {
 static cairo_test_status_t
 preamble (cairo_test_context_t *ctx)
 {
-    const char *filename = "pdf-features-out.pdf";
+    const char *filename = "pdf-features.out.pdf";
     cairo_surface_t *surface;
     cairo_t *cr;
     cairo_status_t status;
diff --git a/test/pdf-surface-source.c b/test/pdf-surface-source.c
index 23149a962..078af3a15 100644
--- a/test/pdf-surface-source.c
+++ b/test/pdf-surface-source.c
@@ -33,7 +33,7 @@ create_source_surface (int size)
 {
     cairo_surface_t *surface;
 
-    surface = cairo_pdf_surface_create ("pdf-surface-source-out.pdf", size, size);
+    surface = cairo_pdf_surface_create ("pdf-surface-source.out.pdf", size, size);
     cairo_surface_set_fallback_resolution (surface, 72., 72.);
 
     return surface;
diff --git a/test/pdf-surface-source-ref.png b/test/pdf-surface-source.ref.png
similarity index 100%
rename from test/pdf-surface-source-ref.png
rename to test/pdf-surface-source.ref.png
diff --git a/test/pixman-rotate-ref.png b/test/pixman-rotate.ref.png
similarity index 100%
rename from test/pixman-rotate-ref.png
rename to test/pixman-rotate.ref.png
diff --git a/test/pixman-rotate-rgb24-ref.png b/test/pixman-rotate.rgb24.ref.png
similarity index 100%
rename from test/pixman-rotate-rgb24-ref.png
rename to test/pixman-rotate.rgb24.ref.png
diff --git a/test/png.c b/test/png.c
index 0a375cb7d..fb50a9b55 100644
--- a/test/png.c
+++ b/test/png.c
@@ -74,7 +74,7 @@ print_surface (const cairo_test_context_t *ctx, cairo_surface_t *surface)
 static cairo_test_status_t
 preamble (cairo_test_context_t *ctx)
 {
-    const char *filename = "png-out.png";
+    const char *filename = "png.out.png";
     cairo_surface_t *surface0, *surface1;
     cairo_status_t status;
     uint32_t argb32 = 0xdeadbede;
diff --git a/test/ps-features.c b/test/ps-features.c
index 80088ffcc..72fd21ab0 100644
--- a/test/ps-features.c
+++ b/test/ps-features.c
@@ -102,7 +102,7 @@ preamble (cairo_test_context_t *ctx)
 	return CAIRO_TEST_UNTESTED;
     }
 
-    filename = "ps-features-out.ps";
+    filename = "ps-features.out.ps";
 
     /* We demonstrate that the initial size doesn't matter (we're
      * passing 0,0), if we use cairo_ps_surface_set_size on the first
diff --git a/test/ps-surface-source.c b/test/ps-surface-source.c
index 41016f4e3..37f57eef9 100644
--- a/test/ps-surface-source.c
+++ b/test/ps-surface-source.c
@@ -33,7 +33,7 @@ create_source_surface (int size)
 {
     cairo_surface_t *surface;
 
-    surface = cairo_ps_surface_create ("ps-surface-source-out.ps", size, size);
+    surface = cairo_ps_surface_create ("ps-surface-source.out.ps", size, size);
     cairo_surface_set_fallback_resolution (surface, 72., 72.);
 
     return surface;
diff --git a/test/ps-surface-source-ref.png b/test/ps-surface-source.ref.png
similarity index 100%
rename from test/ps-surface-source-ref.png
rename to test/ps-surface-source.ref.png
diff --git a/test/push-group-pdf-ref.png b/test/push-group.pdf.ref.png
similarity index 100%
rename from test/push-group-pdf-ref.png
rename to test/push-group.pdf.ref.png
diff --git a/test/push-group-pdf-rgb24-ref.png b/test/push-group.pdf.rgb24.ref.png
similarity index 100%
rename from test/push-group-pdf-rgb24-ref.png
rename to test/push-group.pdf.rgb24.ref.png
diff --git a/test/push-group-ref.png b/test/push-group.ref.png
similarity index 100%
rename from test/push-group-ref.png
rename to test/push-group.ref.png
diff --git a/test/push-group-rgb24-ref.png b/test/push-group.rgb24.ref.png
similarity index 100%
rename from test/push-group-rgb24-ref.png
rename to test/push-group.rgb24.ref.png
diff --git a/test/push-group-svg11-argb32-ref.png b/test/push-group.svg11.argb32.ref.png
similarity index 100%
rename from test/push-group-svg11-argb32-ref.png
rename to test/push-group.svg11.argb32.ref.png
diff --git a/test/push-group-svg12-argb32-ref.png b/test/push-group.svg12.argb32.ref.png
similarity index 100%
rename from test/push-group-svg12-argb32-ref.png
rename to test/push-group.svg12.argb32.ref.png
diff --git a/test/radial-gradient-pdf-ref.png b/test/radial-gradient.pdf.ref.png
similarity index 100%
rename from test/radial-gradient-pdf-ref.png
rename to test/radial-gradient.pdf.ref.png
diff --git a/test/radial-gradient-quartz-ref.png b/test/radial-gradient.quartz.ref.png
similarity index 100%
rename from test/radial-gradient-quartz-ref.png
rename to test/radial-gradient.quartz.ref.png
diff --git a/test/radial-gradient-ref.png b/test/radial-gradient.ref.png
similarity index 100%
rename from test/radial-gradient-ref.png
rename to test/radial-gradient.ref.png
diff --git a/test/radial-gradient-svg11-ref.png b/test/radial-gradient.svg11.ref.png
similarity index 100%
rename from test/radial-gradient-svg11-ref.png
rename to test/radial-gradient.svg11.ref.png
diff --git a/test/radial-gradient-svg12-ref.png b/test/radial-gradient.svg12.ref.png
similarity index 100%
rename from test/radial-gradient-svg12-ref.png
rename to test/radial-gradient.svg12.ref.png
diff --git a/test/random-intersections-ps2-ref.png b/test/random-intersections.ps2.ref.png
similarity index 100%
rename from test/random-intersections-ps2-ref.png
rename to test/random-intersections.ps2.ref.png
diff --git a/test/random-intersections-ps3-ref.png b/test/random-intersections.ps3.ref.png
similarity index 100%
rename from test/random-intersections-ps3-ref.png
rename to test/random-intersections.ps3.ref.png
diff --git a/test/random-intersections-quartz-ref.png b/test/random-intersections.quartz.ref.png
similarity index 100%
rename from test/random-intersections-quartz-ref.png
rename to test/random-intersections.quartz.ref.png
diff --git a/test/random-intersections-ref.png b/test/random-intersections.ref.png
similarity index 100%
rename from test/random-intersections-ref.png
rename to test/random-intersections.ref.png
diff --git a/test/rectangle-rounding-error-ref.png b/test/rectangle-rounding-error.ref.png
similarity index 100%
rename from test/rectangle-rounding-error-ref.png
rename to test/rectangle-rounding-error.ref.png
diff --git a/test/rectilinear-fill-ref.png b/test/rectilinear-fill.ref.png
similarity index 100%
rename from test/rectilinear-fill-ref.png
rename to test/rectilinear-fill.ref.png
diff --git a/test/rectilinear-miter-limit-ps2-ref.png b/test/rectilinear-miter-limit.ps2.ref.png
similarity index 100%
rename from test/rectilinear-miter-limit-ps2-ref.png
rename to test/rectilinear-miter-limit.ps2.ref.png
diff --git a/test/rectilinear-miter-limit-ps3-ref.png b/test/rectilinear-miter-limit.ps3.ref.png
similarity index 100%
rename from test/rectilinear-miter-limit-ps3-ref.png
rename to test/rectilinear-miter-limit.ps3.ref.png
diff --git a/test/rectilinear-miter-limit-ref.png b/test/rectilinear-miter-limit.ref.png
similarity index 100%
rename from test/rectilinear-miter-limit-ref.png
rename to test/rectilinear-miter-limit.ref.png
diff --git a/test/rectilinear-stroke-ref.png b/test/rectilinear-stroke.ref.png
similarity index 100%
rename from test/rectilinear-stroke-ref.png
rename to test/rectilinear-stroke.ref.png
diff --git a/test/reflected-stroke-ps2-ref.png b/test/reflected-stroke.ps2.ref.png
similarity index 100%
rename from test/reflected-stroke-ps2-ref.png
rename to test/reflected-stroke.ps2.ref.png
diff --git a/test/reflected-stroke-ps3-ref.png b/test/reflected-stroke.ps3.ref.png
similarity index 100%
rename from test/reflected-stroke-ps3-ref.png
rename to test/reflected-stroke.ps3.ref.png
diff --git a/test/reflected-stroke-quartz-ref.png b/test/reflected-stroke.quartz.ref.png
similarity index 100%
rename from test/reflected-stroke-quartz-ref.png
rename to test/reflected-stroke.quartz.ref.png
diff --git a/test/reflected-stroke-ref.png b/test/reflected-stroke.ref.png
similarity index 100%
rename from test/reflected-stroke-ref.png
rename to test/reflected-stroke.ref.png
diff --git a/test/rel-path-ps2-rgb24-ref.png b/test/rel-path.ps2.rgb24.ref.png
similarity index 100%
rename from test/rel-path-ps2-rgb24-ref.png
rename to test/rel-path.ps2.rgb24.ref.png
diff --git a/test/rel-path-ps3-rgb24-ref.png b/test/rel-path.ps3.rgb24.ref.png
similarity index 100%
rename from test/rel-path-ps3-rgb24-ref.png
rename to test/rel-path.ps3.rgb24.ref.png
diff --git a/test/rel-path-quartz-ref.png b/test/rel-path.quartz.ref.png
similarity index 100%
rename from test/rel-path-quartz-ref.png
rename to test/rel-path.quartz.ref.png
diff --git a/test/rel-path-quartz-rgb24-ref.png b/test/rel-path.quartz.rgb24.ref.png
similarity index 100%
rename from test/rel-path-quartz-rgb24-ref.png
rename to test/rel-path.quartz.rgb24.ref.png
diff --git a/test/rel-path-ref.png b/test/rel-path.ref.png
similarity index 100%
rename from test/rel-path-ref.png
rename to test/rel-path.ref.png
diff --git a/test/rel-path-rgb24-ref.png b/test/rel-path.rgb24.ref.png
similarity index 100%
rename from test/rel-path-rgb24-ref.png
rename to test/rel-path.rgb24.ref.png
diff --git a/test/rgb24-ignore-alpha-ref.png b/test/rgb24-ignore-alpha.ref.png
similarity index 100%
rename from test/rgb24-ignore-alpha-ref.png
rename to test/rgb24-ignore-alpha.ref.png
diff --git a/test/rotate-image-surface-paint-pdf-argb32-ref.png b/test/rotate-image-surface-paint.pdf.argb32.ref.png
similarity index 100%
rename from test/rotate-image-surface-paint-pdf-argb32-ref.png
rename to test/rotate-image-surface-paint.pdf.argb32.ref.png
diff --git a/test/rotate-image-surface-paint-pdf-rgb24-ref.png b/test/rotate-image-surface-paint.pdf.rgb24.ref.png
similarity index 100%
rename from test/rotate-image-surface-paint-pdf-rgb24-ref.png
rename to test/rotate-image-surface-paint.pdf.rgb24.ref.png
diff --git a/test/rotate-image-surface-paint-ps2-ref.png b/test/rotate-image-surface-paint.ps2.ref.png
similarity index 100%
rename from test/rotate-image-surface-paint-ps2-ref.png
rename to test/rotate-image-surface-paint.ps2.ref.png
diff --git a/test/rotate-image-surface-paint-ps3-ref.png b/test/rotate-image-surface-paint.ps3.ref.png
similarity index 100%
rename from test/rotate-image-surface-paint-ps3-ref.png
rename to test/rotate-image-surface-paint.ps3.ref.png
diff --git a/test/rotate-image-surface-paint-quartz-ref.png b/test/rotate-image-surface-paint.quartz.ref.png
similarity index 100%
rename from test/rotate-image-surface-paint-quartz-ref.png
rename to test/rotate-image-surface-paint.quartz.ref.png
diff --git a/test/rotate-image-surface-paint-ref.png b/test/rotate-image-surface-paint.ref.png
similarity index 100%
rename from test/rotate-image-surface-paint-ref.png
rename to test/rotate-image-surface-paint.ref.png
diff --git a/test/rotate-image-surface-paint-svg11-ref.png b/test/rotate-image-surface-paint.svg11.ref.png
similarity index 100%
rename from test/rotate-image-surface-paint-svg11-ref.png
rename to test/rotate-image-surface-paint.svg11.ref.png
diff --git a/test/rotate-image-surface-paint-svg12-ref.png b/test/rotate-image-surface-paint.svg12.ref.png
similarity index 100%
rename from test/rotate-image-surface-paint-svg12-ref.png
rename to test/rotate-image-surface-paint.svg12.ref.png
diff --git a/test/scale-down-source-surface-paint-ref.png b/test/scale-down-source-surface-paint.ref.png
similarity index 100%
rename from test/scale-down-source-surface-paint-ref.png
rename to test/scale-down-source-surface-paint.ref.png
diff --git a/test/scale-source-surface-paint-pdf-argb32-ref.png b/test/scale-source-surface-paint.pdf.argb32.ref.png
similarity index 100%
rename from test/scale-source-surface-paint-pdf-argb32-ref.png
rename to test/scale-source-surface-paint.pdf.argb32.ref.png
diff --git a/test/scale-source-surface-paint-pdf-rgb24-ref.png b/test/scale-source-surface-paint.pdf.rgb24.ref.png
similarity index 100%
rename from test/scale-source-surface-paint-pdf-rgb24-ref.png
rename to test/scale-source-surface-paint.pdf.rgb24.ref.png
diff --git a/test/scale-source-surface-paint-ref.png b/test/scale-source-surface-paint.ref.png
similarity index 100%
rename from test/scale-source-surface-paint-ref.png
rename to test/scale-source-surface-paint.ref.png
diff --git a/test/scale-source-surface-paint-rgb24-ref.png b/test/scale-source-surface-paint.rgb24.ref.png
similarity index 100%
rename from test/scale-source-surface-paint-rgb24-ref.png
rename to test/scale-source-surface-paint.rgb24.ref.png
diff --git a/test/scale-source-surface-paint-svg11-argb32-ref.png b/test/scale-source-surface-paint.svg11.argb32.ref.png
similarity index 100%
rename from test/scale-source-surface-paint-svg11-argb32-ref.png
rename to test/scale-source-surface-paint.svg11.argb32.ref.png
diff --git a/test/scale-source-surface-paint-svg11-rgb24-ref.png b/test/scale-source-surface-paint.svg11.rgb24.ref.png
similarity index 100%
rename from test/scale-source-surface-paint-svg11-rgb24-ref.png
rename to test/scale-source-surface-paint.svg11.rgb24.ref.png
diff --git a/test/scale-source-surface-paint-svg12-argb32-ref.png b/test/scale-source-surface-paint.svg12.argb32.ref.png
similarity index 100%
rename from test/scale-source-surface-paint-svg12-argb32-ref.png
rename to test/scale-source-surface-paint.svg12.argb32.ref.png
diff --git a/test/scale-source-surface-paint-svg12-rgb24-ref.png b/test/scale-source-surface-paint.svg12.rgb24.ref.png
similarity index 100%
rename from test/scale-source-surface-paint-svg12-rgb24-ref.png
rename to test/scale-source-surface-paint.svg12.rgb24.ref.png
diff --git a/test/select-font-face-ps2-ref.png b/test/select-font-face.ps2.ref.png
similarity index 100%
rename from test/select-font-face-ps2-ref.png
rename to test/select-font-face.ps2.ref.png
diff --git a/test/select-font-face-ps3-ref.png b/test/select-font-face.ps3.ref.png
similarity index 100%
rename from test/select-font-face-ps3-ref.png
rename to test/select-font-face.ps3.ref.png
diff --git a/test/select-font-face-quartz-ref.png b/test/select-font-face.quartz.ref.png
similarity index 100%
rename from test/select-font-face-quartz-ref.png
rename to test/select-font-face.quartz.ref.png
diff --git a/test/select-font-face-ref.png b/test/select-font-face.ref.png
similarity index 100%
rename from test/select-font-face-ref.png
rename to test/select-font-face.ref.png
diff --git a/test/self-copy-overlap-ref.png b/test/self-copy-overlap.ref.png
similarity index 100%
rename from test/self-copy-overlap-ref.png
rename to test/self-copy-overlap.ref.png
diff --git a/test/self-copy-overlap-rgb24-ref.png b/test/self-copy-overlap.rgb24.ref.png
similarity index 100%
rename from test/self-copy-overlap-rgb24-ref.png
rename to test/self-copy-overlap.rgb24.ref.png
diff --git a/test/self-copy-ps2-ref.png b/test/self-copy.ps2.ref.png
similarity index 100%
rename from test/self-copy-ps2-ref.png
rename to test/self-copy.ps2.ref.png
diff --git a/test/self-copy-ps3-ref.png b/test/self-copy.ps3.ref.png
similarity index 100%
rename from test/self-copy-ps3-ref.png
rename to test/self-copy.ps3.ref.png
diff --git a/test/self-copy-ref.png b/test/self-copy.ref.png
similarity index 100%
rename from test/self-copy-ref.png
rename to test/self-copy.ref.png
diff --git a/test/self-intersecting-ref.png b/test/self-intersecting.ref.png
similarity index 100%
rename from test/self-intersecting-ref.png
rename to test/self-intersecting.ref.png
diff --git a/test/self-intersecting-rgb24-ref.png b/test/self-intersecting.rgb24.ref.png
similarity index 100%
rename from test/self-intersecting-rgb24-ref.png
rename to test/self-intersecting.rgb24.ref.png
diff --git a/test/set-source-ref.png b/test/set-source.ref.png
similarity index 100%
rename from test/set-source-ref.png
rename to test/set-source.ref.png
diff --git a/test/set-source-rgb24-ref.png b/test/set-source.rgb24.ref.png
similarity index 100%
rename from test/set-source-rgb24-ref.png
rename to test/set-source.rgb24.ref.png
diff --git a/test/set-source-svg11-argb32-ref.png b/test/set-source.svg11.argb32.ref.png
similarity index 100%
rename from test/set-source-svg11-argb32-ref.png
rename to test/set-source.svg11.argb32.ref.png
diff --git a/test/set-source-svg12-argb32-ref.png b/test/set-source.svg12.argb32.ref.png
similarity index 100%
rename from test/set-source-svg12-argb32-ref.png
rename to test/set-source.svg12.argb32.ref.png
diff --git a/test/show-glyphs-many-ref.png b/test/show-glyphs-many.ref.png
similarity index 100%
rename from test/show-glyphs-many-ref.png
rename to test/show-glyphs-many.ref.png
diff --git a/test/show-text-current-point-ps2-ref.png b/test/show-text-current-point.ps2.ref.png
similarity index 100%
rename from test/show-text-current-point-ps2-ref.png
rename to test/show-text-current-point.ps2.ref.png
diff --git a/test/show-text-current-point-ps3-ref.png b/test/show-text-current-point.ps3.ref.png
similarity index 100%
rename from test/show-text-current-point-ps3-ref.png
rename to test/show-text-current-point.ps3.ref.png
diff --git a/test/show-text-current-point-quartz-ref.png b/test/show-text-current-point.quartz.ref.png
similarity index 100%
rename from test/show-text-current-point-quartz-ref.png
rename to test/show-text-current-point.quartz.ref.png
diff --git a/test/show-text-current-point-ref.png b/test/show-text-current-point.ref.png
similarity index 100%
rename from test/show-text-current-point-ref.png
rename to test/show-text-current-point.ref.png
diff --git a/test/skew-extreme-ps2-ref.png b/test/skew-extreme.ps2.ref.png
similarity index 100%
rename from test/skew-extreme-ps2-ref.png
rename to test/skew-extreme.ps2.ref.png
diff --git a/test/skew-extreme-ps3-ref.png b/test/skew-extreme.ps3.ref.png
similarity index 100%
rename from test/skew-extreme-ps3-ref.png
rename to test/skew-extreme.ps3.ref.png
diff --git a/test/skew-extreme-ref.png b/test/skew-extreme.ref.png
similarity index 100%
rename from test/skew-extreme-ref.png
rename to test/skew-extreme.ref.png
diff --git a/test/smask-fill-pdf-ref.png b/test/smask-fill.pdf.ref.png
similarity index 100%
rename from test/smask-fill-pdf-ref.png
rename to test/smask-fill.pdf.ref.png
diff --git a/test/smask-fill-ref.png b/test/smask-fill.ref.png
similarity index 100%
rename from test/smask-fill-ref.png
rename to test/smask-fill.ref.png
diff --git a/test/smask-fill-svg11-ref.png b/test/smask-fill.svg11.ref.png
similarity index 100%
rename from test/smask-fill-svg11-ref.png
rename to test/smask-fill.svg11.ref.png
diff --git a/test/smask-fill-svg12-ref.png b/test/smask-fill.svg12.ref.png
similarity index 100%
rename from test/smask-fill-svg12-ref.png
rename to test/smask-fill.svg12.ref.png
diff --git a/test/smask-image-mask-pdf-ref.png b/test/smask-image-mask.pdf.ref.png
similarity index 100%
rename from test/smask-image-mask-pdf-ref.png
rename to test/smask-image-mask.pdf.ref.png
diff --git a/test/smask-image-mask-ref.png b/test/smask-image-mask.ref.png
similarity index 100%
rename from test/smask-image-mask-ref.png
rename to test/smask-image-mask.ref.png
diff --git a/test/smask-mask-pdf-ref.png b/test/smask-mask.pdf.ref.png
similarity index 100%
rename from test/smask-mask-pdf-ref.png
rename to test/smask-mask.pdf.ref.png
diff --git a/test/smask-mask-ref.png b/test/smask-mask.ref.png
similarity index 100%
rename from test/smask-mask-ref.png
rename to test/smask-mask.ref.png
diff --git a/test/smask-mask-svg11-ref.png b/test/smask-mask.svg11.ref.png
similarity index 100%
rename from test/smask-mask-svg11-ref.png
rename to test/smask-mask.svg11.ref.png
diff --git a/test/smask-mask-svg12-ref.png b/test/smask-mask.svg12.ref.png
similarity index 100%
rename from test/smask-mask-svg12-ref.png
rename to test/smask-mask.svg12.ref.png
diff --git a/test/smask-paint-pdf-ref.png b/test/smask-paint.pdf.ref.png
similarity index 100%
rename from test/smask-paint-pdf-ref.png
rename to test/smask-paint.pdf.ref.png
diff --git a/test/smask-paint-ref.png b/test/smask-paint.ref.png
similarity index 100%
rename from test/smask-paint-ref.png
rename to test/smask-paint.ref.png
diff --git a/test/smask-paint-svg11-ref.png b/test/smask-paint.svg11.ref.png
similarity index 100%
rename from test/smask-paint-svg11-ref.png
rename to test/smask-paint.svg11.ref.png
diff --git a/test/smask-paint-svg12-ref.png b/test/smask-paint.svg12.ref.png
similarity index 100%
rename from test/smask-paint-svg12-ref.png
rename to test/smask-paint.svg12.ref.png
diff --git a/test/smask-stroke-pdf-ref.png b/test/smask-stroke.pdf.ref.png
similarity index 100%
rename from test/smask-stroke-pdf-ref.png
rename to test/smask-stroke.pdf.ref.png
diff --git a/test/smask-stroke-ref.png b/test/smask-stroke.ref.png
similarity index 100%
rename from test/smask-stroke-ref.png
rename to test/smask-stroke.ref.png
diff --git a/test/smask-text-pdf-ref.png b/test/smask-text.pdf.ref.png
similarity index 100%
rename from test/smask-text-pdf-ref.png
rename to test/smask-text.pdf.ref.png
diff --git a/test/smask-text-ps2-ref.png b/test/smask-text.ps2.ref.png
similarity index 100%
rename from test/smask-text-ps2-ref.png
rename to test/smask-text.ps2.ref.png
diff --git a/test/smask-text-ps3-ref.png b/test/smask-text.ps3.ref.png
similarity index 100%
rename from test/smask-text-ps3-ref.png
rename to test/smask-text.ps3.ref.png
diff --git a/test/smask-text-ref.png b/test/smask-text.ref.png
similarity index 100%
rename from test/smask-text-ref.png
rename to test/smask-text.ref.png
diff --git a/test/smask-text-svg11-ref.png b/test/smask-text.svg11.ref.png
similarity index 100%
rename from test/smask-text-svg11-ref.png
rename to test/smask-text.svg11.ref.png
diff --git a/test/smask-text-svg12-ref.png b/test/smask-text.svg12.ref.png
similarity index 100%
rename from test/smask-text-svg12-ref.png
rename to test/smask-text.svg12.ref.png
diff --git a/test/smask-pdf-ref.png b/test/smask.pdf.ref.png
similarity index 100%
rename from test/smask-pdf-ref.png
rename to test/smask.pdf.ref.png
diff --git a/test/smask-ps2-ref.png b/test/smask.ps2.ref.png
similarity index 100%
rename from test/smask-ps2-ref.png
rename to test/smask.ps2.ref.png
diff --git a/test/smask-ps3-ref.png b/test/smask.ps3.ref.png
similarity index 100%
rename from test/smask-ps3-ref.png
rename to test/smask.ps3.ref.png
diff --git a/test/smask-ref.png b/test/smask.ref.png
similarity index 100%
rename from test/smask-ref.png
rename to test/smask.ref.png
diff --git a/test/smask-svg11-ref.png b/test/smask.svg11.ref.png
similarity index 100%
rename from test/smask-svg11-ref.png
rename to test/smask.svg11.ref.png
diff --git a/test/smask-svg12-ref.png b/test/smask.svg12.ref.png
similarity index 100%
rename from test/smask-svg12-ref.png
rename to test/smask.svg12.ref.png
diff --git a/test/solid-pattern-cache-stress-ref.png b/test/solid-pattern-cache-stress.ref.png
similarity index 100%
rename from test/solid-pattern-cache-stress-ref.png
rename to test/solid-pattern-cache-stress.ref.png
diff --git a/test/source-clip-scale-pdf-ref.png b/test/source-clip-scale.pdf.ref.png
similarity index 100%
rename from test/source-clip-scale-pdf-ref.png
rename to test/source-clip-scale.pdf.ref.png
diff --git a/test/source-clip-scale-ps2-argb32-ref.png b/test/source-clip-scale.ps2.argb32.ref.png
similarity index 100%
rename from test/source-clip-scale-ps2-argb32-ref.png
rename to test/source-clip-scale.ps2.argb32.ref.png
diff --git a/test/source-clip-scale-ps2-rgb24-ref.png b/test/source-clip-scale.ps2.rgb24.ref.png
similarity index 100%
rename from test/source-clip-scale-ps2-rgb24-ref.png
rename to test/source-clip-scale.ps2.rgb24.ref.png
diff --git a/test/source-clip-scale-ps3-argb32-ref.png b/test/source-clip-scale.ps3.argb32.ref.png
similarity index 100%
rename from test/source-clip-scale-ps3-argb32-ref.png
rename to test/source-clip-scale.ps3.argb32.ref.png
diff --git a/test/source-clip-scale-ps3-rgb24-ref.png b/test/source-clip-scale.ps3.rgb24.ref.png
similarity index 100%
rename from test/source-clip-scale-ps3-rgb24-ref.png
rename to test/source-clip-scale.ps3.rgb24.ref.png
diff --git a/test/source-clip-scale-quartz-ref.png b/test/source-clip-scale.quartz.ref.png
similarity index 100%
rename from test/source-clip-scale-quartz-ref.png
rename to test/source-clip-scale.quartz.ref.png
diff --git a/test/source-clip-scale-ref.png b/test/source-clip-scale.ref.png
similarity index 100%
rename from test/source-clip-scale-ref.png
rename to test/source-clip-scale.ref.png
diff --git a/test/source-clip-scale-svg11-ref.png b/test/source-clip-scale.svg11.ref.png
similarity index 100%
rename from test/source-clip-scale-svg11-ref.png
rename to test/source-clip-scale.svg11.ref.png
diff --git a/test/source-clip-scale-svg12-ref.png b/test/source-clip-scale.svg12.ref.png
similarity index 100%
rename from test/source-clip-scale-svg12-ref.png
rename to test/source-clip-scale.svg12.ref.png
diff --git a/test/source-clip-ref.png b/test/source-clip.ref.png
similarity index 100%
rename from test/source-clip-ref.png
rename to test/source-clip.ref.png
diff --git a/test/source-surface-scale-paint-ref.png b/test/source-surface-scale-paint.ref.png
similarity index 100%
rename from test/source-surface-scale-paint-ref.png
rename to test/source-surface-scale-paint.ref.png
diff --git a/test/source-surface-scale-paint-rgb24-ref.png b/test/source-surface-scale-paint.rgb24.ref.png
similarity index 100%
rename from test/source-surface-scale-paint-rgb24-ref.png
rename to test/source-surface-scale-paint.rgb24.ref.png
diff --git a/test/spline-decomposition-pdf-ref.png b/test/spline-decomposition.pdf.ref.png
similarity index 100%
rename from test/spline-decomposition-pdf-ref.png
rename to test/spline-decomposition.pdf.ref.png
diff --git a/test/spline-decomposition-ps2-ref.png b/test/spline-decomposition.ps2.ref.png
similarity index 100%
rename from test/spline-decomposition-ps2-ref.png
rename to test/spline-decomposition.ps2.ref.png
diff --git a/test/spline-decomposition-ps3-ref.png b/test/spline-decomposition.ps3.ref.png
similarity index 100%
rename from test/spline-decomposition-ps3-ref.png
rename to test/spline-decomposition.ps3.ref.png
diff --git a/test/spline-decomposition-ref.png b/test/spline-decomposition.ref.png
similarity index 100%
rename from test/spline-decomposition-ref.png
rename to test/spline-decomposition.ref.png
diff --git a/test/spline-decomposition-svg11-ref.png b/test/spline-decomposition.svg11.ref.png
similarity index 100%
rename from test/spline-decomposition-svg11-ref.png
rename to test/spline-decomposition.svg11.ref.png
diff --git a/test/spline-decomposition-svg12-ref.png b/test/spline-decomposition.svg12.ref.png
similarity index 100%
rename from test/spline-decomposition-svg12-ref.png
rename to test/spline-decomposition.svg12.ref.png
diff --git a/test/stroke-ctm-caps-ps2-ref.png b/test/stroke-ctm-caps.ps2.ref.png
similarity index 100%
rename from test/stroke-ctm-caps-ps2-ref.png
rename to test/stroke-ctm-caps.ps2.ref.png
diff --git a/test/stroke-ctm-caps-ps3-ref.png b/test/stroke-ctm-caps.ps3.ref.png
similarity index 100%
rename from test/stroke-ctm-caps-ps3-ref.png
rename to test/stroke-ctm-caps.ps3.ref.png
diff --git a/test/stroke-ctm-caps-quartz-ref.png b/test/stroke-ctm-caps.quartz.ref.png
similarity index 100%
rename from test/stroke-ctm-caps-quartz-ref.png
rename to test/stroke-ctm-caps.quartz.ref.png
diff --git a/test/stroke-ctm-caps-ref.png b/test/stroke-ctm-caps.ref.png
similarity index 100%
rename from test/stroke-ctm-caps-ref.png
rename to test/stroke-ctm-caps.ref.png
diff --git a/test/stroke-image-pdf-ref.png b/test/stroke-image.pdf.ref.png
similarity index 100%
rename from test/stroke-image-pdf-ref.png
rename to test/stroke-image.pdf.ref.png
diff --git a/test/stroke-image-ps2-ref.png b/test/stroke-image.ps2.ref.png
similarity index 100%
rename from test/stroke-image-ps2-ref.png
rename to test/stroke-image.ps2.ref.png
diff --git a/test/stroke-image-ps3-ref.png b/test/stroke-image.ps3.ref.png
similarity index 100%
rename from test/stroke-image-ps3-ref.png
rename to test/stroke-image.ps3.ref.png
diff --git a/test/stroke-image-quartz-ref.png b/test/stroke-image.quartz.ref.png
similarity index 100%
rename from test/stroke-image-quartz-ref.png
rename to test/stroke-image.quartz.ref.png
diff --git a/test/stroke-image-ref.png b/test/stroke-image.ref.png
similarity index 100%
rename from test/stroke-image-ref.png
rename to test/stroke-image.ref.png
diff --git a/test/surface-pattern-big-scale-down-ref.png b/test/surface-pattern-big-scale-down.ref.png
similarity index 100%
rename from test/surface-pattern-big-scale-down-ref.png
rename to test/surface-pattern-big-scale-down.ref.png
diff --git a/test/surface-pattern-scale-down-pdf-argb32-ref.png b/test/surface-pattern-scale-down.pdf.argb32.ref.png
similarity index 100%
rename from test/surface-pattern-scale-down-pdf-argb32-ref.png
rename to test/surface-pattern-scale-down.pdf.argb32.ref.png
diff --git a/test/surface-pattern-scale-down-pdf-rgb24-ref.png b/test/surface-pattern-scale-down.pdf.rgb24.ref.png
similarity index 100%
rename from test/surface-pattern-scale-down-pdf-rgb24-ref.png
rename to test/surface-pattern-scale-down.pdf.rgb24.ref.png
diff --git a/test/surface-pattern-scale-down-ps2-ref.png b/test/surface-pattern-scale-down.ps2.ref.png
similarity index 100%
rename from test/surface-pattern-scale-down-ps2-ref.png
rename to test/surface-pattern-scale-down.ps2.ref.png
diff --git a/test/surface-pattern-scale-down-ps3-ref.png b/test/surface-pattern-scale-down.ps3.ref.png
similarity index 100%
rename from test/surface-pattern-scale-down-ps3-ref.png
rename to test/surface-pattern-scale-down.ps3.ref.png
diff --git a/test/surface-pattern-scale-down-quartz-ref.png b/test/surface-pattern-scale-down.quartz.ref.png
similarity index 100%
rename from test/surface-pattern-scale-down-quartz-ref.png
rename to test/surface-pattern-scale-down.quartz.ref.png
diff --git a/test/surface-pattern-scale-down-ref.png b/test/surface-pattern-scale-down.ref.png
similarity index 100%
rename from test/surface-pattern-scale-down-ref.png
rename to test/surface-pattern-scale-down.ref.png
diff --git a/test/surface-pattern-scale-up-pdf-argb32-ref.png b/test/surface-pattern-scale-up.pdf.argb32.ref.png
similarity index 100%
rename from test/surface-pattern-scale-up-pdf-argb32-ref.png
rename to test/surface-pattern-scale-up.pdf.argb32.ref.png
diff --git a/test/surface-pattern-scale-up-pdf-rgb24-ref.png b/test/surface-pattern-scale-up.pdf.rgb24.ref.png
similarity index 100%
rename from test/surface-pattern-scale-up-pdf-rgb24-ref.png
rename to test/surface-pattern-scale-up.pdf.rgb24.ref.png
diff --git a/test/surface-pattern-scale-up-ps2-ref.png b/test/surface-pattern-scale-up.ps2.ref.png
similarity index 100%
rename from test/surface-pattern-scale-up-ps2-ref.png
rename to test/surface-pattern-scale-up.ps2.ref.png
diff --git a/test/surface-pattern-scale-up-ps3-ref.png b/test/surface-pattern-scale-up.ps3.ref.png
similarity index 100%
rename from test/surface-pattern-scale-up-ps3-ref.png
rename to test/surface-pattern-scale-up.ps3.ref.png
diff --git a/test/surface-pattern-scale-up-ref.png b/test/surface-pattern-scale-up.ref.png
similarity index 100%
rename from test/surface-pattern-scale-up-ref.png
rename to test/surface-pattern-scale-up.ref.png
diff --git a/test/surface-pattern-pdf-ref.png b/test/surface-pattern.pdf.ref.png
similarity index 100%
rename from test/surface-pattern-pdf-ref.png
rename to test/surface-pattern.pdf.ref.png
diff --git a/test/surface-pattern-ps2-ref.png b/test/surface-pattern.ps2.ref.png
similarity index 100%
rename from test/surface-pattern-ps2-ref.png
rename to test/surface-pattern.ps2.ref.png
diff --git a/test/surface-pattern-ps3-ref.png b/test/surface-pattern.ps3.ref.png
similarity index 100%
rename from test/surface-pattern-ps3-ref.png
rename to test/surface-pattern.ps3.ref.png
diff --git a/test/surface-pattern-ref.png b/test/surface-pattern.ref.png
similarity index 100%
rename from test/surface-pattern-ref.png
rename to test/surface-pattern.ref.png
diff --git a/test/surface-pattern-svg11-ref.png b/test/surface-pattern.svg11.ref.png
similarity index 100%
rename from test/surface-pattern-svg11-ref.png
rename to test/surface-pattern.svg11.ref.png
diff --git a/test/surface-pattern-svg12-ref.png b/test/surface-pattern.svg12.ref.png
similarity index 100%
rename from test/surface-pattern-svg12-ref.png
rename to test/surface-pattern.svg12.ref.png
diff --git a/test/svg-clip.c b/test/svg-clip.c
index 4a6cf0749..035b23605 100644
--- a/test/svg-clip.c
+++ b/test/svg-clip.c
@@ -107,7 +107,7 @@ static cairo_test_status_t
 preamble (cairo_test_context_t *ctx)
 {
     cairo_t *cr;
-    const char *filename = "svg-clip-out.svg";
+    const char *filename = "svg-clip.out.svg";
     cairo_surface_t *surface;
 
     if (! cairo_test_is_target_enabled (ctx, "svg11") &&
diff --git a/test/svg-surface-source.c b/test/svg-surface-source.c
index d7749e5d0..c97d3caf1 100644
--- a/test/svg-surface-source.c
+++ b/test/svg-surface-source.c
@@ -33,7 +33,7 @@ create_source_surface (int size)
 {
     cairo_surface_t *surface;
 
-    surface = cairo_svg_surface_create ("svg-surface-source-out.svg",
+    surface = cairo_svg_surface_create ("svg-surface-source.out.svg",
 					size, size);
     cairo_surface_set_fallback_resolution (surface, 72., 72.);
 
diff --git a/test/svg-surface-source-ref.png b/test/svg-surface-source.ref.png
similarity index 100%
rename from test/svg-surface-source-ref.png
rename to test/svg-surface-source.ref.png
diff --git a/test/svg-surface.c b/test/svg-surface.c
index 6f071cedd..4e29f1bc1 100644
--- a/test/svg-surface.c
+++ b/test/svg-surface.c
@@ -90,7 +90,7 @@ static cairo_test_status_t
 preamble (cairo_test_context_t *ctx)
 {
     cairo_t *cr;
-    const char *filename = "svg-surface-out.svg";
+    const char *filename = "svg-surface.out.svg";
     cairo_surface_t *surface;
 
     if (! cairo_test_is_target_enabled (ctx, "svg11") &&
diff --git a/test/text-antialias-gray-quartz-ref.png b/test/text-antialias-gray.quartz.ref.png
similarity index 100%
rename from test/text-antialias-gray-quartz-ref.png
rename to test/text-antialias-gray.quartz.ref.png
diff --git a/test/text-antialias-gray-ref.png b/test/text-antialias-gray.ref.png
similarity index 100%
rename from test/text-antialias-gray-ref.png
rename to test/text-antialias-gray.ref.png
diff --git a/test/text-antialias-none-quartz-ref.png b/test/text-antialias-none.quartz.ref.png
similarity index 100%
rename from test/text-antialias-none-quartz-ref.png
rename to test/text-antialias-none.quartz.ref.png
diff --git a/test/text-antialias-none-ref.png b/test/text-antialias-none.ref.png
similarity index 100%
rename from test/text-antialias-none-ref.png
rename to test/text-antialias-none.ref.png
diff --git a/test/text-antialias-subpixel-quartz-ref.png b/test/text-antialias-subpixel.quartz.ref.png
similarity index 100%
rename from test/text-antialias-subpixel-quartz-ref.png
rename to test/text-antialias-subpixel.quartz.ref.png
diff --git a/test/text-antialias-subpixel-ref.png b/test/text-antialias-subpixel.ref.png
similarity index 100%
rename from test/text-antialias-subpixel-ref.png
rename to test/text-antialias-subpixel.ref.png
diff --git a/test/text-glyph-range-ps2-ref.png b/test/text-glyph-range.ps2.ref.png
similarity index 100%
rename from test/text-glyph-range-ps2-ref.png
rename to test/text-glyph-range.ps2.ref.png
diff --git a/test/text-glyph-range-ps3-ref.png b/test/text-glyph-range.ps3.ref.png
similarity index 100%
rename from test/text-glyph-range-ps3-ref.png
rename to test/text-glyph-range.ps3.ref.png
diff --git a/test/text-glyph-range-ref.png b/test/text-glyph-range.ref.png
similarity index 100%
rename from test/text-glyph-range-ref.png
rename to test/text-glyph-range.ref.png
diff --git a/test/text-pattern-pdf-argb32-ref.png b/test/text-pattern.pdf.argb32.ref.png
similarity index 100%
rename from test/text-pattern-pdf-argb32-ref.png
rename to test/text-pattern.pdf.argb32.ref.png
diff --git a/test/text-pattern-pdf-rgb24-ref.png b/test/text-pattern.pdf.rgb24.ref.png
similarity index 100%
rename from test/text-pattern-pdf-rgb24-ref.png
rename to test/text-pattern.pdf.rgb24.ref.png
diff --git a/test/text-pattern-ps3-argb32-ref.png b/test/text-pattern.ps3.argb32.ref.png
similarity index 100%
rename from test/text-pattern-ps3-argb32-ref.png
rename to test/text-pattern.ps3.argb32.ref.png
diff --git a/test/text-pattern-ps3-rgb24-ref.png b/test/text-pattern.ps3.rgb24.ref.png
similarity index 100%
rename from test/text-pattern-ps3-rgb24-ref.png
rename to test/text-pattern.ps3.rgb24.ref.png
diff --git a/test/text-pattern-quartz-ref.png b/test/text-pattern.quartz.ref.png
similarity index 100%
rename from test/text-pattern-quartz-ref.png
rename to test/text-pattern.quartz.ref.png
diff --git a/test/text-pattern-quartz-rgb24-ref.png b/test/text-pattern.quartz.rgb24.ref.png
similarity index 100%
rename from test/text-pattern-quartz-rgb24-ref.png
rename to test/text-pattern.quartz.rgb24.ref.png
diff --git a/test/text-pattern-ref.png b/test/text-pattern.ref.png
similarity index 100%
rename from test/text-pattern-ref.png
rename to test/text-pattern.ref.png
diff --git a/test/text-pattern-rgb24-ref.png b/test/text-pattern.rgb24.ref.png
similarity index 100%
rename from test/text-pattern-rgb24-ref.png
rename to test/text-pattern.rgb24.ref.png
diff --git a/test/text-pattern-svg11-argb32-ref.png b/test/text-pattern.svg11.argb32.ref.png
similarity index 100%
rename from test/text-pattern-svg11-argb32-ref.png
rename to test/text-pattern.svg11.argb32.ref.png
diff --git a/test/text-pattern-svg11-rgb24-ref.png b/test/text-pattern.svg11.rgb24.ref.png
similarity index 100%
rename from test/text-pattern-svg11-rgb24-ref.png
rename to test/text-pattern.svg11.rgb24.ref.png
diff --git a/test/text-pattern-svg12-argb32-ref.png b/test/text-pattern.svg12.argb32.ref.png
similarity index 100%
rename from test/text-pattern-svg12-argb32-ref.png
rename to test/text-pattern.svg12.argb32.ref.png
diff --git a/test/text-pattern-svg12-rgb24-ref.png b/test/text-pattern.svg12.rgb24.ref.png
similarity index 100%
rename from test/text-pattern-svg12-rgb24-ref.png
rename to test/text-pattern.svg12.rgb24.ref.png
diff --git a/test/text-rotate-pdf-ref.png b/test/text-rotate.pdf.ref.png
similarity index 100%
rename from test/text-rotate-pdf-ref.png
rename to test/text-rotate.pdf.ref.png
diff --git a/test/text-rotate-ps2-ref.png b/test/text-rotate.ps2.ref.png
similarity index 100%
rename from test/text-rotate-ps2-ref.png
rename to test/text-rotate.ps2.ref.png
diff --git a/test/text-rotate-ps3-ref.png b/test/text-rotate.ps3.ref.png
similarity index 100%
rename from test/text-rotate-ps3-ref.png
rename to test/text-rotate.ps3.ref.png
diff --git a/test/text-rotate-quartz-ref.png b/test/text-rotate.quartz.ref.png
similarity index 100%
rename from test/text-rotate-quartz-ref.png
rename to test/text-rotate.quartz.ref.png
diff --git a/test/text-rotate-ref.png b/test/text-rotate.ref.png
similarity index 100%
rename from test/text-rotate-ref.png
rename to test/text-rotate.ref.png
diff --git a/test/text-rotate-svg11-ref.png b/test/text-rotate.svg11.ref.png
similarity index 100%
rename from test/text-rotate-svg11-ref.png
rename to test/text-rotate.svg11.ref.png
diff --git a/test/text-rotate-svg12-ref.png b/test/text-rotate.svg12.ref.png
similarity index 100%
rename from test/text-rotate-svg12-ref.png
rename to test/text-rotate.svg12.ref.png
diff --git a/test/text-transform-pdf-ref.png b/test/text-transform.pdf.ref.png
similarity index 100%
rename from test/text-transform-pdf-ref.png
rename to test/text-transform.pdf.ref.png
diff --git a/test/text-transform-ps2-ref.png b/test/text-transform.ps2.ref.png
similarity index 100%
rename from test/text-transform-ps2-ref.png
rename to test/text-transform.ps2.ref.png
diff --git a/test/text-transform-ps3-ref.png b/test/text-transform.ps3.ref.png
similarity index 100%
rename from test/text-transform-ps3-ref.png
rename to test/text-transform.ps3.ref.png
diff --git a/test/text-transform-ref.png b/test/text-transform.ref.png
similarity index 100%
rename from test/text-transform-ref.png
rename to test/text-transform.ref.png
diff --git a/test/transforms-ps2-ref.png b/test/transforms.ps2.ref.png
similarity index 100%
rename from test/transforms-ps2-ref.png
rename to test/transforms.ps2.ref.png
diff --git a/test/transforms-ps3-ref.png b/test/transforms.ps3.ref.png
similarity index 100%
rename from test/transforms-ps3-ref.png
rename to test/transforms.ps3.ref.png
diff --git a/test/transforms-ref.png b/test/transforms.ref.png
similarity index 100%
rename from test/transforms-ref.png
rename to test/transforms.ref.png
diff --git a/test/translate-show-surface-ref.png b/test/translate-show-surface.ref.png
similarity index 100%
rename from test/translate-show-surface-ref.png
rename to test/translate-show-surface.ref.png
diff --git a/test/trap-clip-pdf-argb32-ref.png b/test/trap-clip.pdf.argb32.ref.png
similarity index 100%
rename from test/trap-clip-pdf-argb32-ref.png
rename to test/trap-clip.pdf.argb32.ref.png
diff --git a/test/trap-clip-pdf-rgb24-ref.png b/test/trap-clip.pdf.rgb24.ref.png
similarity index 100%
rename from test/trap-clip-pdf-rgb24-ref.png
rename to test/trap-clip.pdf.rgb24.ref.png
diff --git a/test/trap-clip-ps2-argb32-ref.png b/test/trap-clip.ps2.argb32.ref.png
similarity index 100%
rename from test/trap-clip-ps2-argb32-ref.png
rename to test/trap-clip.ps2.argb32.ref.png
diff --git a/test/trap-clip-ps2-rgb24-ref.png b/test/trap-clip.ps2.rgb24.ref.png
similarity index 100%
rename from test/trap-clip-ps2-rgb24-ref.png
rename to test/trap-clip.ps2.rgb24.ref.png
diff --git a/test/trap-clip-ps3-argb32-ref.png b/test/trap-clip.ps3.argb32.ref.png
similarity index 100%
rename from test/trap-clip-ps3-argb32-ref.png
rename to test/trap-clip.ps3.argb32.ref.png
diff --git a/test/trap-clip-ps3-rgb24-ref.png b/test/trap-clip.ps3.rgb24.ref.png
similarity index 100%
rename from test/trap-clip-ps3-rgb24-ref.png
rename to test/trap-clip.ps3.rgb24.ref.png
diff --git a/test/trap-clip-quartz-ref.png b/test/trap-clip.quartz.ref.png
similarity index 100%
rename from test/trap-clip-quartz-ref.png
rename to test/trap-clip.quartz.ref.png
diff --git a/test/trap-clip-quartz-rgb24-ref.png b/test/trap-clip.quartz.rgb24.ref.png
similarity index 100%
rename from test/trap-clip-quartz-rgb24-ref.png
rename to test/trap-clip.quartz.rgb24.ref.png
diff --git a/test/trap-clip-ref.png b/test/trap-clip.ref.png
similarity index 100%
rename from test/trap-clip-ref.png
rename to test/trap-clip.ref.png
diff --git a/test/trap-clip-rgb24-ref.png b/test/trap-clip.rgb24.ref.png
similarity index 100%
rename from test/trap-clip-rgb24-ref.png
rename to test/trap-clip.rgb24.ref.png
diff --git a/test/twin-ps2-ref.png b/test/twin.ps2.ref.png
similarity index 100%
rename from test/twin-ps2-ref.png
rename to test/twin.ps2.ref.png
diff --git a/test/twin-ps3-ref.png b/test/twin.ps3.ref.png
similarity index 100%
rename from test/twin-ps3-ref.png
rename to test/twin.ps3.ref.png
diff --git a/test/twin-ref.png b/test/twin.ref.png
similarity index 100%
rename from test/twin-ref.png
rename to test/twin.ref.png
diff --git a/test/twin-svg11-ref.png b/test/twin.svg11.ref.png
similarity index 100%
rename from test/twin-svg11-ref.png
rename to test/twin.svg11.ref.png
diff --git a/test/twin-svg12-ref.png b/test/twin.svg12.ref.png
similarity index 100%
rename from test/twin-svg12-ref.png
rename to test/twin.svg12.ref.png
diff --git a/test/unantialiased-shapes-quartz-ref.png b/test/unantialiased-shapes.quartz.ref.png
similarity index 100%
rename from test/unantialiased-shapes-quartz-ref.png
rename to test/unantialiased-shapes.quartz.ref.png
diff --git a/test/unantialiased-shapes-ref.png b/test/unantialiased-shapes.ref.png
similarity index 100%
rename from test/unantialiased-shapes-ref.png
rename to test/unantialiased-shapes.ref.png
diff --git a/test/unbounded-operator-quartz-ref.png b/test/unbounded-operator.quartz.ref.png
similarity index 100%
rename from test/unbounded-operator-quartz-ref.png
rename to test/unbounded-operator.quartz.ref.png
diff --git a/test/unbounded-operator-quartz-rgb24-ref.png b/test/unbounded-operator.quartz.rgb24.ref.png
similarity index 100%
rename from test/unbounded-operator-quartz-rgb24-ref.png
rename to test/unbounded-operator.quartz.rgb24.ref.png
diff --git a/test/unbounded-operator-ref.png b/test/unbounded-operator.ref.png
similarity index 100%
rename from test/unbounded-operator-ref.png
rename to test/unbounded-operator.ref.png
diff --git a/test/unbounded-operator-rgb24-ref.png b/test/unbounded-operator.rgb24.ref.png
similarity index 100%
rename from test/unbounded-operator-rgb24-ref.png
rename to test/unbounded-operator.rgb24.ref.png
diff --git a/test/user-font-mask-pdf-ref.png b/test/user-font-mask.pdf.ref.png
similarity index 100%
rename from test/user-font-mask-pdf-ref.png
rename to test/user-font-mask.pdf.ref.png
diff --git a/test/user-font-mask-ps2-ref.png b/test/user-font-mask.ps2.ref.png
similarity index 100%
rename from test/user-font-mask-ps2-ref.png
rename to test/user-font-mask.ps2.ref.png
diff --git a/test/user-font-mask-ps3-ref.png b/test/user-font-mask.ps3.ref.png
similarity index 100%
rename from test/user-font-mask-ps3-ref.png
rename to test/user-font-mask.ps3.ref.png
diff --git a/test/user-font-mask-ref.png b/test/user-font-mask.ref.png
similarity index 100%
rename from test/user-font-mask-ref.png
rename to test/user-font-mask.ref.png
diff --git a/test/user-font-mask-svg11-ref.png b/test/user-font-mask.svg11.ref.png
similarity index 100%
rename from test/user-font-mask-svg11-ref.png
rename to test/user-font-mask.svg11.ref.png
diff --git a/test/user-font-proxy-pdf-ref.png b/test/user-font-proxy.pdf.ref.png
similarity index 100%
rename from test/user-font-proxy-pdf-ref.png
rename to test/user-font-proxy.pdf.ref.png
diff --git a/test/user-font-proxy-ps2-ref.png b/test/user-font-proxy.ps2.ref.png
similarity index 100%
rename from test/user-font-proxy-ps2-ref.png
rename to test/user-font-proxy.ps2.ref.png
diff --git a/test/user-font-proxy-ps3-ref.png b/test/user-font-proxy.ps3.ref.png
similarity index 100%
rename from test/user-font-proxy-ps3-ref.png
rename to test/user-font-proxy.ps3.ref.png
diff --git a/test/user-font-proxy-ref.png b/test/user-font-proxy.ref.png
similarity index 100%
rename from test/user-font-proxy-ref.png
rename to test/user-font-proxy.ref.png
diff --git a/test/user-font-proxy-svg11-ref.png b/test/user-font-proxy.svg11.ref.png
similarity index 100%
rename from test/user-font-proxy-svg11-ref.png
rename to test/user-font-proxy.svg11.ref.png
diff --git a/test/user-font-proxy-svg12-ref.png b/test/user-font-proxy.svg12.ref.png
similarity index 100%
rename from test/user-font-proxy-svg12-ref.png
rename to test/user-font-proxy.svg12.ref.png
diff --git a/test/user-font-rescale-ps2-ref.png b/test/user-font-rescale.ps2.ref.png
similarity index 100%
rename from test/user-font-rescale-ps2-ref.png
rename to test/user-font-rescale.ps2.ref.png
diff --git a/test/user-font-rescale-ps3-ref.png b/test/user-font-rescale.ps3.ref.png
similarity index 100%
rename from test/user-font-rescale-ps3-ref.png
rename to test/user-font-rescale.ps3.ref.png
diff --git a/test/user-font-rescale-ref.png b/test/user-font-rescale.ref.png
similarity index 100%
rename from test/user-font-rescale-ref.png
rename to test/user-font-rescale.ref.png
diff --git a/test/user-font-rescale-svg11-ref.png b/test/user-font-rescale.svg11.ref.png
similarity index 100%
rename from test/user-font-rescale-svg11-ref.png
rename to test/user-font-rescale.svg11.ref.png
diff --git a/test/user-font-rescale-svg12-ref.png b/test/user-font-rescale.svg12.ref.png
similarity index 100%
rename from test/user-font-rescale-svg12-ref.png
rename to test/user-font-rescale.svg12.ref.png
diff --git a/test/user-font-ps2-ref.png b/test/user-font.ps2.ref.png
similarity index 100%
rename from test/user-font-ps2-ref.png
rename to test/user-font.ps2.ref.png
diff --git a/test/user-font-ps3-ref.png b/test/user-font.ps3.ref.png
similarity index 100%
rename from test/user-font-ps3-ref.png
rename to test/user-font.ps3.ref.png
diff --git a/test/user-font-ref.png b/test/user-font.ref.png
similarity index 100%
rename from test/user-font-ref.png
rename to test/user-font.ref.png
diff --git a/test/user-font-svg11-ref.png b/test/user-font.svg11.ref.png
similarity index 100%
rename from test/user-font-svg11-ref.png
rename to test/user-font.svg11.ref.png
diff --git a/test/user-font-svg12-ref.png b/test/user-font.svg12.ref.png
similarity index 100%
rename from test/user-font-svg12-ref.png
rename to test/user-font.svg12.ref.png
diff --git a/test/xlib-expose-event.c b/test/xlib-expose-event.c
index a2bda1ac3..fc312dadd 100644
--- a/test/xlib-expose-event.c
+++ b/test/xlib-expose-event.c
@@ -190,9 +190,9 @@ compare (const cairo_test_context_t *ctx, cairo_surface_t *surface)
     cairo_set_source_surface (cr, surface, 0, 0);
     cairo_paint (cr);
     cairo_destroy (cr);
-    cairo_surface_write_to_png (image, "xlib-expose-event-out.png");
+    cairo_surface_write_to_png (image, "xlib-expose-event.out.png");
 
-    reference = cairo_test_create_surface_from_png (ctx, "xlib-expose-event-ref.png");
+    reference = cairo_test_create_surface_from_png (ctx, "xlib-expose-event.ref.png");
     status = image_diff (ctx, reference, image, diff, &result);
 
     cairo_surface_destroy (reference);
diff --git a/test/xlib-expose-event-ref.png b/test/xlib-expose-event.ref.png
similarity index 100%
rename from test/xlib-expose-event-ref.png
rename to test/xlib-expose-event.ref.png
diff --git a/test/xlib-surface-source-ps2-ref.png b/test/xlib-surface-source.ps2.ref.png
similarity index 100%
rename from test/xlib-surface-source-ps2-ref.png
rename to test/xlib-surface-source.ps2.ref.png
diff --git a/test/xlib-surface-source-ps3-ref.png b/test/xlib-surface-source.ps3.ref.png
similarity index 100%
rename from test/xlib-surface-source-ps3-ref.png
rename to test/xlib-surface-source.ps3.ref.png
diff --git a/test/xlib-surface-source-ref.png b/test/xlib-surface-source.ref.png
similarity index 100%
rename from test/xlib-surface-source-ref.png
rename to test/xlib-surface-source.ref.png
diff --git a/test/zero-alpha-ref.png b/test/zero-alpha.ref.png
similarity index 100%
rename from test/zero-alpha-ref.png
rename to test/zero-alpha.ref.png