From b82c8f5854a39085fe3883e79d2c552c8665663a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 26 Feb 2020 23:46:57 +0000 Subject: [PATCH] tests: don't look for plugins in -base installdir for tests -base plugins will always be found in the build directory, and core plugins will be found either also via the build directory (if both core and -base are a subproject) or by getting the pluginsdir via pkg-config if core is installed. The GST_PLUGIN_LOADING_WHITELIST env var will make sure we only pick up plugins from core/base and base plugins only from the builddir. There is no reason to look for -base plugins in the install dir. Part-of: --- tests/check/meson.build | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/check/meson.build b/tests/check/meson.build index 0f7202e8ee..373e2548eb 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -159,9 +159,7 @@ foreach t : base_tests ) env = environment() - env.set('GST_PLUGIN_PATH_1_0', - meson.build_root(), join_paths(get_option('prefix'), plugins_install_dir), - pluginsdirs) + env.set('GST_PLUGIN_PATH_1_0', meson.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') @@ -183,9 +181,7 @@ 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(), join_paths(get_option('prefix'), plugins_install_dir), - pluginsdirs) + env.set('GST_PLUGIN_PATH_1_0', meson.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')