From 8dfab0b08c86989e5c911db472b7677f60c1b978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Mon, 18 Oct 2021 15:47:00 +0100
Subject: [PATCH] meson: update for meson.build_root() and .build_source()
 deprecation

-> use meson.project_build_root() or .global_build_root() instead.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1183>
---
 meson.build                                               | 4 ++--
 subprojects/gst-devtools/validate/launcher/meson.build    | 4 ++--
 subprojects/gst-devtools/validate/tests/check/meson.build | 2 +-
 .../validate/tests/launcher_tests/meson.build             | 4 ++--
 subprojects/gst-docs/meson.build                          | 2 +-
 subprojects/gst-editing-services/tests/check/meson.build  | 6 +++---
 subprojects/gst-examples/webrtc/check/meson.build         | 6 +++---
 .../gst-examples/webrtc/sendrecv/gst-sharp/meson.build    | 4 ++--
 subprojects/gst-libav/tests/check/meson.build             | 4 ++--
 subprojects/gst-omx/tests/check/meson.build               | 4 ++--
 subprojects/gst-plugins-bad/tests/check/meson.build       | 4 ++--
 subprojects/gst-plugins-bad/tests/validate/meson.build    | 4 ++--
 subprojects/gst-plugins-base/tests/check/meson.build      | 8 ++++----
 subprojects/gst-plugins-base/tests/validate/meson.build   | 4 ++--
 subprojects/gst-plugins-good/tests/check/meson.build      | 4 ++--
 subprojects/gst-plugins-ugly/tests/check/meson.build      | 4 ++--
 subprojects/gst-python/testsuite/meson.build              | 8 ++++----
 subprojects/gst-rtsp-server/tests/check/meson.build       | 4 ++--
 subprojects/gstreamer-sharp/Tests/meson.build             | 4 ++--
 subprojects/gstreamer-vaapi/tests/check/meson.build       | 2 +-
 subprojects/gstreamer/tests/check/meson.build             | 2 +-
 subprojects/gstreamer/tests/validate/meson.build          | 6 +++---
 tests/python/meson.build                                  | 4 ++--
 23 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/meson.build b/meson.build
index af130e9ecf..f7f373a64d 100644
--- a/meson.build
+++ b/meson.build
@@ -384,9 +384,9 @@ endforeach
 message('Building subprojects: ' + ', '.join(subprojects_names))
 
 setenv = find_program('gst-env.py')
-devenv_cmd = [setenv, '--builddir=@0@'.format(meson.build_root()),
+devenv_cmd = [setenv, '--builddir=@0@'.format(meson.project_build_root()),
               '--gstbuilddir=@0@'.format(meson.current_build_dir()),
-              '--srcdir=@0@'.format(meson.source_root())]
+              '--srcdir=@0@'.format(meson.project_source_root())]
 
 subdir('tests')
 if meson.has_exe_wrapper() and build_machine.system() == 'linux' and host_machine.system() == 'windows'
diff --git a/subprojects/gst-devtools/validate/launcher/meson.build b/subprojects/gst-devtools/validate/launcher/meson.build
index b767956868..6038295616 100644
--- a/subprojects/gst-devtools/validate/launcher/meson.build
+++ b/subprojects/gst-devtools/validate/launcher/meson.build
@@ -2,8 +2,8 @@ _launcherdir = get_option('libdir') + '/gst-validate-launcher/python/launcher/'
 
 launcher_configure = configuration_data()
 launcher_configure.set('GST_VALIDATE_TESTSUITE_VERSION', '@0@'.format(TESTSUITE_VERSION))
-launcher_configure.set('BUILDDIR', meson.build_root())
-launcher_configure.set('SRCDIR', meson.source_root())
+launcher_configure.set('BUILDDIR', meson.global_build_root())
+launcher_configure.set('SRCDIR', meson.global_source_root())
 launcher_configure.set('DATADIR', join_paths(get_option('prefix'), get_option('datadir')))
 launcher_configure.set('LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
 
diff --git a/subprojects/gst-devtools/validate/tests/check/meson.build b/subprojects/gst-devtools/validate/tests/check/meson.build
index c70c556f3d..2960a43a66 100644
--- a/subprojects/gst-devtools/validate/tests/check/meson.build
+++ b/subprojects/gst-devtools/validate/tests/check/meson.build
@@ -30,7 +30,7 @@ foreach t : validate_tests
     env = environment()
     env.set('GST_STATE_IGNORE_ELEMENTS', '')
     env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
-    env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
+    env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs)
     env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name))
     env.set('GST_PLUGIN_SCANNER_1_0', gst_plugin_scanner_path)
 
