summaryrefslogtreecommitdiffstats
path: root/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff')
-rw-r--r--source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff194
1 files changed, 129 insertions, 65 deletions
diff --git a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
index 113f8ca6c..86d01e898 100644
--- a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
+++ b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff
@@ -1,16 +1,16 @@
---- ./test/Makefile.in.orig 2019-02-11 06:24:53.000000000 -0600
-+++ ./test/Makefile.in 2019-02-12 13:54:42.157995706 -0600
-@@ -106,19 +106,18 @@
+--- ./test/Makefile.in.orig 2019-04-07 15:31:45.000000000 -0500
++++ ./test/Makefile.in 2019-04-08 15:06:58.331894784 -0500
+@@ -106,19 +106,17 @@
region-translate-test$(EXEEXT) fetch-test$(EXEEXT) \
a1-trap-test$(EXEEXT) prng-test$(EXEEXT) \
radial-invalid$(EXEEXT) pdf-op-test$(EXEEXT) \
- region-test$(EXEEXT) combiner-test$(EXEEXT) \
-+ combiner-test$(EXEEXT) \
- scaling-crash-test$(EXEEXT) alpha-loop$(EXEEXT) \
+- scaling-crash-test$(EXEEXT) alpha-loop$(EXEEXT) \
- scaling-helpers-test$(EXEEXT) thread-test$(EXEEXT) \
- rotate-test$(EXEEXT) alphamap$(EXEEXT) \
++ combiner-test$(EXEEXT) \
++ scaling-crash-test$(EXEEXT) \
+ thread-test$(EXEEXT) \
-+ alphamap$(EXEEXT) \
gradient-crash-test$(EXEEXT) pixel-test$(EXEEXT) \
- matrix-test$(EXEEXT) filter-reduction-test$(EXEEXT) \
- composite-traps-test$(EXEEXT) region-contains-test$(EXEEXT) \
@@ -21,14 +21,14 @@
- affine-test$(EXEEXT) scaling-test$(EXEEXT) composite$(EXEEXT) \
- tolerance-test$(EXEEXT)
+ cover-test$(EXEEXT) \
-+ scaling-test$(EXEEXT) composite$(EXEEXT)
++ scaling-test$(EXEEXT)
am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT) radial-perf-test$(EXEEXT) \
- check-formats$(EXEEXT) scaling-bench$(EXEEXT) \
+ check-formats$(EXEEXT) \
affine-bench$(EXEEXT)
PROGRAMS = $(noinst_PROGRAMS)
LTLIBRARIES = $(noinst_LTLIBRARIES)
-@@ -144,12 +143,6 @@
+@@ -144,30 +142,6 @@
affine_bench_DEPENDENCIES = libutils.la \
$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -38,13 +38,18 @@
-affine_test_DEPENDENCIES = libutils.la \
- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
- alpha_loop_SOURCES = alpha-loop.c
- alpha_loop_OBJECTS = alpha-loop.$(OBJEXT)
- alpha_loop_LDADD = $(LDADD)
-@@ -162,12 +155,6 @@
- alphamap_DEPENDENCIES = libutils.la \
- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
+-alpha_loop_SOURCES = alpha-loop.c
+-alpha_loop_OBJECTS = alpha-loop.$(OBJEXT)
+-alpha_loop_LDADD = $(LDADD)
+-alpha_loop_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+-alphamap_SOURCES = alphamap.c
+-alphamap_OBJECTS = alphamap.$(OBJEXT)
+-alphamap_LDADD = $(LDADD)
+-alphamap_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
-blitters_test_SOURCES = blitters-test.c
-blitters_test_OBJECTS = blitters-test.$(OBJEXT)
-blitters_test_LDADD = $(LDADD)
@@ -54,7 +59,20 @@
check_formats_SOURCES = check-formats.c
check_formats_OBJECTS = check-formats.$(OBJEXT)
check_formats_LDADD = $(LDADD)
-@@ -240,12 +227,6 @@
+@@ -180,12 +154,6 @@
+ combiner_test_DEPENDENCIES = libutils.la \
+ $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+-composite_SOURCES = composite.c
+-composite_OBJECTS = composite.$(OBJEXT)
+-composite_LDADD = $(LDADD)
+-composite_DEPENDENCIES = libutils.la \
+- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
+ composite_traps_test_SOURCES = composite-traps-test.c
+ composite_traps_test_OBJECTS = composite-traps-test.$(OBJEXT)
+ composite_traps_test_LDADD = $(LDADD)
+@@ -240,12 +208,6 @@
lowlevel_blt_bench_DEPENDENCIES = libutils.la \
$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -67,7 +85,7 @@
oob_test_SOURCES = oob-test.c
oob_test_OBJECTS = oob-test.$(OBJEXT)
oob_test_LDADD = $(LDADD)
-@@ -282,48 +263,18 @@
+@@ -282,48 +244,18 @@
radial_perf_test_DEPENDENCIES = libutils.la \
$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -116,7 +134,7 @@
scaling_test_SOURCES = scaling-test.c
scaling_test_OBJECTS = scaling-test.$(OBJEXT)
scaling_test_LDADD = $(LDADD)
-@@ -348,12 +299,6 @@
+@@ -348,12 +280,6 @@
thread_test_DEPENDENCIES = libutils.la \
$(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
@@ -129,17 +147,18 @@
trap_crasher_SOURCES = trap-crasher.c
trap_crasher_OBJECTS = trap-crasher.$(OBJEXT)
trap_crasher_LDADD = $(LDADD)
-@@ -376,27 +321,24 @@
+@@ -376,27 +302,23 @@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__maybe_remake_depfiles = depfiles
am__depfiles_remade = ./$(DEPDIR)/a1-trap-test.Po \
- ./$(DEPDIR)/affine-bench.Po ./$(DEPDIR)/affine-test.Po \
-+ ./$(DEPDIR)/affine-bench.Po \
- ./$(DEPDIR)/alpha-loop.Po ./$(DEPDIR)/alphamap.Po \
+- ./$(DEPDIR)/alpha-loop.Po ./$(DEPDIR)/alphamap.Po \
- ./$(DEPDIR)/blitters-test.Po ./$(DEPDIR)/check-formats.Po \
++ ./$(DEPDIR)/affine-bench.Po \
+ ./$(DEPDIR)/check-formats.Po \
./$(DEPDIR)/combiner-test.Po \
- ./$(DEPDIR)/composite-traps-test.Po ./$(DEPDIR)/composite.Po \
+- ./$(DEPDIR)/composite-traps-test.Po ./$(DEPDIR)/composite.Po \
++ ./$(DEPDIR)/composite-traps-test.Po \
./$(DEPDIR)/cover-test.Po ./$(DEPDIR)/fence-image-self-test.Po \
./$(DEPDIR)/fetch-test.Po ./$(DEPDIR)/filter-reduction-test.Po \
./$(DEPDIR)/glyph-test.Po ./$(DEPDIR)/gradient-crash-test.Po \
@@ -161,13 +180,13 @@
./$(DEPDIR)/utils-prng.Plo ./$(DEPDIR)/utils.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -418,29 +360,29 @@
+@@ -418,29 +340,27 @@
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \
- affine-test.c alpha-loop.c alphamap.c blitters-test.c \
-+ alpha-loop.c alphamap.c \
- check-formats.c combiner-test.c composite.c \
+- check-formats.c combiner-test.c composite.c \
++ check-formats.c combiner-test.c \
composite-traps-test.c cover-test.c fence-image-self-test.c \
fetch-test.c filter-reduction-test.c glyph-test.c \
gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
@@ -184,8 +203,8 @@
+ stress-test.c thread-test.c trap-crasher.c
DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \
- affine-test.c alpha-loop.c alphamap.c blitters-test.c \
-+ alpha-loop.c alphamap.c \
- check-formats.c combiner-test.c composite.c \
+- check-formats.c combiner-test.c composite.c \
++ check-formats.c combiner-test.c \
composite-traps-test.c cover-test.c fence-image-self-test.c \
fetch-test.c filter-reduction-test.c glyph-test.c \
gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \
@@ -203,18 +222,18 @@
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
-@@ -834,29 +776,21 @@
+@@ -833,29 +753,18 @@
prng-test \
radial-invalid \
pdf-op-test \
- region-test \
combiner-test \
scaling-crash-test \
- alpha-loop \
+- alpha-loop \
- scaling-helpers-test \
thread-test \
- rotate-test \
- alphamap \
+- alphamap \
gradient-crash-test \
pixel-test \
- matrix-test \
@@ -228,12 +247,12 @@
- blitters-test \
- affine-test \
scaling-test \
- composite \
+- composite \
- tolerance-test \
$(NULL)
-@@ -865,7 +799,6 @@
+@@ -864,7 +773,6 @@
lowlevel-blt-bench \
radial-perf-test \
check-formats \
@@ -241,7 +260,7 @@
affine-bench \
$(NULL)
-@@ -957,10 +890,6 @@
+@@ -956,22 +864,6 @@
@rm -f affine-bench$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(affine_bench_OBJECTS) $(affine_bench_LDADD) $(LIBS)
@@ -249,13 +268,14 @@
- @rm -f affine-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(affine_test_OBJECTS) $(affine_test_LDADD) $(LIBS)
-
- alpha-loop$(EXEEXT): $(alpha_loop_OBJECTS) $(alpha_loop_DEPENDENCIES) $(EXTRA_alpha_loop_DEPENDENCIES)
- @rm -f alpha-loop$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(alpha_loop_OBJECTS) $(alpha_loop_LDADD) $(LIBS)
-@@ -969,10 +898,6 @@
- @rm -f alphamap$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(alphamap_OBJECTS) $(alphamap_LDADD) $(LIBS)
-
+-alpha-loop$(EXEEXT): $(alpha_loop_OBJECTS) $(alpha_loop_DEPENDENCIES) $(EXTRA_alpha_loop_DEPENDENCIES)
+- @rm -f alpha-loop$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(alpha_loop_OBJECTS) $(alpha_loop_LDADD) $(LIBS)
+-
+-alphamap$(EXEEXT): $(alphamap_OBJECTS) $(alphamap_DEPENDENCIES) $(EXTRA_alphamap_DEPENDENCIES)
+- @rm -f alphamap$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(alphamap_OBJECTS) $(alphamap_LDADD) $(LIBS)
+-
-blitters-test$(EXEEXT): $(blitters_test_OBJECTS) $(blitters_test_DEPENDENCIES) $(EXTRA_blitters_test_DEPENDENCIES)
- @rm -f blitters-test$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(blitters_test_OBJECTS) $(blitters_test_LDADD) $(LIBS)
@@ -263,7 +283,18 @@
check-formats$(EXEEXT): $(check_formats_OBJECTS) $(check_formats_DEPENDENCIES) $(EXTRA_check_formats_DEPENDENCIES)
@rm -f check-formats$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(check_formats_OBJECTS) $(check_formats_LDADD) $(LIBS)
-@@ -1021,10 +946,6 @@
+@@ -980,10 +872,6 @@
+ @rm -f combiner-test$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(combiner_test_OBJECTS) $(combiner_test_LDADD) $(LIBS)
+
+-composite$(EXEEXT): $(composite_OBJECTS) $(composite_DEPENDENCIES) $(EXTRA_composite_DEPENDENCIES)
+- @rm -f composite$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(composite_OBJECTS) $(composite_LDADD) $(LIBS)
+-
+ composite-traps-test$(EXEEXT): $(composite_traps_test_OBJECTS) $(composite_traps_test_DEPENDENCIES) $(EXTRA_composite_traps_test_DEPENDENCIES)
+ @rm -f composite-traps-test$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(composite_traps_test_OBJECTS) $(composite_traps_test_LDADD) $(LIBS)
+@@ -1020,10 +908,6 @@
@rm -f lowlevel-blt-bench$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_LDADD) $(LIBS)
@@ -274,7 +305,7 @@
oob-test$(EXEEXT): $(oob_test_OBJECTS) $(oob_test_DEPENDENCIES) $(EXTRA_oob_test_DEPENDENCIES)
@rm -f oob-test$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(oob_test_OBJECTS) $(oob_test_LDADD) $(LIBS)
-@@ -1049,34 +970,14 @@
+@@ -1048,34 +932,14 @@
@rm -f radial-perf-test$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(radial_perf_test_OBJECTS) $(radial_perf_test_LDADD) $(LIBS)
@@ -309,7 +340,7 @@
scaling-test$(EXEEXT): $(scaling_test_OBJECTS) $(scaling_test_DEPENDENCIES) $(EXTRA_scaling_test_DEPENDENCIES)
@rm -f scaling-test$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(scaling_test_OBJECTS) $(scaling_test_LDADD) $(LIBS)
-@@ -1093,10 +994,6 @@
+@@ -1092,10 +956,6 @@
@rm -f thread-test$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(thread_test_OBJECTS) $(thread_test_LDADD) $(LIBS)
@@ -320,18 +351,22 @@
trap-crasher$(EXEEXT): $(trap_crasher_OBJECTS) $(trap_crasher_DEPENDENCIES) $(EXTRA_trap_crasher_DEPENDENCIES)
@rm -f trap-crasher$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(trap_crasher_OBJECTS) $(trap_crasher_LDADD) $(LIBS)
-@@ -1109,10 +1006,8 @@
+@@ -1108,14 +968,9 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/a1-trap-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-bench.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-test.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha-loop.Po@am__quote@ # am--include-marker
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alphamap.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha-loop.Po@am__quote@ # am--include-marker
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alphamap.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blitters-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-formats.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combiner-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-traps-test.Po@am__quote@ # am--include-marker
-@@ -1125,25 +1020,18 @@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cover-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fence-image-self-test.Po@am__quote@ # am--include-marker
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fetch-test.Po@am__quote@ # am--include-marker
+@@ -1124,25 +979,18 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infinite-loop.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@ # am--include-marker
@@ -357,7 +392,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trap-crasher.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils-prng.Plo@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@ # am--include-marker
-@@ -1444,13 +1332,6 @@
+@@ -1443,13 +1291,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
@@ -371,10 +406,17 @@
combiner-test.log: combiner-test$(EXEEXT)
@p='combiner-test$(EXEEXT)'; \
b='combiner-test'; \
-@@ -1472,13 +1353,6 @@
+@@ -1464,20 +1305,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
+-alpha-loop.log: alpha-loop$(EXEEXT)
+- @p='alpha-loop$(EXEEXT)'; \
+- b='alpha-loop'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
-scaling-helpers-test.log: scaling-helpers-test$(EXEEXT)
- @p='scaling-helpers-test$(EXEEXT)'; \
- b='scaling-helpers-test'; \
@@ -385,7 +427,7 @@
thread-test.log: thread-test$(EXEEXT)
@p='thread-test$(EXEEXT)'; \
b='thread-test'; \
-@@ -1486,13 +1360,6 @@
+@@ -1485,20 +1312,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
@@ -396,10 +438,17 @@
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
- alphamap.log: alphamap$(EXEEXT)
- @p='alphamap$(EXEEXT)'; \
- b='alphamap'; \
-@@ -1514,13 +1381,6 @@
+-alphamap.log: alphamap$(EXEEXT)
+- @p='alphamap$(EXEEXT)'; \
+- b='alphamap'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
+ gradient-crash-test.log: gradient-crash-test$(EXEEXT)
+ @p='gradient-crash-test$(EXEEXT)'; \
+ b='gradient-crash-test'; \
+@@ -1513,13 +1326,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
@@ -413,7 +462,7 @@
filter-reduction-test.log: filter-reduction-test$(EXEEXT)
@p='filter-reduction-test$(EXEEXT)'; \
b='filter-reduction-test'; \
-@@ -1535,13 +1395,6 @@
+@@ -1534,13 +1340,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
@@ -427,7 +476,7 @@
glyph-test.log: glyph-test$(EXEEXT)
@p='glyph-test$(EXEEXT)'; \
b='glyph-test'; \
-@@ -1570,20 +1423,6 @@
+@@ -1569,20 +1368,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
@@ -448,10 +497,17 @@
scaling-test.log: scaling-test$(EXEEXT)
@p='scaling-test$(EXEEXT)'; \
b='scaling-test'; \
-@@ -1598,13 +1437,6 @@
+@@ -1590,20 +1375,6 @@
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
+-composite.log: composite$(EXEEXT)
+- @p='composite$(EXEEXT)'; \
+- b='composite'; \
+- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
-tolerance-test.log: tolerance-test$(EXEEXT)
- @p='tolerance-test$(EXEEXT)'; \
- b='tolerance-test'; \
@@ -462,18 +518,22 @@
.test.log:
@p='$<'; \
$(am__set_b); \
-@@ -1699,10 +1531,8 @@
+@@ -1698,14 +1469,9 @@
distclean: distclean-am
-rm -f ./$(DEPDIR)/a1-trap-test.Po
-rm -f ./$(DEPDIR)/affine-bench.Po
- -rm -f ./$(DEPDIR)/affine-test.Po
- -rm -f ./$(DEPDIR)/alpha-loop.Po
- -rm -f ./$(DEPDIR)/alphamap.Po
+- -rm -f ./$(DEPDIR)/alpha-loop.Po
+- -rm -f ./$(DEPDIR)/alphamap.Po
- -rm -f ./$(DEPDIR)/blitters-test.Po
-rm -f ./$(DEPDIR)/check-formats.Po
-rm -f ./$(DEPDIR)/combiner-test.Po
-rm -f ./$(DEPDIR)/composite-traps-test.Po
-@@ -1715,25 +1545,18 @@
+- -rm -f ./$(DEPDIR)/composite.Po
+ -rm -f ./$(DEPDIR)/cover-test.Po
+ -rm -f ./$(DEPDIR)/fence-image-self-test.Po
+ -rm -f ./$(DEPDIR)/fetch-test.Po
+@@ -1714,25 +1480,18 @@
-rm -f ./$(DEPDIR)/gradient-crash-test.Po
-rm -f ./$(DEPDIR)/infinite-loop.Po
-rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po
@@ -499,18 +559,22 @@
-rm -f ./$(DEPDIR)/trap-crasher.Po
-rm -f ./$(DEPDIR)/utils-prng.Plo
-rm -f ./$(DEPDIR)/utils.Plo
-@@ -1784,10 +1607,8 @@
+@@ -1783,14 +1542,9 @@
maintainer-clean: maintainer-clean-am
-rm -f ./$(DEPDIR)/a1-trap-test.Po
-rm -f ./$(DEPDIR)/affine-bench.Po
- -rm -f ./$(DEPDIR)/affine-test.Po
- -rm -f ./$(DEPDIR)/alpha-loop.Po
- -rm -f ./$(DEPDIR)/alphamap.Po
+- -rm -f ./$(DEPDIR)/alpha-loop.Po
+- -rm -f ./$(DEPDIR)/alphamap.Po
- -rm -f ./$(DEPDIR)/blitters-test.Po
-rm -f ./$(DEPDIR)/check-formats.Po
-rm -f ./$(DEPDIR)/combiner-test.Po
-rm -f ./$(DEPDIR)/composite-traps-test.Po
-@@ -1800,25 +1621,18 @@
+- -rm -f ./$(DEPDIR)/composite.Po
+ -rm -f ./$(DEPDIR)/cover-test.Po
+ -rm -f ./$(DEPDIR)/fence-image-self-test.Po
+ -rm -f ./$(DEPDIR)/fetch-test.Po
+@@ -1799,25 +1553,18 @@
-rm -f ./$(DEPDIR)/gradient-crash-test.Po
-rm -f ./$(DEPDIR)/infinite-loop.Po
-rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po