From 5e26d17ea7298231255d0680a600ca4af4ddcd4d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 23 Jun 2013 23:33:05 -0400 Subject: [PATCH] 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 (cherry picked from commit 53f3eb421239982b69569ad03ccbfa4b4f601cf3) --- configure.ac | 11 +++++++++++ tests/Makefile.am | 6 ++++++ tests/conform/Makefile.am | 21 +++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/configure.ac b/configure.ac index d87c8650a..bbd25ad18 100644 --- a/configure.ac +++ b/configure.ac @@ -210,6 +210,17 @@ dnl Handle extra configure options 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 e23762ade..94ba34a6f 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 475bf6386..8cadab1a4 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -199,3 +199,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