Commit 380b8d8e authored by Seungha Yang's avatar Seungha Yang

meson: Use join_paths() instead '/'

parent f89fc344
Pipeline #12907 failed with stages
in 41 seconds
......@@ -23,7 +23,7 @@ gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)
api_version = '1.0'
plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir'))
plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
cc = meson.get_compiler('c')
if have_cxx
......
......@@ -70,6 +70,7 @@ foreach t : ugly_tests
'gst-plugins-good', 'gst-plugins-ugly@' + meson.build_root())
env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name))
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
endforeach
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment