[gjs/wip/jtojnar/nixos-fixes: 2/3] build: Use installed_tests_execdir in the .test files

[Jan Tojnar <jtojnar src gnome org>]

commit 1a81f40e8783fe97dd00f009eb0d9ad45297e831
Author: Jan Tojnar <jtojnar gmail com>
Date:   Sun Mar 15 01:45:16 2020 +0100

    build: Use installed_tests_execdir in the .test files
    
    Let's use installed_tests_execdir in the test description files as promissed.
    This will again make it easier for distros to move the installed tests elsewhere.

 installed-tests/debugger.test.in    | 2 +-
 installed-tests/js/meson.build      | 4 ++--
 installed-tests/meson.build         | 4 ++--
 installed-tests/minijasmine.test.in | 2 +-
 installed-tests/script.test.in      | 2 +-
 meson.build                         | 1 -
 6 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/installed-tests/debugger.test.in b/installed-tests/debugger.test.in
index 67d4c3ad..57e01ac7 100644
--- a/installed-tests/debugger.test.in
+++ b/installed-tests/debugger.test.in
@@ -1,4 +1,4 @@
 [Test]
 Type=session
-Exec=@pkglibexecdir@/installed-tests/debugger-test.sh @pkglibexecdir@/installed-tests/debugger/@name@
+Exec=@installed_tests_execdir@/debugger-test.sh @installed_tests_execdir@/debugger/@name@
 Output=TAP
diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
index 42cb1b82..3dc23f72 100644
--- a/installed-tests/js/meson.build
+++ b/installed-tests/js/meson.build
@@ -148,7 +148,7 @@ foreach test : jasmine_tests
 
     test_description_subst = {
         'name': 'test@0@.js'.format(test),
-        'pkglibexecdir': abs_pkglibexecdir,
+        'installed_tests_execdir': installed_tests_execdir,
     }
     test_description = configure_file(configuration: test_description_subst,
         input: '../minijasmine.test.in',
@@ -174,7 +174,7 @@ endif
 
 gdbus_test_description_subst = {
     'name': 'testGDBus.js',
-    'pkglibexecdir': abs_pkglibexecdir,
+    'installed_tests_execdir': installed_tests_execdir,
 }
 gdbus_test_description = configure_file(
     configuration: gdbus_test_description_subst,
diff --git a/installed-tests/meson.build b/installed-tests/meson.build
index 47648955..7e842025 100644
--- a/installed-tests/meson.build
+++ b/installed-tests/meson.build
@@ -24,7 +24,7 @@ foreach test : simple_tests
 
     test_description_subst = {
         'name': 'test@0@.sh'.format(test),
-        'pkglibexecdir': abs_pkglibexecdir,
+        'installed_tests_execdir': installed_tests_execdir,
     }
     test_description = configure_file(configuration: test_description_subst,
         input: 'script.test.in', output: 'test@0  sh test'.format(test),
@@ -76,7 +76,7 @@ foreach test : debugger_tests
 
     test_description_subst = {
         'name': '@0@.debugger'.format(test),
-        'pkglibexecdir': abs_pkglibexecdir,
+        'installed_tests_execdir': installed_tests_execdir,
     }
     test_description = configure_file(configuration: test_description_subst,
         input: 'debugger.test.in',
diff --git a/installed-tests/minijasmine.test.in b/installed-tests/minijasmine.test.in
index 0069da3b..f3b8d5b2 100644
--- a/installed-tests/minijasmine.test.in
+++ b/installed-tests/minijasmine.test.in
@@ -1,4 +1,4 @@
 [Test]
 Type=session
-Exec=@pkglibexecdir@/installed-tests/minijasmine @pkglibexecdir@/installed-tests/js/@name@
+Exec=@installed_tests_execdir@/minijasmine @installed_tests_execdir@/js/@name@
 Output=TAP
diff --git a/installed-tests/script.test.in b/installed-tests/script.test.in
index 6b0d4038..03c1b059 100644
--- a/installed-tests/script.test.in
+++ b/installed-tests/script.test.in
@@ -1,4 +1,4 @@
 [Test]
 Type=session
-Exec=sh @pkglibexecdir@/installed-tests/scripts/@name@
+Exec=sh @installed_tests_execdir@/scripts/@name@
 Output=TAP
diff --git a/meson.build b/meson.build
index 2e61801f..9064085f 100644
--- a/meson.build
+++ b/meson.build
@@ -302,7 +302,6 @@ configure_file(output: 'config.h', configuration: header_conf)
 
 gjsjsdir = get_option('datadir') / api_name
 pkglibexecdir = get_option('libexecdir') / meson.project_name()
-abs_pkglibexecdir = get_option('prefix') / pkglibexecdir
 abs_datadir = get_option('prefix') / get_option('datadir')
 pkglibdir = get_option('libdir') / meson.project_name()