From: Jan Schmidt <jan@centricular.com>
Date: Mon, 2 Nov 2020 11:18:24 +0000 (+1100)
Subject: tests: fix meson test env setup to make sure we use the right gst-plugin-scanner
X-Git-Tag: 1.19.3~493^2~68
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdfe6e4477d3ebbd6ff2a82135aacaa91ee5049f;p=platform%2Fupstream%2Fgstreamer.git

tests: fix meson test env setup to make sure we use the right gst-plugin-scanner

This is the same fix that was applied in gst-plugins-good in
https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/603
and fixes the testsuite running in gst-build.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/219>
---

diff --git a/tests/check/meson.build b/tests/check/meson.build
index 4d7699e..cb3af67 100644
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -42,7 +42,11 @@ if gst_dep.type_name() == 'pkgconfig'
   pluginsdirs = [gst_dep.get_pkgconfig_variable('pluginsdir'),
                  pbase.get_pkgconfig_variable('pluginsdir'),
                  pbad.get_pkgconfig_variable('pluginsdir')]
+ gst_plugin_scanner_dir = gst_dep.get_pkgconfig_variable('pluginscannerdir')
+else
+ gst_plugin_scanner_dir = subproject('gstreamer').get_variable('gst_scanner_dir')
 endif
+gst_plugin_scanner_path = join_paths(gst_plugin_scanner_dir, 'gst-plugin-scanner')
 
 foreach t : ges_tests
   fname = '@0@.c'.format(t.get(0))
@@ -95,6 +99,7 @@ if gstvalidate_dep.found()
     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_VALIDATE_LOGSDIR', meson.current_build_dir() / scenario)
+    env.set('GST_PLUGIN_SCANNER_1_0', gst_plugin_scanner_path)
 
     if is_validatetest
       testfile = meson.current_source_dir() / 'scenarios' / scenario + '.validatetest'