diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2013-06-23 23:33:05 -0400 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2013-07-09 17:43:43 +0100 |
| commit | 53f3eb421239982b69569ad03ccbfa4b4f601cf3 (patch) | |
| tree | 3aaecd5534bd1889df6b863700d22bfcad02fd1a | |
| parent | f5b8d98676ab3e90ad80459019c737ec2ff90aa4 (diff) | |
| download | cogl-53f3eb421239982b69569ad03ccbfa4b4f601cf3.tar.gz | |
Install conformance tests
Install the conformance tests, and metadata to run them
with gnome-desktop-testing-runner.
https://bugzilla.gnome.org/show_bug.cgi?id=702942
Reviewed-by: Robert Bragg <robert@linux.intel.com>
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/conform/Makefile.am | 21 |
3 files changed, 38 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 5d9094a9..c5d56609 100644 --- a/configure.ac +++ b/configure.ac @@ -201,6 +201,17 @@ dnl ================================================================ dnl ============================================================ +dnl Installed tests +dnl ============================================================ + +AC_ARG_ENABLE(installed_tests, + AS_HELP_STRING([--enable-installed-tests], + [Install test programs (default: no)]),, + [enable_installed_tests=no]) +AM_CONDITIONAL(ENABLE_INSTALLED_TESTS, test x$enable_installed_tests = xyes) + + +dnl ============================================================ dnl Emscripten support dnl ============================================================ diff --git a/tests/Makefile.am b/tests/Makefile.am index e23762ad..94ba34a6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,3 +23,9 @@ endif # run make test as part of make check check-local: test + +if ENABLE_INSTALLED_TESTS +insttestdir = $(libexecdir)/installed-tests/$(PACKAGE) +insttest_SCRIPTS = run-tests.sh +insttest_DATA = config.env +endif diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am index 96486779..585d304f 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -203,3 +203,24 @@ DISTCLEANFILES += ../../build/win32/vs9/test-conformance-cogl.vcproj \ # we cannot use CLEANFILES clean-generic: clean-wrappers $(QUIET_RM)rm -f .log + + +if ENABLE_INSTALLED_TESTS + +insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)/conform +insttest_PROGRAMS = test-conformance +insttest_DATA = unit-tests + +testmetadir = $(datadir)/installed-tests/$(PACKAGE) +testmeta_DATA = conform.test + +conform.test: + echo " GEN $@"; \ + echo "[Test]" > $@.tmp; \ + echo "Type=session" >> $@.tmp; \ + echo "Exec=sh -c \"cd $(libexecdir)/installed-tests/$(PACKAGE)/conform; ../run-tests.sh ../config.env ./test-conformance\"" >> $@.tmp; \ + mv $@.tmp $@ + +CLEANFILES = conform.test + +endif |