diff --git a/subprojects/gst-devtools/validate/tests/launcher_tests/meson.build b/subprojects/gst-devtools/validate/tests/launcher_tests/meson.build
index 9d5382e51c..f04884d1b6 100644
--- a/subprojects/gst-devtools/validate/tests/launcher_tests/meson.build
+++ b/subprojects/gst-devtools/validate/tests/launcher_tests/meson.build
@@ -4,11 +4,11 @@ if launcher.found()
     env = environment()
     env.set('GST_STATE_IGNORE_ELEMENTS', '')
     env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
-    env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
+    env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs)
     env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name))
     env.set('GST_PLUGIN_SCANNER_1_0', gst_plugin_scanner_path)
 
-    test(test_name, launcher, args: ['-o', meson.build_root() + '/validate-launcher-output/',
+    test(test_name, launcher, args: ['-o', meson.project_build_root() + '/validate-launcher-output/',
       meson.current_source_dir() + '/test_validate.py', '--validate-tools-path',
       join_paths(meson.current_build_dir(), '..', '..', 'tools')],
       env: env)
diff --git a/subprojects/gst-docs/meson.build b/subprojects/gst-docs/meson.build
index 045a4b13ea..821d3b96c5 100644
--- a/subprojects/gst-docs/meson.build
+++ b/subprojects/gst-docs/meson.build
@@ -44,7 +44,7 @@ with open(fname, 'r') as f:
 
   # gst-build will generate this file for us to consume so that subproject
   # changes can still work
-  fname = join_paths(meson.build_root(), 'GstDocumentedSubprojects')
+  fname = join_paths(meson.project_build_root(), '..', '..', 'GstDocumentedSubprojects')
   cmdres = run_command(
       python3,
       '-c', read_file_contents,
diff --git a/subprojects/gst-editing-services/tests/check/meson.build b/subprojects/gst-editing-services/tests/check/meson.build
index ec732540bd..34c1344785 100644
--- a/subprojects/gst-editing-services/tests/check/meson.build
+++ b/subprojects/gst-editing-services/tests/check/meson.build
@@ -63,7 +63,7 @@ foreach t : ges_tests
     env.set('GST_STATE_IGNORE_ELEMENTS', '')
     env.set('CK_DEFAULT_TIMEOUT', '20')
     env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name))
-    env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
+    env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs)
 
     exe = executable(test_name, fname,
         'ges/test-utils.c', 'nle/common.c',
@@ -99,7 +99,7 @@ if gstvalidate_dep.found()
     env.set('GST_STATE_IGNORE_ELEMENTS', '')
     env.set('CK_DEFAULT_TIMEOUT', '20')
     env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), 'scenarios'))
-    env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
+    env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs)
     env.set('GST_VALIDATE_LOGSDIR', meson.current_build_dir() / scenario)
     env.set('GST_PLUGIN_SCANNER_1_0', gst_plugin_scanner_path)
 
@@ -129,7 +129,7 @@ if build_gir
     env.set('GST_STATE_IGNORE_ELEMENTS', '')
     env.set('CK_DEFAULT_TIMEOUT', '20')
     env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), 'scenarios'))
-    env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
+    env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs)
     env.set('GI_TYPELIB_PATH', meson.current_build_dir() / '..' / '..' / 'ges')
 
     test('pythontests', runtests, args: ['--pyunittest-dir', meson.current_source_dir(), 'pyunittest', '--dump-on-failure'],
diff --git a/subprojects/gst-examples/webrtc/check/meson.build b/subprojects/gst-examples/webrtc/check/meson.build
index 15fc8bc15b..c3b64ed2f6 100644
--- a/subprojects/gst-examples/webrtc/check/meson.build
+++ b/subprojects/gst-examples/webrtc/check/meson.build
@@ -15,8 +15,8 @@ if openssl.found() and have_webrtc_check_deps
       depends: test_deps,
       args : files(elem.get(1)),
       # XXX: This PYTHONPATH hack is fun
-      env : ['PYTHONPATH=' + join_paths(meson.source_root(), 'sendrecv', 'gst') + ':' + join_paths(meson.source_root(), 'signalling'),
-             'TEST_HTML_SOURCE=' + join_paths(meson.source_root(), 'sendrecv', 'js'),
-             'TEST_CA_CERT_PATH=' + join_paths(meson.build_root(), 'signalling')])
+      env : ['PYTHONPATH=' + join_paths(meson.project_source_root(), 'sendrecv', 'gst') + ':' + join_paths(meson.project_source_root(), 'signalling'),
+             'TEST_HTML_SOURCE=' + join_paths(meson.project_source_root(), 'sendrecv', 'js'),
+             'TEST_CA_CERT_PATH=' + join_paths(meson.project_build_root(), 'signalling')])
   endforeach
 endif
