mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-13 12:51:16 +00:00
tests: put registry into tests/check not the gst/ subdir
Underscorify the test name before setting GST_REGISTRY, so the registry actually ends up in the current build dir and not some subdir. For consistency with the other modules, but should also avoid problems on windows. Also fix indentation of environment block. Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/126>
This commit is contained in:
parent
f9348a5e69
commit
a33e756d2c
1 changed files with 10 additions and 9 deletions
|
@ -40,17 +40,18 @@ if not get_option('rtspclientsink').disabled()
|
|||
endif
|
||||
|
||||
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('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_SCANNER_1_0', gst_plugin_scanner_path)
|
||||
|
||||
fname = '@0@.c'.format(test_name)
|
||||
test_name = test_name.underscorify()
|
||||
|
||||
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('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_SCANNER_1_0', gst_plugin_scanner_path)
|
||||
|
||||
exe = executable(test_name, fname,
|
||||
include_directories : rtspserver_incs,
|
||||
c_args : rtspserver_args + test_c_args,
|
||||
|
|
Loading…
Reference in a new issue