[gjs/gnome-3-36] build: Use more traditional installed-tests variables

[Philip Chimento <pchimento src gnome org>]

commit 34a68df6aa9de1acb0e682d5fbf7a39458d585f8
Author: Jan Tojnar <jtojnar gmail com>
Date:   Sun Mar 15 01:40:42 2020 +0100

    build: Use more traditional installed-tests variables

 installed-tests/js/meson.build | 16 ++++++++--------
 installed-tests/meson.build    | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
index 3b355cda..f0f6ccdd 100644
--- a/installed-tests/js/meson.build
+++ b/installed-tests/js/meson.build
@@ -6,11 +6,11 @@ jsunit_resources_files = gnome.compile_resources('jsunit-resources',
 minijasmine = executable('minijasmine', '../minijasmine.cpp',
     jsunit_resources_files, dependencies: libgjs_dep,
     cpp_args: [
-        '-DINSTTESTDIR="@0@"'.format(get_option('prefix') / installed_tests_dir),
+        '-DINSTTESTDIR="@0@"'.format(get_option('prefix') / installed_tests_execdir),
         '-DPKGLIBDIR="@0@"'.format(get_option('prefix') / pkglibdir)
     ],
     include_directories: top_include,
-    install: get_option('installed_tests'), install_dir: installed_tests_dir)
+    install: get_option('installed_tests'), install_dir: installed_tests_execdir)
 
 gidatadir = gi.get_pkgconfig_variable('gidatadir')
 gi_tests = gidatadir / 'tests'
@@ -50,7 +50,7 @@ regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes,
     identifier_prefix: 'Regress', symbol_prefix: 'regress_',
     extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args,
     install: get_option('installed_tests'), install_dir_gir: false,
-    install_dir_typelib: installed_tests_dir)
+    install_dir_typelib: installed_tests_execdir)
 regress_typelib = regress_gir[1]
 
 warnlib_sources = [
@@ -67,7 +67,7 @@ warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'],
     sources: warnlib_sources, namespace: 'WarnLib', nsversion: '1.0',
     symbol_prefix: 'warnlib_', header: 'warnlib.h',
     install: get_option('installed_tests'), install_dir_gir: false,
-    install_dir_typelib: installed_tests_dir)
+    install_dir_typelib: installed_tests_execdir)
 warnlib_typelib = warnlib_gir[1]
 
 gimarshallingtests_sources = [
@@ -83,7 +83,7 @@ gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests,
     namespace: 'GIMarshallingTests', nsversion: '1.0',
     symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error',
     install: get_option('installed_tests'), install_dir_gir: false,
-    install_dir_typelib: installed_tests_dir)
+    install_dir_typelib: installed_tests_execdir)
 gimarshallingtests_typelib = gimarshallingtests_gir[1]
 
 jasmine_tests = [
@@ -129,7 +129,7 @@ if not get_option('skip_gtk_tests')
     ]
 endif
 
-installed_js_tests_dir = installed_tests_dir / 'js'
+installed_js_tests_dir = installed_tests_execdir / 'js'
 
 gschemas_compiled = gnome.compile_schemas(
     depend_files: 'org.gnome.GjsTest.gschema.xml')
@@ -154,7 +154,7 @@ foreach test : jasmine_tests
         input: '../minijasmine.test.in',
         output: 'test@0@.test'.format(test),
         install: get_option('installed_tests'),
-        install_dir: test_descriptions_dir)
+        install_dir: installed_tests_metadir)
 
     if get_option('installed_tests')
         install_data(test_file, install_dir: installed_js_tests_dir)
@@ -180,7 +180,7 @@ gdbus_test_description = configure_file(
     configuration: gdbus_test_description_subst,
     input: '../minijasmine.test.in', output: 'testGDBus.test',
     install: get_option('installed_tests'),
-    install_dir: test_descriptions_dir)
+    install_dir: installed_tests_metadir)
 
 if get_option('installed_tests')
     install_data('testGDBus.js', install_dir: installed_js_tests_dir)
diff --git a/installed-tests/meson.build b/installed-tests/meson.build
index b6c4e449..91476dca 100644
--- a/installed-tests/meson.build
+++ b/installed-tests/meson.build
@@ -1,7 +1,7 @@
 ### Installed tests ############################################################
 
-installed_tests_dir = pkglibexecdir / 'installed-tests'
-test_descriptions_dir = (get_option('datadir') / 'installed-tests' /
+installed_tests_execdir = pkglibexecdir / 'installed-tests'
+installed_tests_metadir = (get_option('datadir') / 'installed-tests' /
     meson.project_name())
 
 # Simple shell script tests #
@@ -30,10 +30,10 @@ foreach test : simple_tests
     test_description = configure_file(configuration: test_description_subst,
         input: 'script.test.in', output: 'test@0  sh test'.format(test),
         install: get_option('installed_tests'),
-        install_dir: test_descriptions_dir)
+        install_dir: installed_tests_metadir)
 
     if get_option('installed_tests')
-        install_data(test_file, install_dir: installed_tests_dir / 'scripts')
+        install_data(test_file, install_dir: installed_tests_execdir / 'scripts')
     endif
 endforeach
 
@@ -65,7 +65,7 @@ debugger_tests = [
 
 debugger_test_driver = find_program(files('debugger-test.sh'))
 if get_option('installed_tests')
-    install_data('debugger-test.sh', install_dir: installed_tests_dir)
+    install_data('debugger-test.sh', install_dir: installed_tests_execdir)
 endif
 
 foreach test : debugger_tests
@@ -83,12 +83,12 @@ foreach test : debugger_tests
         input: 'debugger.test.in',
         output: '@0@.test'.format(test),
         install: get_option('installed_tests'),
-        install_dir: test_descriptions_dir)
+        install_dir: installed_tests_metadir)
 
     if get_option('installed_tests')
-        install_data(test_file, install_dir: installed_tests_dir / 'debugger')
+        install_data(test_file, install_dir: installed_tests_execdir / 'debugger')
         install_data('debugger' / '@0  debugger js'.format(test),
             'debugger' / '@0@.debugger.output'.format(test),
-            install_dir: installed_tests_dir / 'debugger')
+            install_dir: installed_tests_execdir / 'debugger')
     endif
 endforeach