isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Namespace installed tests of private libraries

Browse Source 
Currently our private cogl/clutter forks still install tests as
cogl/clutter, which conflicts with the original libraries.
This commit is contained in:
Florian Müllner 2016-04-29 13:16:30 +02:00
parent b6092cf4db
commit 28c9b6e1d7
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/tests/conform/Makefile.am
View File

@ -1,3 +1,5 @@
installed_test_metadir = $(datadir)/installed-tests/mutter-clutter
installed_testdir = $(libexecdir)/installed-tests/mutter-clutter
include $(top_srcdir)/build/autotools/glib-tap.mk include $(top_srcdir)/build/autotools/glib-tap.mk
AM_CFLAGS = -g $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) AM_CFLAGS = -g $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)

2
cogl/tests/Makefile.am
View File

@ -25,7 +25,7 @@ endif
check-local: test check-local: test
if ENABLE_INSTALLED_TESTS if ENABLE_INSTALLED_TESTS
insttestdir = $(libexecdir)/installed-tests/$(PACKAGE) insttestdir = $(libexecdir)/installed-tests/mutter-cogl
insttest_SCRIPTS = run-tests.sh insttest_SCRIPTS = run-tests.sh
insttest_DATA = config.env insttest_DATA = config.env
endif endif

6
cogl/tests/conform/Makefile.am
View File

@ -158,18 +158,18 @@ clean-generic: clean-wrappers
if ENABLE_INSTALLED_TESTS if ENABLE_INSTALLED_TESTS
insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)/conform insttestdir = $(libexecdir)/installed-tests/mutter-cogl/conform
insttest_PROGRAMS = test-conformance insttest_PROGRAMS = test-conformance
insttest_DATA = unit-tests insttest_DATA = unit-tests
testmetadir = $(datadir)/installed-tests/$(PACKAGE) testmetadir = $(datadir)/installed-tests/mutter-cogl
testmeta_DATA = conform.test testmeta_DATA = conform.test
conform.test: conform.test:
echo " GEN $@"; \ echo " GEN $@"; \
echo "[Test]" > $@.tmp; \ echo "[Test]" > $@.tmp; \
echo "Type=session" >> $@.tmp; \ echo "Type=session" >> $@.tmp; \
echo "Exec=sh -c \"cd $(libexecdir)/installed-tests/$(PACKAGE)/conform; ../run-tests.sh ../config.env ./test-conformance\"" >> $@.tmp; \ echo "Exec=sh -c \"cd $(libexecdir)/installed-tests/mutter-cogl/conform; ../run-tests.sh ../config.env ./test-conformance\"" >> $@.tmp; \
mv $@.tmp $@ mv $@.tmp $@
CLEANFILES = conform.test CLEANFILES = conform.test