diff --git a/subprojects/gst-examples/webrtc/sendrecv/gst-sharp/meson.build b/subprojects/gst-examples/webrtc/sendrecv/gst-sharp/meson.build
index 6cc171f62c..4e518dfd2a 100644
--- a/subprojects/gst-examples/webrtc/sendrecv/gst-sharp/meson.build
+++ b/subprojects/gst-examples/webrtc/sendrecv/gst-sharp/meson.build
@@ -14,7 +14,7 @@ foreach dependency, version: { 'Newtonsoft.Json': '11.0.2', 'WebSocketSharp': '1
         '--nuget-version', version,
         '--csharp-version=net45',
         '--current-builddir', meson.current_build_dir(),
-        '--builddir', meson.build_root(),
+        '--builddir', meson.global_build_root(),  # FIXME: --builddir specified twice?!
     )
 
     if get_dep.returncode() != 0
@@ -33,4 +33,4 @@ dependencies += [dependency('gstreamer-sharp-1.0', fallback: ['gstreamer-sharp',
 
 message('Execute with MONO_PATH=@0@:$MONO_PATH @1@/WebRTCSendRecv.exe'.format(mono_path, meson.current_build_dir()))
 executable('WebRTCSendRecv', 'WebRTCSendRecv.cs',
-    cs_args: ['-unsafe'], dependencies: dependencies)
\ No newline at end of file
+    cs_args: ['-unsafe'], dependencies: dependencies)
diff --git a/subprojects/gst-libav/tests/check/meson.build b/subprojects/gst-libav/tests/check/meson.build
index 42070551e2..2ba3714375 100644
--- a/subprojects/gst-libav/tests/check/meson.build
+++ b/subprojects/gst-libav/tests/check/meson.build
@@ -43,8 +43,8 @@ foreach t : libav_tests
     env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
     env.set('CK_DEFAULT_TIMEOUT', '20')
     env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', 'gst-plugins-base',
-      'gst-libav@' + meson.build_root())
-    env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
+      'gst-libav@' + meson.project_build_root())
+    env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs)
     env.set('GSETTINGS_BACKEND', 'memory')
 
     env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name)))
diff --git a/subprojects/gst-omx/tests/check/meson.build b/subprojects/gst-omx/tests/check/meson.build
index 0871911cfb..4bb7de6976 100644
--- a/subprojects/gst-omx/tests/check/meson.build
+++ b/subprojects/gst-omx/tests/check/meson.build
@@ -40,8 +40,8 @@ foreach t : omx_tests
     env.set('GST_STATE_IGNORE_ELEMENTS', state_ignore_elements)
     env.set('CK_DEFAULT_TIMEOUT', '20')
     env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', 'gst-plugins-base',
-      'gst-plugins-good', 'gst-omx@' + meson.build_root(), separator: ':')
-    env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
+      'gst-plugins-good', 'gst-omx@' + meson.project_build_root(), separator: ':')
+    env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs)
     env.set('GSETTINGS_BACKEND', 'memory')
     env.set('GST_OMX_CONFIG_DIR', omx_config_dir)
 
diff --git a/subprojects/gst-plugins-bad/tests/check/meson.build b/subprojects/gst-plugins-bad/tests/check/meson.build
index 58e6e2577a..7b6aeb66eb 100644
--- a/subprojects/gst-plugins-bad/tests/check/meson.build
+++ b/subprojects/gst-plugins-bad/tests/check/meson.build
@@ -214,11 +214,11 @@ foreach t : base_tests
     env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
     env.set('CK_DEFAULT_TIMEOUT', '20')
     env.set('GST_STATE_IGNORE_ELEMENTS', '')
-    env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
+    env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs)
     env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name)))
     env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', 'gst-plugins-base',
       'gst-plugins-good', 'gst-plugins-ugly','gst-libav', 'libnice',
-      'gst-plugins-bad@' + meson.build_root())
+      'gst-plugins-bad@' + meson.project_build_root())
     env.set('GST_PLUGIN_SCANNER_1_0', gst_plugin_scanner_path)
     test(test_name, exe, env: env, timeout: 3 * 60)
   endif
diff --git a/subprojects/gst-plugins-bad/tests/validate/meson.build b/subprojects/gst-plugins-bad/tests/validate/meson.build
index fd154e3ea9..12f3d260f4 100644
--- a/subprojects/gst-plugins-bad/tests/validate/meson.build
+++ b/subprojects/gst-plugins-bad/tests/validate/meson.build
@@ -8,12 +8,12 @@ tests = [
 ]
 
 env = environment()
-env.set('GST_PLUGIN_PATH_1_0', meson.build_root(), pluginsdirs)
+env.set('GST_PLUGIN_PATH_1_0', meson.global_build_root(), pluginsdirs)
 env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
 env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), 'validate'))
 env.set('GST_PLUGIN_SCANNER_1_0', gst_plugin_scanner_path)
 env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', 'gst-validate', 'gst-plugins-base',
-    'gst-plugins-bad@' + meson.build_root())
+    'gst-plugins-bad@' + meson.project_build_root())
 
 foreach t: tests
     test_dir_name = t.split('/')
diff --git a/subprojects/gst-plugins-base/tests/check/meson.build b/subprojects/gst-plugins-base/tests/check/meson.build
index fa670b08f7..f135c1ffb9 100644
--- a/subprojects/gst-plugins-base/tests/check/meson.build
+++ b/subprojects/gst-plugins-base/tests/check/meson.build
@@ -161,13 +161,13 @@ foreach t : base_tests
     )
 
     env = environment()
-    env.set('GST_PLUGIN_PATH_1_0', meson.build_root(), pluginsdirs)
+    env.set('GST_PLUGIN_PATH_1_0', meson.global_build_root(), pluginsdirs)
     env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
     env.set('GST_STATE_IGNORE_ELEMENTS', 'cdio cdparanoiasrc libvisual_ alsasrc alsasink')
     env.set('CK_DEFAULT_TIMEOUT', '20')
     env.set('GST_TAG_LICENSE_TRANSLATIONS_DICT', join_paths(gst_tag_dir, 'license-translations.dict'))
     env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer',
-        'gst-plugins-base@' + meson.build_root())
+        'gst-plugins-base@' + meson.project_build_root())
     env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name)))
     env.set('GST_PLUGIN_SCANNER_1_0', gst_plugin_scanner_path)
     test(test_name, exe, env: env, timeout: 3 * 60)
@@ -184,13 +184,13 @@ foreach group : [1, 2, 3, 4, 5, 6]
 
   # TODO Use env.copy when it is in meson
   env = environment()
-  env.set('GST_PLUGIN_PATH_1_0', meson.build_root(), pluginsdirs)
+  env.set('GST_PLUGIN_PATH_1_0', meson.global_build_root(), pluginsdirs)
   env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
   env.set('GST_STATE_IGNORE_ELEMENTS', 'cdio cdparanoiasrc libvisual_ alsasrc alsasink')
   env.set('CK_DEFAULT_TIMEOUT', '20')
   env.set('GST_TAG_LICENSE_TRANSLATIONS_DICT', join_paths(gst_tag_dir, 'license-translations.dict'))
   env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer',
-      'gst-plugins-base@' + meson.build_root())
+      'gst-plugins-base@' + meson.project_build_root())
   env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(vscale_test_name)))
   env.set('GST_PLUGIN_SCANNER_1_0', gst_plugin_scanner_path)
 
diff --git a/subprojects/gst-plugins-base/tests/validate/meson.build b/subprojects/gst-plugins-base/tests/validate/meson.build
index d1ecbaaf99..82d22a4b0b 100644
--- a/subprojects/gst-plugins-base/tests/validate/meson.build
+++ b/subprojects/gst-plugins-base/tests/validate/meson.build
@@ -23,12 +23,12 @@ tests = [
 ]
 
 env = environment()
-env.set('GST_PLUGIN_PATH_1_0', meson.build_root(), pluginsdirs)
+env.set('GST_PLUGIN_PATH_1_0', meson.global_build_root(), pluginsdirs)
 env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
 env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), 'validate'))
 env.set('GST_PLUGIN_SCANNER_1_0', gst_plugin_scanner_path)
 env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', 'gst-validate',
