mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 06:54:49 +00:00
build: Fix running tests when not in gst-uninstalled env
Making sure mono find the required and built libraries
This commit is contained in:
parent
33c41a50a5
commit
37f73f8865
3 changed files with 52 additions and 22 deletions
|
@ -25,10 +25,8 @@ if add_languages('c', required: false) and csc.get_id() == 'mono'
|
||||||
cs_args: ['-nowarn:169', '-nowarn:108', '-nowarn:114', '-nowarn:0618', '-unsafe'],
|
cs_args: ['-nowarn:169', '-nowarn:108', '-nowarn:114', '-nowarn:0618', '-unsafe'],
|
||||||
dependencies: [ges_sharp_dep])
|
dependencies: [ges_sharp_dep])
|
||||||
|
|
||||||
env = environment()
|
|
||||||
env.prepend('MONO_PATH', mono_path)
|
|
||||||
test(pkg + 'abi', diff, args: [c_abi_exe.full_path(), cs_abi_exe.full_path()],
|
test(pkg + 'abi', diff, args: [c_abi_exe.full_path(), cs_abi_exe.full_path()],
|
||||||
env: env)
|
env: testsenv)
|
||||||
else
|
else
|
||||||
message('Not running tests ' + csc.get_id())
|
message('Not running tests ' + csc.get_id())
|
||||||
endif
|
endif
|
||||||
|
|
66
meson.build
66
meson.build
|
@ -64,22 +64,24 @@ apiversion = '1.0'
|
||||||
gst_required_version = '>=@0@'.format(meson.project_version())
|
gst_required_version = '>=@0@'.format(meson.project_version())
|
||||||
gst_deps = []
|
gst_deps = []
|
||||||
|
|
||||||
foreach dep: [
|
# dependency name, [subproject-name, internal-dep-name, library-name']
|
||||||
['gstreamer', ['gstreamer', 'gst_dep']],
|
gst_deps_defs = [
|
||||||
['gstreamer-app', ['gst-plugins-base', 'app_dep']],
|
['gstreamer', ['gstreamer', 'gst_dep'], 'libgst'],
|
||||||
['gstreamer-audio', ['gst-plugins-base', 'audio_dep']],
|
['gstreamer-app', ['gst-plugins-base', 'app_dep'], 'gstapp'],
|
||||||
['gstreamer-base', ['gst-plugins-base', 'audio_dep']],
|
['gstreamer-audio', ['gst-plugins-base', 'audio_dep'], 'gstaudio'],
|
||||||
['gstreamer-controller', ['gstreamer', 'gst_controller_dep']],
|
['gstreamer-base', ['gstreamer', 'gst_base_dep'], 'gst_base'],
|
||||||
['gstreamer-fft', ['gst-plugins-base', 'fft_dep']],
|
['gstreamer-controller', ['gstreamer', 'gst_controller_dep'], 'gst_controller'],
|
||||||
['gstreamer-net', ['gstreamer', 'gst_net_dep']],
|
['gstreamer-fft', ['gst-plugins-base', 'fft_dep'], 'gstfft'],
|
||||||
['gstreamer-pbutils', ['gst-plugins-base', 'pbutils_dep']],
|
['gstreamer-net', ['gstreamer', 'gst_net_dep'], 'gst_net'],
|
||||||
['gstreamer-riff', ['gst-plugins-base', 'riff_dep']],
|
['gstreamer-pbutils', ['gst-plugins-base', 'pbutils_dep'], 'pbutils'],
|
||||||
['gstreamer-rtp', ['gst-plugins-base', 'rtp_dep']],
|
['gstreamer-riff', ['gst-plugins-base', 'riff_dep'], 'gstriff'],
|
||||||
['gstreamer-rtsp', ['gst-plugins-base', 'rtsp_dep']],
|
['gstreamer-rtp', ['gst-plugins-base', 'rtp_dep'], 'gst_rtp'],
|
||||||
['gstreamer-sdp', ['gst-plugins-base', 'sdp_dep']],
|
['gstreamer-rtsp', ['gst-plugins-base', 'rtsp_dep'], 'gst_rtsp'],
|
||||||
['gstreamer-tag', ['gst-plugins-base', 'tag_dep']],
|
['gstreamer-sdp', ['gst-plugins-base', 'sdp_dep'], 'gstsdp'],
|
||||||
['gstreamer-video', ['gst-plugins-base', 'video_dep']],]
|
['gstreamer-tag', ['gst-plugins-base', 'tag_dep'], 'gsttag'],
|
||||||
|
['gstreamer-video', ['gst-plugins-base', 'video_dep'], 'gstvideo'],]
|
||||||
|
|
||||||
|
foreach dep: gst_deps_defs
|
||||||
gst_deps += [dependency(dep.get(0) + '-' + apiversion, version: gst_required_version,
|
gst_deps += [dependency(dep.get(0) + '-' + apiversion, version: gst_required_version,
|
||||||
fallback: dep.get(1))]
|
fallback: dep.get(1))]
|
||||||
endforeach
|
endforeach
|
||||||
|
@ -87,9 +89,41 @@ endforeach
|
||||||
ges_dep = dependency('gst-editing-services-' + apiversion, version: gst_required_version,
|
ges_dep = dependency('gst-editing-services-' + apiversion, version: gst_required_version,
|
||||||
fallback: ['gst-editing-services', 'ges_dep'])
|
fallback: ['gst-editing-services', 'ges_dep'])
|
||||||
|
|
||||||
|
if ges_dep.found()
|
||||||
|
gst_deps_defs += [
|
||||||
|
['gst-editing-services', ['gst-editing-services', 'ges_dep'], 'libges'],
|
||||||
|
]
|
||||||
|
mono_path += pathsep + join_paths(meson.current_build_dir(), 'ges')
|
||||||
|
endif
|
||||||
|
|
||||||
|
testsenv = environment()
|
||||||
|
testsenv.prepend('MONO_PATH', mono_path)
|
||||||
|
i = 0
|
||||||
|
foreach dep: gst_deps + [ges_dep]
|
||||||
|
if dep.type_name() == 'pkgconfig'
|
||||||
|
testsenv.prepend('LD_LIBRARY_PATH', dep.get_pkgconfig_variable('libdir'))
|
||||||
|
else
|
||||||
|
depdef = gst_deps_defs[i][1]
|
||||||
|
libname = gst_deps_defs[i].get(2, '')
|
||||||
|
if libname != ''
|
||||||
|
proj = subproject(depdef[0])
|
||||||
|
libpath = proj.get_variable(libname).full_path().split('/')
|
||||||
|
dirname = ''
|
||||||
|
j = 1
|
||||||
|
foreach comp: libpath
|
||||||
|
if j < libpath.length()
|
||||||
|
dirname += '/' + comp
|
||||||
|
endif
|
||||||
|
j += 1
|
||||||
|
endforeach
|
||||||
|
testsenv.prepend('LD_LIBRARY_PATH', dirname)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
i += 1
|
||||||
|
endforeach
|
||||||
|
|
||||||
subdir('sources')
|
subdir('sources')
|
||||||
if ges_dep.found()
|
if ges_dep.found()
|
||||||
mono_path += pathsep + join_paths(meson.current_build_dir(), 'ges')
|
|
||||||
subdir('ges')
|
subdir('ges')
|
||||||
custom_target('GESSharp-nuget',
|
custom_target('GESSharp-nuget',
|
||||||
command: [nuget, '--package-name', 'GESSharp',
|
command: [nuget, '--package-name', 'GESSharp',
|
||||||
|
|
|
@ -50,10 +50,8 @@ if add_languages('c', required: false) and csc.get_id() == 'mono'
|
||||||
cs_args: ['-nowarn:169', '-nowarn:108', '-nowarn:114', '-unsafe'],
|
cs_args: ['-nowarn:169', '-nowarn:108', '-nowarn:114', '-unsafe'],
|
||||||
dependencies: [gst_sharp_dep])
|
dependencies: [gst_sharp_dep])
|
||||||
|
|
||||||
env = environment()
|
|
||||||
env.prepend('MONO_PATH', mono_path)
|
|
||||||
test('gstreamer_sharp_abi', diff, args: [c_abi_exe.full_path(), cs_abi_exe.full_path()],
|
test('gstreamer_sharp_abi', diff, args: [c_abi_exe.full_path(), cs_abi_exe.full_path()],
|
||||||
env: env)
|
env: testsenv)
|
||||||
else
|
else
|
||||||
message('Not running tests ' + csc.get_id())
|
message('Not running tests ' + csc.get_id())
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue