From c895cdbec81144084e78513cbc3463bb220575b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 25 Jun 2022 19:50:10 +0100 Subject: [PATCH] tests: skip unit tests for dependency-less elements that have been disabled Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1136 Part-of: --- .../gst-plugins-bad/tests/check/meson.build | 44 ++--- .../gst-plugins-base/tests/check/meson.build | 44 ++--- .../gst-plugins-good/tests/check/meson.build | 193 +++++++++++---------- .../gst-plugins-ugly/tests/check/meson.build | 2 +- 4 files changed, 144 insertions(+), 139 deletions(-) diff --git a/subprojects/gst-plugins-bad/tests/check/meson.build b/subprojects/gst-plugins-bad/tests/check/meson.build index 6990e47..55b3087 100644 --- a/subprojects/gst-plugins-bad/tests/check/meson.build +++ b/subprojects/gst-plugins-bad/tests/check/meson.build @@ -23,50 +23,50 @@ libsoup_dep = dependency('libsoup-2.4', version : '>=2.48', required : enable_gs base_tests = [ [['elements/aesenc.c'], not aes_dep.found(), [aes_dep]], [['elements/aesdec.c'], not aes_dep.found(), [aes_dep]], - [['elements/aiffparse.c']], - [['elements/asfmux.c']], - [['elements/autoconvert.c']], - [['elements/autovideoconvert.c']], - [['elements/avwait.c']], - [['elements/camerabin.c']], + [['elements/aiffparse.c'], get_option('aiff').disabled()], + [['elements/asfmux.c'], get_option('asfmux').disabled()], + [['elements/autoconvert.c'], get_option('autoconvert').disabled()], + [['elements/autovideoconvert.c'], get_option('autoconvert').disabled()], + [['elements/avwait.c'], get_option('timecode').disabled()], + [['elements/camerabin.c'], get_option('camerabin2').disabled()], [['elements/ccconverter.c'], not closedcaption_dep.found(), [gstvideo_dep]], [['elements/cccombiner.c'], not closedcaption_dep.found(), ], [['elements/ccextractor.c'], not closedcaption_dep.found(), ], [['elements/cudaconvert.c'], false, [gstgl_dep, gmodule_dep]], [['elements/cudafilter.c'], false, [gstgl_dep, gmodule_dep]], [['elements/d3d11colorconvert.c'], host_machine.system() != 'windows', ], - [['elements/gdpdepay.c']], - [['elements/gdppay.c']], + [['elements/gdpdepay.c'], get_option('gdp').disabled()], + [['elements/gdppay.c'], get_option('gdp').disabled()], [['elements/h263parse.c'], false, [libparser_dep, gstcodecparsers_dep]], [['elements/h264parse.c'], false, [libparser_dep, gstcodecparsers_dep]], [['elements/h265parse.c'], false, [libparser_dep, gstcodecparsers_dep]], [['elements/hlsdemux_m3u8.c'], not hls_dep.found(), [hls_dep]], - [['elements/id3mux.c']], - [['elements/interlace.c']], + [['elements/id3mux.c'], get_option('id3tag').disabled()], + [['elements/interlace.c'], get_option('interlace').disabled()], [['elements/jpeg2000parse.c'], false, [libparser_dep, gstcodecparsers_dep]], [['elements/line21.c'], not closedcaption_dep.found(), ], [['elements/mfvideosrc.c'], host_machine.system() != 'windows', ], - [['elements/mpegtsdemux.c'], false, [gstmpegts_dep]], - [['elements/mpegtsmux.c'], false, [gstmpegts_dep]], + [['elements/mpegtsdemux.c'], get_option('mpegtsdemux').disabled(), [gstmpegts_dep]], + [['elements/mpegtsmux.c'], get_option('mpegtsmux').disabled(), [gstmpegts_dep]], [['elements/mpeg4videoparse.c'], false, [libparser_dep, gstcodecparsers_dep]], [['elements/mpegvideoparse.c'], false, [libparser_dep, gstcodecparsers_dep]], [['elements/msdkh264enc.c'], not have_msdk, [msdk_dep]], - [['elements/mxfdemux.c']], - [['elements/mxfmux.c']], + [['elements/mxfdemux.c'], get_option('mxf').disabled()], + [['elements/mxfmux.c'], get_option('mxf').disabled()], [['elements/nvenc.c'], false, [gstgl_dep, gmodule_dep]], [['elements/nvdec.c'], not gstgl_dep.found(), [gstgl_dep, gmodule_dep]], [['elements/svthevcenc.c'], not svthevcenc_dep.found(), [svthevcenc_dep]], [['elements/openjpeg.c'], not openjpeg_dep.found(), [openjpeg_dep]], [['elements/pcapparse.c'], false, [libparser_dep]], - [['elements/pnm.c']], + [['elements/pnm.c'], get_option('pnm').disabled()], [['elements/ristrtpext.c']], - [['elements/rtponvifparse.c']], - [['elements/rtponviftimestamp.c']], - [['elements/rtpsrc.c']], - [['elements/rtpsink.c']], + [['elements/rtponvifparse.c'], get_option('onvif').disabled()], + [['elements/rtponviftimestamp.c'], get_option('onvif').disabled()], + [['elements/rtpsrc.c'], get_option('rtp').disabled()], + [['elements/rtpsink.c'], get_option('rtp').disabled()], [['elements/srtp.c'], not srtp_dep.found(), [srtp_dep]], - [['elements/switchbin.c']], - [['elements/videoframe-audiolevel.c']], + [['elements/switchbin.c'], get_option('switchbin').disabled()], + [['elements/videoframe-audiolevel.c'], get_option('videoframe_audiolevel').disabled()], [['elements/viewfinderbin.c']], [['elements/vp9parse.c'], false, [gstcodecparsers_dep]], [['elements/av1parse.c'], false, [gstcodecparsers_dep]], @@ -112,7 +112,7 @@ if host_machine.system() != 'windows' [['elements/avtpcvfdepay.c'], not avtp_dep.found(), [avtp_dep]], [['elements/avtpsink.c'], not avtp_dep.found(), [avtp_dep]], [['elements/avtpsrc.c'], not avtp_dep.found(), [avtp_dep]], - [['elements/clockselect.c']], + [['elements/clockselect.c'], get_option('debugutils').disabled()], [['elements/curlhttpsink.c'], not curl_dep.found(), [curl_dep]], [['elements/curlhttpsrc.c'], not curl_dep.found(), [curl_dep, gio_dep]], [['elements/curlfilesink.c'], diff --git a/subprojects/gst-plugins-base/tests/check/meson.build b/subprojects/gst-plugins-base/tests/check/meson.build index 240b8e9..b5a7494 100644 --- a/subprojects/gst-plugins-base/tests/check/meson.build +++ b/subprojects/gst-plugins-base/tests/check/meson.build @@ -30,28 +30,28 @@ base_tests = [ [ 'libs/videodecoder.c' ], [ 'libs/videotimecode.c' ], [ 'libs/xmpwriter.c' ], - [ 'elements/adder.c' ], - [ 'elements/appsink.c' ], - [ 'elements/appsrc.c' ], - [ 'elements/audioconvert.c' ], - [ 'elements/audiointerleave.c' ], - [ 'elements/audiomixer.c', false, [ gst_controller_dep ] ], - [ 'elements/audiorate.c' ], - [ 'elements/audiotestsrc.c' ], - [ 'elements/audioresample.c' ], - [ 'elements/compositor.c' ], - [ 'elements/decodebin.c' ], - [ 'elements/overlaycomposition.c' ], - [ 'elements/playbin.c' ], - [ 'elements/playsink.c' ], - [ 'elements/streamsynchronizer.c' ], - [ 'elements/subparse.c' ], - [ 'elements/urisourcebin.c' ], - [ 'elements/videoconvert.c' ], - [ 'elements/videorate.c' ], - [ 'elements/videoscale.c' ], - [ 'elements/videotestsrc.c' ], - [ 'elements/volume.c', false, [ gst_controller_dep ] ], + [ 'elements/adder.c', get_option('adder').disabled()], + [ 'elements/appsink.c', get_option('app').disabled()], + [ 'elements/appsrc.c', get_option('app').disabled()], + [ 'elements/audioconvert.c', get_option('audioconvert').disabled()], + [ 'elements/audiointerleave.c', get_option('audiomixer').disabled()], + [ 'elements/audiomixer.c', get_option('audiomixer').disabled(), [ gst_controller_dep ] ], + [ 'elements/audiorate.c', get_option('audiorate').disabled()], + [ 'elements/audiotestsrc.c', get_option('audiotestsrc').disabled()], + [ 'elements/audioresample.c', get_option('audioresample').disabled()], + [ 'elements/compositor.c', get_option('compositor').disabled()], + [ 'elements/decodebin.c', get_option('playback').disabled()], + [ 'elements/overlaycomposition.c', get_option('overlaycomposition').disabled()], + [ 'elements/playbin.c', get_option('playback').disabled()], + [ 'elements/playsink.c', get_option('playback').disabled()], + [ 'elements/streamsynchronizer.c', get_option('playback').disabled()], + [ 'elements/subparse.c', get_option('subparse').disabled()], + [ 'elements/urisourcebin.c', get_option('playback').disabled()], + [ 'elements/videoconvert.c', get_option('videoconvertscale').disabled()], + [ 'elements/videorate.c', get_option('videorate').disabled()], + [ 'elements/videoscale.c', get_option('videoconvertscale').disabled()], + [ 'elements/videotestsrc.c', get_option('videotestsrc').disabled()], + [ 'elements/volume.c', get_option('volume').disabled(), [ gst_controller_dep ] ], [ 'generic/clock-selection.c' ], [ 'generic/states.c', false, [ gmodule_dep ] ], [ 'pipelines/simple-launch-lines.c' ], diff --git a/subprojects/gst-plugins-good/tests/check/meson.build b/subprojects/gst-plugins-good/tests/check/meson.build index 1c9f393..2c42052 100644 --- a/subprojects/gst-plugins-good/tests/check/meson.build +++ b/subprojects/gst-plugins-good/tests/check/meson.build @@ -15,108 +15,113 @@ libparser_dep = declare_dependency(link_with : libparser, # name, condition when to skip the test and extra dependencies good_tests = [ - [ 'elements/audioamplify', false, [gstfft_dep] ], - [ 'elements/audiochebband', false, [gstfft_dep] ], - [ 'elements/audiocheblimit', false, [gstfft_dep] ], - [ 'elements/audiodynamic', false, [gstfft_dep] ], - [ 'elements/audioecho', false, [gstfft_dep] ], - [ 'elements/audiofirfilter', false, [gstfft_dep] ], - [ 'elements/audioiirfilter', false, [gstfft_dep] ], - [ 'elements/audioinvert', false, [gstfft_dep] ], - [ 'elements/audiopanorama', false, [gstfft_dep] ], - [ 'elements/audiowsincband', false, [gstfft_dep] ], - [ 'elements/audiowsinclimit', false, [gstfft_dep] ], - [ 'elements/alphacolor' ], - [ 'elements/alpha' ], - [ 'elements/avimux', false, [gstriff_dep] ], - [ 'elements/avisubtitle', false, [gstriff_dep] ], - [ 'elements/capssetter' ], - [ 'elements/aacparse', false, [libparser_dep] ], - [ 'elements/ac3parse', false, [libparser_dep] ], - [ 'elements/amrparse', false, [libparser_dep] ], - [ 'elements/flacparse', false, [libparser_dep] ], - [ 'elements/mpegaudioparse', false, [libparser_dep] ], - [ 'elements/autodetect' ], - [ 'elements/deinterlace' ], - [ 'elements/dtmf' ], - [ 'elements/flvdemux' ], - [ 'elements/flvmux' ], + [ 'elements/audioamplify', get_option('audiofx').disabled(), [gstfft_dep] ], + [ 'elements/audiochebband', get_option('audiofx').disabled(), [gstfft_dep] ], + [ 'elements/audiocheblimit', get_option('audiofx').disabled(), [gstfft_dep] ], + [ 'elements/audiodynamic', get_option('audiofx').disabled(), [gstfft_dep] ], + [ 'elements/audioecho', get_option('audiofx').disabled(), [gstfft_dep] ], + [ 'elements/audiofirfilter', get_option('audiofx').disabled(), [gstfft_dep] ], + [ 'elements/audioiirfilter', get_option('audiofx').disabled(), [gstfft_dep] ], + [ 'elements/audioinvert', get_option('audiofx').disabled(), [gstfft_dep] ], + [ 'elements/audiopanorama', get_option('audiofx').disabled(), [gstfft_dep] ], + [ 'elements/audiowsincband', get_option('audiofx').disabled(), [gstfft_dep] ], + [ 'elements/audiowsinclimit', get_option('audiofx').disabled(), [gstfft_dep] ], + [ 'elements/alphacolor', get_option('alpha').disabled()], + [ 'elements/alpha', get_option('alpha').disabled()], + [ 'elements/avimux', get_option('avi').disabled(), [gstriff_dep] ], + [ 'elements/avisubtitle', get_option('avi').disabled(), [gstriff_dep] ], + [ 'elements/capssetter', get_option('debugutils').disabled()], + [ 'elements/aacparse', get_option('audioparsers').disabled(), [libparser_dep] ], + [ 'elements/ac3parse', get_option('audioparsers').disabled(), [libparser_dep] ], + [ 'elements/amrparse', get_option('audioparsers').disabled(), [libparser_dep] ], + [ 'elements/flacparse', get_option('audioparsers').disabled(), [libparser_dep] ], + [ 'elements/mpegaudioparse', get_option('audioparsers').disabled(), [libparser_dep] ], + [ 'elements/autodetect', get_option('autodetect').disabled()], + [ 'elements/deinterlace', get_option('deinterlace').disabled()], + [ 'elements/dtmf', get_option('dtmf').disabled()], + [ 'elements/flvdemux', get_option('flv').disabled()], + [ 'elements/flvmux', get_option('flv').disabled()], [ 'elements/hlsdemux_m3u8' , not hls_dep.found() or not adaptivedemux2_dep.found(), [hls_dep, adaptivedemux2_dep] ], - [ 'elements/mulawdec' ], - [ 'elements/mulawenc' ], - [ 'elements/icydemux' ], - [ 'elements/id3demux' ], - [ 'elements/imagefreeze' ], - [ 'elements/deinterleave' ], - [ 'elements/interleave' ], - [ 'elements/level' ], - [ 'elements/matroskademux', false, [gstriff_dep] ], - [ 'elements/matroskamux', false, [gstriff_dep] ], - [ 'elements/matroskaparse', false, [gstriff_dep] ], - [ 'elements/multifile' ], - [ 'elements/splitmuxsink', ], - [ 'elements/splitmuxsinktimecode', ], - [ 'elements/splitmuxsrc', ], - [ 'elements/qtmux', false, [gstriff_dep, zlib_dep] ], - [ 'elements/qtdemux', false, [gstriff_dep, zlib_dep] ], - [ 'elements/rganalysis' ], - [ 'elements/rglimiter' ], - [ 'elements/rgvolume' ], - [ 'elements/rtphdrext-colorspace' ], - [ 'elements/rtph261' ], - [ 'elements/rtph263' ], - [ 'elements/rtph264' ], - [ 'elements/rtph265' ], - [ 'elements/rtpopus' ], - [ 'elements/rtpvp8' ], - [ 'elements/rtpvp9' ], - [ 'elements/rtpbin' ], - [ 'elements/rtpbin_buffer_list' ], - [ 'elements/rtpcollision' ], - [ 'elements/rtpfunnel' ], - [ 'elements/rtphdrextclientaudiolevel', false, [gstsdp_dep, gstaudio_dep] ], - [ 'elements/rtphdrextsdes', false, [gstrtp_dep, gstsdp_dep] ], - [ 'elements/rtpjitterbuffer' ], - [ 'elements/rtpjpeg' ], + [ 'elements/mulawdec', get_option('law').disabled()], + [ 'elements/mulawenc', get_option('law').disabled()], + [ 'elements/icydemux', get_option('icydemux').disabled()], + [ 'elements/id3demux', get_option('id3demux').disabled()], + [ 'elements/imagefreeze', get_option('imagefreeze').disabled()], + [ 'elements/deinterleave', get_option('interleave').disabled()], + [ 'elements/interleave', get_option('interleave').disabled()], + [ 'elements/level', get_option('level').disabled()], + [ 'elements/matroskademux', get_option('matroska').disabled(), [gstriff_dep] ], + [ 'elements/matroskamux', get_option('matroska').disabled(), [gstriff_dep] ], + [ 'elements/matroskaparse', get_option('matroska').disabled(), [gstriff_dep] ], + [ 'elements/multifile', get_option('multifile').disabled()], + [ 'elements/splitmuxsink', get_option('multifile').disabled()], + [ 'elements/splitmuxsinktimecode', get_option('multifile').disabled()], + [ 'elements/splitmuxsrc', get_option('multifile').disabled()], + [ 'elements/qtmux', get_option('isomp4').disabled(), [gstriff_dep, zlib_dep] ], + [ 'elements/qtdemux', get_option('isomp4').disabled(), [gstriff_dep, zlib_dep] ], + [ 'elements/rganalysis', get_option('replaygain').disabled()], + [ 'elements/rglimiter', get_option('replaygain').disabled()], + [ 'elements/rgvolume', get_option('replaygain').disabled()], + [ 'elements/spectrum', get_option('spectrum').disabled(), [gstfft_dep] ], + [ 'elements/shapewipe', get_option('shapewipe').disabled()], + [ 'elements/udpsink', get_option('udp').disabled()], + [ 'elements/udpsrc', get_option('udp').disabled()], + [ 'elements/videobox', get_option('videobox').disabled()], + [ 'elements/videocrop', get_option('videocrop').disabled()], + [ 'elements/videofilter', get_option('videofilter').disabled()], + [ 'elements/videoflip', get_option('videofilter').disabled()], + [ 'elements/videomixer', get_option('videomixer').disabled()], + [ 'elements/aspectratiocrop', get_option('videocrop').disabled()], + [ 'pipelines/wavenc', get_option('wavenc').disabled()], + [ 'elements/wavparse', get_option('wavparse').disabled(), [gstriff_dep] ], + [ 'elements/wavpackparse', get_option('audioparsers').disabled()], + [ 'elements/y4menc', get_option('y4m').disabled()], + [ 'pipelines/effectv', get_option('effectv').disabled()], + [ 'elements/equalizer', get_option('equalizer').disabled()], + [ 'pipelines/simple-launch-lines' ], + [ 'pipelines/tagschecking' ], + [ 'generic/states' ], +] + +if not get_option('rtp').disabled() and not get_option('rtpmanager').disabled() + good_tests += [ + [ 'elements/rtphdrext-colorspace' ], + [ 'elements/rtph261', ], + [ 'elements/rtph263' ], + [ 'elements/rtph264' ], + [ 'elements/rtph265' ], + [ 'elements/rtpopus' ], + [ 'elements/rtpvp8' ], + [ 'elements/rtpvp9' ], + [ 'elements/rtpbin' ], + [ 'elements/rtpbin_buffer_list' ], + [ 'elements/rtpcollision' ], + [ 'elements/rtpfunnel' ], + [ 'elements/rtphdrextclientaudiolevel', false, [gstsdp_dep, gstaudio_dep] ], + [ 'elements/rtphdrextsdes', false, [gstrtp_dep, gstsdp_dep] ], + [ 'elements/rtpjitterbuffer' ], + [ 'elements/rtpjpeg' ], - [ 'elements/rtptimerqueue', false, [gstrtp_dep], + [ 'elements/rtptimerqueue', false, [gstrtp_dep], ['../../gst/rtpmanager/rtptimerqueue.c']], - [ 'elements/rtpmux' ], - [ 'elements/rtpptdemux' ], - [ 'elements/rtprtx' ], - [ 'elements/rtpsession' ], - [ 'elements/rtpstorage', false, [], ['../../gst/rtp/gstrtpstorage.c', + [ 'elements/rtpmux' ], + [ 'elements/rtpptdemux' ], + [ 'elements/rtprtx' ], + [ 'elements/rtpsession' ], + [ 'elements/rtpstorage', false, [], ['../../gst/rtp/gstrtpstorage.c', '../../gst/rtp/gstrtpelement.c', '../../gst/rtp/gstrtputils.c', '../../gst/rtp/rtpstorage.c', '../../gst/rtp/rtpstoragestream.c']], - [ 'elements/rtpred' ], - [ 'elements/rtpulpfec' ], - [ 'elements/rtpssrcdemux' ], - [ 'elements/rtp-payloading' ], - [ 'elements/rtpst2022-1-fecdec' ], - [ 'elements/rtpst2022-1-fecenc' ], - [ 'elements/spectrum', false, [gstfft_dep] ], - [ 'elements/shapewipe' ], - [ 'elements/udpsink' ], - [ 'elements/udpsrc' ], - [ 'elements/videobox' ], - [ 'elements/videocrop' ], - [ 'elements/videofilter' ], - [ 'elements/videoflip' ], - [ 'elements/videomixer' ], - [ 'elements/aspectratiocrop' ], - [ 'pipelines/wavenc' ], - [ 'elements/wavparse', false, [gstriff_dep] ], - [ 'elements/wavpackparse', ], - [ 'elements/y4menc' ], - [ 'pipelines/effectv' ], - [ 'elements/equalizer' ], - [ 'pipelines/simple-launch-lines' ], - [ 'pipelines/tagschecking' ], - [ 'generic/states' ], -] + [ 'elements/rtpred' ], + [ 'elements/rtpulpfec' ], + [ 'elements/rtpssrcdemux' ], + [ 'elements/rtp-payloading' ], + [ 'elements/rtpst2022-1-fecdec' ], + [ 'elements/rtpst2022-1-fecenc' ], + ] +endif # FIXME: valgrind elements/rtp-payloading - needs fixing # elements/videocrop should be disabled since it takes way too long in valgrind diff --git a/subprojects/gst-plugins-ugly/tests/check/meson.build b/subprojects/gst-plugins-ugly/tests/check/meson.build index 0d59258..256dbe8 100644 --- a/subprojects/gst-plugins-ugly/tests/check/meson.build +++ b/subprojects/gst-plugins-ugly/tests/check/meson.build @@ -1,7 +1,7 @@ # name, condition when to skip the test and extra dependencies ugly_tests = [ [ 'elements/x264enc', not x264_dep.found(), [ x264_dep, gmodule_dep ] ], - [ 'elements/xingmux' ], + [ 'elements/xingmux', get_option('xingmux').disabled()], [ 'generic/states' ], ] -- 2.7.4