-    'gst-plugins-base@' + meson.build_root())
+    'gst-plugins-base@' + meson.project_build_root())
 
 foreach t: tests
     test_dir_name = t.split('/')
diff --git a/subprojects/gst-plugins-good/tests/check/meson.build b/subprojects/gst-plugins-good/tests/check/meson.build
index 73db4d75fd..1920768091 100644
--- a/subprojects/gst-plugins-good/tests/check/meson.build
+++ b/subprojects/gst-plugins-good/tests/check/meson.build
@@ -210,8 +210,8 @@ foreach t : good_tests
     env.set('GST_STATE_IGNORE_ELEMENTS', state_ignore_elements)
     env.set('CK_DEFAULT_TIMEOUT', '20')
     env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', 'gst-plugins-base',
-      'timecode', 'gst-plugins-good@' + meson.build_root())
-    env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
+      'timecode', 'gst-plugins-good@' + meson.project_build_root())
+    env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs)
     env.set('GSETTINGS_BACKEND', 'memory')
 
     env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name)))
diff --git a/subprojects/gst-plugins-ugly/tests/check/meson.build b/subprojects/gst-plugins-ugly/tests/check/meson.build
index c113037f52..0d59258582 100644
--- a/subprojects/gst-plugins-ugly/tests/check/meson.build
+++ b/subprojects/gst-plugins-ugly/tests/check/meson.build
@@ -72,8 +72,8 @@ foreach t : ugly_tests
     env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
     env.set('CK_DEFAULT_TIMEOUT', '20')
     env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', 'gst-plugins-base',
-      'gst-plugins-good', 'gst-plugins-ugly@' + meson.build_root())
-    env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
+      'gst-plugins-good', 'gst-plugins-ugly@' + meson.project_build_root())
+    env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs)
     env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name)))
     env.set('GST_PLUGIN_SCANNER_1_0', gst_plugin_scanner_path)
     test(test_name, exe, env: env, timeout: 3 * 60)
diff --git a/subprojects/gst-python/testsuite/meson.build b/subprojects/gst-python/testsuite/meson.build
index 8b261f4cad..8ead4b7b4c 100644
--- a/subprojects/gst-python/testsuite/meson.build
+++ b/subprojects/gst-python/testsuite/meson.build
@@ -33,16 +33,16 @@ if gst_dep.type_name() == 'pkgconfig'
                  pbase.get_variable('pluginsdir')]
 endif
 
-pypluginsdir = [join_paths (meson.build_root(), 'plugin'), meson.current_source_dir()]
+pypluginsdir = [join_paths (meson.project_build_root(), 'plugin'), meson.current_source_dir()]
 
 foreach i: tests
     test_name = i.get(0)
     env = environment()
     env.set('GST_OVERRIDE_SRC_PATH', join_paths (meson.current_source_dir(), '..', 'gi', 'overrides'))
     env.set('GST_OVERRIDE_BUILD_PATH', join_paths (meson.current_build_dir(), '..', 'gi', 'overrides'))
-    env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer',
-        'gst-plugins-base@' + meson.build_root(), 'gst-python@' + meson.build_root())
-    env.set('GST_PLUGIN_PATH_1_0', meson.build_root(), pluginsdirs + pypluginsdir)
+    env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', 'gst-plugins-base',
+        'gst-python@' + meson.project_build_root())
+    env.set('GST_PLUGIN_PATH_1_0', meson.global_build_root(), pluginsdirs + pypluginsdir)
     env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name)))
     test(test_name, python, args: [runtests, i.get(1)], env: env)
 endforeach
diff --git a/subprojects/gst-rtsp-server/tests/check/meson.build b/subprojects/gst-rtsp-server/tests/check/meson.build
index 0cf78aa594..229af32f81 100644
--- a/subprojects/gst-rtsp-server/tests/check/meson.build
+++ b/subprojects/gst-rtsp-server/tests/check/meson.build
@@ -47,10 +47,10 @@ foreach test_name : rtsp_server_tests
   env = environment()
   env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
   env.set('GST_STATE_IGNORE_ELEMENTS', '')
-  env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer:gst-plugins-base:gst-plugins-good:gst-plugins-bad:gst-rtsp-server@' + meson.build_root())
+  env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer:gst-plugins-base:gst-plugins-good:gst-plugins-bad:gst-rtsp-server@' + meson.project_build_root())
   env.set('CK_DEFAULT_TIMEOUT', '120')
   env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name)))
-  env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
+  env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs)
   env.set('GST_PLUGIN_SCANNER_1_0', gst_plugin_scanner_path)
 
   exe = executable(test_name, fname,
diff --git a/subprojects/gstreamer-sharp/Tests/meson.build b/subprojects/gstreamer-sharp/Tests/meson.build
index a7052bcf7a..8e50ead9f2 100644
--- a/subprojects/gstreamer-sharp/Tests/meson.build
+++ b/subprojects/gstreamer-sharp/Tests/meson.build
@@ -12,7 +12,7 @@ if nunit_console.found()
         '--nuget-version', nunit_version,
         '--csharp-version=net45',
         '--current-builddir', meson.current_build_dir(),
-        '--builddir', meson.build_root(),
+        '--builddir', meson.build_root(), # FIXME: --builddir specified twice?!
     )
 
 
@@ -50,4 +50,4 @@ if nunit_console.found()
     endif
 else
     message('Could not find nunit-console, can\'t run unitests')
-endif
\ No newline at end of file
+endif
diff --git a/subprojects/gstreamer-vaapi/tests/check/meson.build b/subprojects/gstreamer-vaapi/tests/check/meson.build
index d717437c45..31fe0d98a8 100644
--- a/subprojects/gstreamer-vaapi/tests/check/meson.build
+++ b/subprojects/gstreamer-vaapi/tests/check/meson.build
@@ -28,7 +28,7 @@ foreach t : tests
   env = environment()
   env.set('CK_DEFAULT_TIMEOUT', '20')
   env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
-  env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
+  env.set('GST_PLUGIN_PATH_1_0', [meson.global_build_root()] + pluginsdirs)
   env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name)))
   exe = executable(test_name, fname, extra_sources,
     include_directories : [configinc, libsinc],
diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build
index a617cf1594..9c4228b6e4 100644
--- a/subprojects/gstreamer/tests/check/meson.build
+++ b/subprojects/gstreamer/tests/check/meson.build
@@ -154,7 +154,7 @@ foreach t : core_tests
     )
 
     env = environment()
-    env.set('GST_PLUGIN_PATH_1_0', meson.build_root())
+    env.set('GST_PLUGIN_PATH_1_0', meson.project_build_root())
     env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
     env.set('GST_STATE_IGNORE_ELEMENTS', '')
     env.set('CK_DEFAULT_TIMEOUT', '20')
diff --git a/subprojects/gstreamer/tests/validate/meson.build b/subprojects/gstreamer/tests/validate/meson.build
index 4f1ab1e7af..fa137c14a1 100644
--- a/subprojects/gstreamer/tests/validate/meson.build
+++ b/subprojects/gstreamer/tests/validate/meson.build
@@ -1,6 +1,6 @@
 gst_tester = executable('gst-tester-' + apiversion,
     'gst-tester.c',
-    c_args : gst_c_args + ['-DBUILDDIR=' + meson.build_root()],
+    c_args : gst_c_args,
     include_directories : [configinc],
     install: true,
     dependencies : [gio_dep],
@@ -13,7 +13,7 @@ tests = [
 ]
 
 env = environment()
-env.set('GST_PLUGIN_PATH_1_0', meson.build_root())
+env.set('GST_PLUGIN_PATH_1_0', meson.global_build_root())
 env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
 env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), 'validate'))
 env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner')
@@ -30,4 +30,4 @@ foreach t: tests
     test_file = join_paths(meson.current_source_dir(), t + '.validatetest')
     test(test_name, gst_tester, args: [test_file, '--use-fakesinks'],
         env: test_env, timeout : 3 * 60, protocol: 'tap')
-endforeach
\ No newline at end of file
+endforeach
diff --git a/tests/python/meson.build b/tests/python/meson.build
index c41fd0b8c5..aae7cf63bd 100644
--- a/tests/python/meson.build
+++ b/tests/python/meson.build
@@ -13,9 +13,9 @@ if run_command(python, '-c', 'import gi').returncode() != 0
     subdir_done()
 endif
 
-test('python-overrides-devenv', setenv, args: ['--builddir=@0@'.format(meson.build_root()),
+test('python-overrides-devenv', setenv, args: ['--builddir=@0@'.format(meson.project_build_root()),
               '--gstbuilddir=@0@'.format(meson.current_build_dir() / '..' / '..'),
-              '--srcdir=@0@'.format(meson.source_root()),
+              '--srcdir=@0@'.format(meson.project_source_root()),
               meson.current_source_dir() / 'python-devenv-overrides.py'])
 
 env = environment()