mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: Enable unit test on Windows

Browse source 
Remove hard-coded ':' whitelist separator since it varies with OS
This commit is contained in:
Seungha Yang 2018-12-07 23:39:01 +09:00
parent 43290a9be2
commit f89fc3441b
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -141,11 +141,9 @@ gstsdp_dep = dependency('gstreamer-sdp-1.0', version : gst_req,
fallback : ['gst-plugins-base', 'sdp_dep']) fallback : ['gst-plugins-base', 'sdp_dep'])
gstrtsp_dep = dependency('gstreamer-rtsp-1.0', version : gst_req, gstrtsp_dep = dependency('gstreamer-rtsp-1.0', version : gst_req,
fallback : ['gst-plugins-base', 'rtsp_dep']) fallback : ['gst-plugins-base', 'rtsp_dep'])
if host_machine.system() != 'windows' gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
required : get_option('tests'), required : get_option('tests'),
fallback : ['gstreamer', 'gst_check_dep']) fallback : ['gstreamer', 'gst_check_dep'])
endif
gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req,
fallback : ['gstreamer', 'gst_controller_dep']) fallback : ['gstreamer', 'gst_controller_dep'])

16
tests/check/meson.build
View file

@ -1,12 +1,18 @@
# name, condition when to skip the test and extra dependencies # name, condition when to skip the test and extra dependencies
ugly_tests = [ ugly_tests = [
[ 'elements/amrnbenc', not amrnb_dep.found() ],
[ 'elements/mpeg2dec', not mpeg2_dep.found(), [ gstvideo_dep ] ],
[ 'elements/x264enc', not x264_dep.found() ],
[ 'elements/xingmux' ], [ 'elements/xingmux' ],
[ 'generic/states' ],
] ]
# FIXME: unistd dependency or not tested yet on windows
if host_machine.system() != 'windows'
ugly_tests += [
[ 'elements/amrnbenc', not amrnb_dep.found() ],
[ 'elements/mpeg2dec', not mpeg2_dep.found() or not cdata.has('HAVE_UNISTD_H'), [ gstvideo_dep ] ],
[ 'elements/x264enc', not x264_dep.found() or not cdata.has('HAVE_UNISTD_H') ],
[ 'generic/states', not cdata.has('HAVE_UNISTD_H') ],
]
endif
test_defines = [ test_defines = [
'-UG_DISABLE_ASSERT', '-UG_DISABLE_ASSERT',
'-UG_DISABLE_CAST_CHECKS', '-UG_DISABLE_CAST_CHECKS',
@ -61,7 +67,7 @@ foreach t : ugly_tests
env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '')
env.set('CK_DEFAULT_TIMEOUT', '20') env.set('CK_DEFAULT_TIMEOUT', '20')
env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', 'gst-plugins-base', env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', 'gst-plugins-base',
'gst-plugins-good', 'gst-plugins-ugly@' + meson.build_root(), separator: ':') 'gst-plugins-good', 'gst-plugins-ugly@' + meson.build_root())
env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs) 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', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name))
test(test_name, exe, env: env, timeout: 3 * 60) test(test_name, exe, env: env, timeout: 3 * 60)

6
tests/meson.build
View file

@ -1,5 +1,3 @@
if host_machine.system() != 'windows' if not get_option('tests').disabled() and gstcheck_dep.found()
if not get_option('tests').disabled() and gstcheck_dep.found() subdir('check')
subdir('check')
endif
endif endif