Actually install the installed tests

Fixes https://github.com/hughsie/colord/issues/83

4 files changed, 23 insertions, 6 deletions

diff --git a/contrib/colord.spec.in b/contrib/colord.spec.in
index 09b1411..ef4d78a 100644
--- a/contrib/colord.spec.in
+++ b/contrib/colord.spec.in
@@ -107,6 +107,12 @@ Provides: shared-color-profiles-extra
 More color profiles for color management that are less commonly used.
 This may be useful for CMYK soft-proofing or for extra device support.
 
+%package tests
+Summary: Data files for installed tests
+
+%description tests
+Data files for installed tests.
+
 %prep
 %setup -q
 
@@ -118,6 +124,7 @@ ulimit -Sv 2000000
 
 %meson \
     -Dvapi=true \
+    -Dinstalled_tests=true \
 %if 0%{?build_print_profiles}
     -Dprint_profiles=true \
 %else
@@ -278,6 +285,12 @@ exit 0
 %dir %{_datadir}/gtk-doc/html/colord
 %{_datadir}/gtk-doc/html/colord/*
 
+%files tests
+%dir %{_libexecdir}/installed-tests/colord
+%{_libexecdir}/installed-tests/colord/*
+%dir %{_datadir}/installed-tests/colord
+%{_datadir}/installed-tests/colord/*
+
 %changelog
 * #LONGDATE# Richard Hughes <richard@hughsie.com> #VERSION#-0.#BUILD##ALPHATAG#
 - Update from git
diff --git a/lib/colord/colord-daemon.test.in b/lib/colord/colord-daemon.test.in
index 3e01e7f..91047a6 100644
--- a/lib/colord/colord-daemon.test.in
+++ b/lib/colord/colord-daemon.test.in
@@ -1,5 +1,5 @@
 [Test]
 Description=colord daemon tests
-Exec=env INSTALLED_TESTS=1 @installedtestsdir@/cd-test-daemon
+Exec=env INSTALLED_TESTS=1 @installedtestsdir@/colord-test-daemon
 Type=session
 Output=TAP
diff --git a/lib/colord/colord-private.test.in b/lib/colord/colord-private.test.in
index fc413ec..17d5792 100644
--- a/lib/colord/colord-private.test.in
+++ b/lib/colord/colord-private.test.in
@@ -1,5 +1,5 @@
 [Test]
 Description=colord private tests
-Exec=env INSTALLED_TESTS=1 @installedtestsdir@/cd-test-private
+Exec=env INSTALLED_TESTS=1 @installedtestsdir@/colord-test-private
 Type=session
 Output=TAP
diff --git a/lib/colord/meson.build b/lib/colord/meson.build
index e763bcb..a46ca18 100644
--- a/lib/colord/meson.build
+++ b/lib/colord/meson.build
@@ -233,7 +233,7 @@ endif
 if get_option('tests')
   testdatadir = join_paths(meson.source_root(), 'data', 'tests')
   e = executable(
-    'colord-self-test-private',
+    'colord-test-private',
     sources : [
       'cd-test-private.c',
       'cd-test-shared.h',
@@ -252,10 +252,12 @@ if get_option('tests')
       cargs,
       '-DTESTDATADIR="' + testdatadir + '"',
     ],
+    install : get_option('installed_tests'),
+    install_dir : join_paths(libexecdir, 'installed-tests', 'colord'),
   )
-  test('colord-self-test-private', e)
+  test('colord-test-private', e)
   e = executable(
-    'colord-self-test-daemon',
+    'colord-test-daemon',
     sources : [
       'cd-test-daemon.c',
       'cd-test-shared.h',
@@ -274,6 +276,8 @@ if get_option('tests')
       cargs,
       '-DTESTDATADIR="' + testdatadir + '"',
     ],
+    install : get_option('installed_tests'),
+    install_dir : join_paths(libexecdir, 'installed-tests', 'colord'),
   )
-  test('colord-self-test-daemon', e)
+  test('colord-test-daemon', e)
 endif