Fully rework the conformance test suite
The current conformance test suite is suboptimal in many ways.
All tests are built into the same binary, which makes adding new tests,
builting tests, and running groups of tests much more awkward than it
needs to be. The first issue, especially, raises the bar of contribution
in a significant way, while the other two take their toll on the
maintainer. All of these changes were introduced back when we had both
Clutter and Cogl tests in tree, and because we were building the test
suite for every single change; since then, Cogl moved out of tree with
all its tests, and we build the conformance test suite only when running
the `check` make target.
This admittedly large-ish commit changes the way the conformance test
suite works, taking advantage of the changes in the GTest API and test
harness.
First of all, all tests are now built separately, using their own test
suite as defined by each separate file. All tests run under the TAP
harness provided by GTest and Automake, to gather a proper report using
the Test Anything Protocol without using the `gtester` harness and the
`gtester-report` script. We also use the Makefile rules provided by GLib
to vastly simplify the build environment for the conformance test suite.
On top of the changes for the build and harness, we also provide new API
for creating and running test suites for Clutter. The API is public,
because the test suite has to use it, but it's minimal and mostly
provides convenience wrappers around GTest that make writing test units
for Clutter easier.
This commit disables all tests in the conformance test suite, as well as
moving the data files outside of the tests/data directory; the next few
commits will re-establish the conformance test suite separately so we
can check that everything works in a reliable way.
2013-12-12 14:36:16 +00:00
|
|
|
# GLIB - Library of useful C routines
|
|
|
|
|
|
|
|
|
|
TESTS_ENVIRONMENT= \
|
|
|
|
|
G_TEST_SRCDIR="$(abs_srcdir)" \
|
|
|
|
|
G_TEST_BUILDDIR="$(abs_builddir)" \
|
|
|
|
|
G_DEBUG=gc-friendly \
|
|
|
|
|
MALLOC_CHECK_=2 \
|
|
|
|
|
MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
|
|
|
|
|
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build/autotools/tap-driver.sh
|
|
|
|
|
LOG_COMPILER = $(top_srcdir)/build/autotools/tap-test
|
|
|
|
|
|
|
|
|
|
NULL =
|
|
|
|
|
|
|
|
|
|
# initialize variables for unconditional += appending
|
|
|
|
|
BUILT_SOURCES =
|
|
|
|
|
BUILT_EXTRA_DIST =
|
|
|
|
|
CLEANFILES = *.log *.trs
|
|
|
|
|
DISTCLEANFILES =
|
|
|
|
|
MAINTAINERCLEANFILES =
|
|
|
|
|
EXTRA_DIST =
|
|
|
|
|
TESTS =
|
|
|
|
|
|
|
|
|
|
installed_test_LTLIBRARIES =
|
|
|
|
|
installed_test_PROGRAMS =
|
|
|
|
|
installed_test_SCRIPTS =
|
|
|
|
|
nobase_installed_test_DATA =
|
|
|
|
|
|
|
|
|
|
noinst_LTLIBRARIES =
|
|
|
|
|
noinst_PROGRAMS =
|
|
|
|
|
noinst_SCRIPTS =
|
|
|
|
|
noinst_DATA =
|
|
|
|
|
|
|
|
|
|
check_LTLIBRARIES =
|
|
|
|
|
check_PROGRAMS =
|
|
|
|
|
check_SCRIPTS =
|
|
|
|
|
check_DATA =
|
|
|
|
|
|
|
|
|
|
# We support a fairly large range of possible variables. It is expected that all types of files in a test suite
|
|
|
|
|
# will belong in exactly one of the following variables.
|
|
|
|
|
#
|
|
|
|
|
# First, we support the usual automake suffixes, but in lowercase, with the customary meaning:
|
|
|
|
|
#
|
|
|
|
|
# test_programs, test_scripts, test_data, test_ltlibraries
|
|
|
|
|
#
|
|
|
|
|
# The above are used to list files that are involved in both uninstalled and installed testing. The
|
|
|
|
|
# test_programs and test_scripts are taken to be actual testcases and will be run as part of the test suite.
|
|
|
|
|
# Note that _data is always used with the nobase_ automake variable name to ensure that installed test data is
|
|
|
|
|
# installed in the same way as it appears in the package layout.
|
|
|
|
|
#
|
|
|
|
|
# In order to mark a particular file as being only for one type of testing, use 'installed' or 'uninstalled',
|
|
|
|
|
# like so:
|
|
|
|
|
#
|
|
|
|
|
# installed_test_programs, uninstalled_test_programs
|
|
|
|
|
# installed_test_scripts, uninstalled_test_scripts
|
|
|
|
|
# installed_test_data, uninstalled_test_data
|
|
|
|
|
# installed_test_ltlibraries, uninstalled_test_ltlibraries
|
|
|
|
|
#
|
|
|
|
|
# Additionally, we support 'extra' infixes for programs and scripts. This is used for support programs/scripts
|
|
|
|
|
# that should not themselves be run as testcases (but exist to be used from other testcases):
|
|
|
|
|
#
|
|
|
|
|
# test_extra_programs, installed_test_extra_programs, uninstalled_test_extra_programs
|
|
|
|
|
# test_extra_scripts, installed_test_extra_scripts, uninstalled_test_extra_scripts
|
|
|
|
|
#
|
|
|
|
|
# Additionally, for _scripts and _data, we support the customary dist_ prefix so that the named script or data
|
|
|
|
|
# file automatically end up in the tarball.
|
|
|
|
|
#
|
|
|
|
|
# dist_test_scripts, dist_test_data, dist_test_extra_scripts
|
|
|
|
|
# dist_installed_test_scripts, dist_installed_test_data, dist_installed_test_extra_scripts
|
|
|
|
|
# dist_uninstalled_test_scripts, dist_uninstalled_test_data, dist_uninstalled_test_extra_scripts
|
|
|
|
|
#
|
|
|
|
|
# Note that no file is automatically disted unless it appears in one of the dist_ variables. This follows the
|
|
|
|
|
# standard automake convention of not disting programs scripts or data by default.
|
|
|
|
|
#
|
|
|
|
|
# test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their disted
|
|
|
|
|
# variants) will be run as part of the in-tree 'make check'. These are all assumed to be runnable under
|
|
|
|
|
# gtester. That's a bit strange for scripts, but it's possible.
|
|
|
|
|
|
|
|
|
|
TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \
|
|
|
|
|
$(dist_test_scripts) $(dist_uninstalled_test_scripts)
|
|
|
|
|
|
|
|
|
|
# Note: build even the installed-only targets during 'make check' to ensure that they still work.
|
|
|
|
|
# We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to
|
|
|
|
|
# prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were
|
|
|
|
|
# filenames, including removing duplicate instances of the opening part before the space, eg. '$(addprefix'.
|
|
|
|
|
all_test_programs = $(test_programs) $(uninstalled_test_programs) $(installed_test_programs) \
|
|
|
|
|
$(test_extra_programs) $(uninstalled_test_extra_programs) $(installed_test_extra_programs)
|
|
|
|
|
all_test_scripts = $(test_scripts) $(uninstalled_test_scripts) $(installed_test_scripts) \
|
|
|
|
|
$(test_extra_scripts) $(uninstalled_test_extra_scripts) $(installed_test_extra_scripts)
|
|
|
|
|
all_dist_test_scripts = $(dist_test_scripts) $(dist_uninstalled_test_scripts) $(dist_installed_test_scripts) \
|
|
|
|
|
$(dist_test_extra_scripts) $(dist_uninstalled_test_extra_scripts) $(dist_installed_test_extra_scripts)
|
|
|
|
|
all_test_scripts += $(all_dist_test_scripts)
|
|
|
|
|
EXTRA_DIST += $(all_dist_test_scripts)
|
|
|
|
|
all_test_data = $(test_data) $(uninstalled_test_data) $(installed_test_data)
|
|
|
|
|
all_dist_test_data = $(dist_test_data) $(dist_uninstalled_test_data) $(dist_installed_test_data)
|
|
|
|
|
all_test_data += $(all_dist_test_data)
|
|
|
|
|
EXTRA_DIST += $(all_dist_test_data)
|
|
|
|
|
all_test_ltlibs = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installed_test_ltlibraries)
|
|
|
|
|
|
|
|
|
|
if ENABLE_ALWAYS_BUILD_TESTS
|
|
|
|
|
noinst_LTLIBRARIES += $(all_test_ltlibs)
|
|
|
|
|
noinst_PROGRAMS += $(all_test_programs)
|
|
|
|
|
noinst_SCRIPTS += $(all_test_scripts)
|
|
|
|
|
noinst_DATA += $(all_test_data)
|
|
|
|
|
else
|
|
|
|
|
check_LTLIBRARIES += $(all_test_ltlibs)
|
|
|
|
|
check_PROGRAMS += $(all_test_programs)
|
|
|
|
|
check_SCRIPTS += $(all_test_scripts)
|
|
|
|
|
check_DATA += $(all_test_data)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
if ENABLE_INSTALLED_TESTS
|
|
|
|
|
installed_test_PROGRAMS += $(test_programs) $(installed_test_programs) \
|
|
|
|
|
$(test_extra_programs) $(installed_test_extra_programs)
|
|
|
|
|
installed_test_SCRIPTS += $(test_scripts) $(installed_test_scripts) \
|
|
|
|
|
$(test_extra_scripts) $(test_installed_extra_scripts)
|
|
|
|
|
installed_test_SCRIPTS += $(dist_test_scripts) $(dist_test_extra_scripts) \
|
|
|
|
|
$(dist_installed_test_scripts) $(dist_installed_test_extra_scripts)
|
|
|
|
|
nobase_installed_test_DATA += $(test_data) $(installed_test_data)
|
|
|
|
|
nobase_installed_test_DATA += $(dist_test_data) $(dist_installed_test_data)
|
|
|
|
|
installed_test_LTLIBRARIES += $(test_ltlibraries) $(installed_test_ltlibraries)
|
|
|
|
|
installed_testcases = $(test_programs) $(installed_test_programs) \
|
|
|
|
|
$(test_scripts) $(installed_test_scripts) \
|
|
|
|
|
$(dist_test_scripts) $(dist_installed_test_scripts)
|
|
|
|
|
|
|
|
|
|
installed_test_meta_DATA = $(installed_testcases:=.test)
|
|
|
|
|
|
|
|
|
|
%.test: %$(EXEEXT) Makefile
|
|
|
|
|
$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
|
|
|
|
|
echo 'Type=session' >> $@.tmp; \
|
2015-01-02 12:16:57 +00:00
|
|
|
echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \
|
Fully rework the conformance test suite
The current conformance test suite is suboptimal in many ways.
All tests are built into the same binary, which makes adding new tests,
builting tests, and running groups of tests much more awkward than it
needs to be. The first issue, especially, raises the bar of contribution
in a significant way, while the other two take their toll on the
maintainer. All of these changes were introduced back when we had both
Clutter and Cogl tests in tree, and because we were building the test
suite for every single change; since then, Cogl moved out of tree with
all its tests, and we build the conformance test suite only when running
the `check` make target.
This admittedly large-ish commit changes the way the conformance test
suite works, taking advantage of the changes in the GTest API and test
harness.
First of all, all tests are now built separately, using their own test
suite as defined by each separate file. All tests run under the TAP
harness provided by GTest and Automake, to gather a proper report using
the Test Anything Protocol without using the `gtester` harness and the
`gtester-report` script. We also use the Makefile rules provided by GLib
to vastly simplify the build environment for the conformance test suite.
On top of the changes for the build and harness, we also provide new API
for creating and running test suites for Clutter. The API is public,
because the test suite has to use it, but it's minimal and mostly
provides convenience wrappers around GTest that make writing test units
for Clutter easier.
This commit disables all tests in the conformance test suite, as well as
moving the data files outside of the tests/data directory; the next few
commits will re-establish the conformance test suite separately so we
can check that everything works in a reliable way.
2013-12-12 14:36:16 +00:00
|
|
|
mv $@.tmp $@)
|
|
|
|
|
|
|
|
|
|
CLEANFILES += $(installed_test_meta_DATA)
|
|
|
|
|
endif
|