From 548b72d6937c694bd8e2746d72be677ffe5517e9 Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Fri, 7 Dec 2018 20:35:37 +0900 Subject: [PATCH] tests: Use OS-specific seperator for whitelist ... instead of hardcoded ':', since G_SEARCHPATH_SEPARATOR_S varies depending on OS (e.g., ':' for *nix and ';' for Windows). Note that, when the seperator is not specified explicitly, Meson will use ';' for Windows and ':' for *nix respectively. --- tests/check/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/check/meson.build b/tests/check/meson.build index 314b0d5ca9..65bd7ea506 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -159,7 +159,7 @@ foreach t : base_tests 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(), separator: ':') + 'gst-plugins-base@' + meson.build_root()) env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name))) test(test_name, exe, env: env, timeout: 3 * 60) endif @@ -183,7 +183,7 @@ foreach group : [1, 2, 3, 4, 5, 6] 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(), separator: ':') + 'gst-plugins-base@' + meson.build_root()) env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name))) test(vscale_test_name, exe, env: env, timeout: 3 * 60)