[mutter] build: Namespace installed tests of private libraries

[Florian Müllner <fmuellner src gnome org>]

commit 28c9b6e1d7b44c50e9f093778532b7b220a0df5a
Author: Florian Müllner <fmuellner gnome org>
Date:   Fri Apr 29 13:16:30 2016 +0200

    build: Namespace installed tests of private libraries
    
    Currently our private cogl/clutter forks still install tests as
    cogl/clutter, which conflicts with the original libraries.

 clutter/tests/conform/Makefile.am |    2 ++
 cogl/tests/Makefile.am            |    2 +-
 cogl/tests/conform/Makefile.am    |    6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/clutter/tests/conform/Makefile.am b/clutter/tests/conform/Makefile.am
index 92deaf7..69e5dd4 100644
--- a/clutter/tests/conform/Makefile.am
+++ b/clutter/tests/conform/Makefile.am
@@ -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
 
 AM_CFLAGS = -g $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
diff --git a/cogl/tests/Makefile.am b/cogl/tests/Makefile.am
index 94ba34a..7e48329 100644
--- a/cogl/tests/Makefile.am
+++ b/cogl/tests/Makefile.am
@@ -25,7 +25,7 @@ endif
 check-local: test
 
 if ENABLE_INSTALLED_TESTS
-insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)
+insttestdir = $(libexecdir)/installed-tests/mutter-cogl
 insttest_SCRIPTS = run-tests.sh
 insttest_DATA = config.env
 endif
diff --git a/cogl/tests/conform/Makefile.am b/cogl/tests/conform/Makefile.am
index a8087ce..b2c5323 100644
--- a/cogl/tests/conform/Makefile.am
+++ b/cogl/tests/conform/Makefile.am
@@ -158,18 +158,18 @@ clean-generic: clean-wrappers
 
 if ENABLE_INSTALLED_TESTS
 
-insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)/conform
+insttestdir = $(libexecdir)/installed-tests/mutter-cogl/conform
 insttest_PROGRAMS = test-conformance
 insttest_DATA = unit-tests
 
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)
+testmetadir = $(datadir)/installed-tests/mutter-cogl
 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; \
+       echo "Exec=sh -c \"cd $(libexecdir)/installed-tests/mutter-cogl/conform; ../run-tests.sh 
../config.env ./test-conformance\"" >> $  tmp; \
        mv $  tmp $@
 
 CLEANFILES = conform.test