From 053fb462d8cc11f41120cbfc6efd277874f9417b Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Fri, 20 Feb 2026 17:52:04 -0600 Subject: [PATCH] tests/fate/ogg-*.mak: Make sure that copy tests do not run when $(FFMPEG) is not compiled. --- tests/fate/ogg-flac.mak | 8 +++++--- tests/fate/ogg-opus.mak | 8 +++++--- tests/fate/ogg-vorbis.mak | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/tests/fate/ogg-flac.mak b/tests/fate/ogg-flac.mak index 3b48f32d2d..29bfa758a2 100644 --- a/tests/fate/ogg-flac.mak +++ b/tests/fate/ogg-flac.mak @@ -2,8 +2,8 @@ FATE_OGG_FLAC += fate-ogg-flac-chained-meta fate-ogg-flac-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-flac-chained-meta.txt fate-ogg-flac-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-flac/chained-meta.ogg -FATE_OGG_FLAC += fate-ogg-flac-copy-chained-meta -fate-ogg-flac-copy-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(FFMPEG) +FATE_OGG_COPY_FLAC-$(call PARSERDEMDEC, FLAC, OGG, FLAC, OGG_MUXER) += fate-ogg-flac-copy-chained-meta +fate-ogg-flac-copy-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) fate-ogg-flac-copy-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-flac-chained-meta.txt fate-ogg-flac-copy-chained-meta: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -i $(TARGET_SAMPLES)/ogg-flac/chained-meta.ogg -c copy -f ogg -y" "$(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF)" ogg @@ -13,4 +13,6 @@ FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_FLAC-yes) FATE_EXTERN += $(FATE_OGG_FLAC-yes) -fate-ogg-flac: $(FATE_OGG_FLAC-yes) +FATE_SAMPLES_FFMPEG += $(FATE_OGG_COPY_FLAC-yes) + +fate-ogg-flac: $(FATE_OGG_FLAC-yes) $(FATE_OGG_COPY_FLAC-yes) diff --git a/tests/fate/ogg-opus.mak b/tests/fate/ogg-opus.mak index d8a30dd058..71e84e32c2 100644 --- a/tests/fate/ogg-opus.mak +++ b/tests/fate/ogg-opus.mak @@ -2,8 +2,8 @@ FATE_OGG_OPUS += fate-ogg-opus-chained-meta fate-ogg-opus-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-opus-chained-meta.txt fate-ogg-opus-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-opus/chained-meta.ogg -FATE_OGG_OPUS += fate-ogg-opus-copy-chained-meta -fate-ogg-opus-copy-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(FFMPEG) +FATE_OGG_COPY_OPUS-$(call DEMDEC, OGG, OPUS, OGG_MUXER) += fate-ogg-opus-copy-chained-meta +fate-ogg-opus-copy-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) fate-ogg-opus-copy-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-opus-chained-meta.txt fate-ogg-opus-copy-chained-meta: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -i $(TARGET_SAMPLES)/ogg-opus/chained-meta.ogg -c copy -f ogg -y" "$(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF)" ogg @@ -13,4 +13,6 @@ FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_OPUS-yes) FATE_EXTERN += $(FATE_OGG_OPUS-yes) -fate-ogg-opus: $(FATE_OGG_OPUS-yes) +FATE_SAMPLES_FFMPEG += $(FATE_OGG_COPY_OPUS-yes) + +fate-ogg-opus: $(FATE_OGG_OPUS-yes) $(FATE_OGG_COPY_OPUS-yes) diff --git a/tests/fate/ogg-vorbis.mak b/tests/fate/ogg-vorbis.mak index 1bca373fea..834d26f74b 100644 --- a/tests/fate/ogg-vorbis.mak +++ b/tests/fate/ogg-vorbis.mak @@ -2,8 +2,8 @@ FATE_OGG_VORBIS += fate-ogg-vorbis-chained-meta fate-ogg-vorbis-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-vorbis-chained-meta.txt fate-ogg-vorbis-chained-meta: CMD = run $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(TARGET_SAMPLES)/ogg-vorbis/chained-meta.ogg -FATE_OGG_VORBIS += fate-ogg-vorbis-copy-chained-meta -fate-ogg-vorbis-copy-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) $(FFMPEG) +FATE_OGG_COPY_VORBIS-$(call DEMDEC, OGG, VORBIS, OGG_MUXER) += fate-ogg-vorbis-copy-chained-meta +fate-ogg-vorbis-copy-chained-meta: $(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF) fate-ogg-vorbis-copy-chained-meta: REF = $(SRC_PATH)/tests/ref/fate/ogg-vorbis-chained-meta.txt fate-ogg-vorbis-copy-chained-meta: CMD = run_with_temp "$(FFMPEG) -nostdin -hide_banner -loglevel quiet -i $(TARGET_SAMPLES)/ogg-vorbis/chained-meta.ogg -c copy -f ogg -y" "$(APITESTSDIR)/api-dump-stream-meta-test$(EXESUF)" ogg @@ -13,4 +13,6 @@ FATE_SAMPLES_DUMP_STREAM_META += $(FATE_OGG_VORBIS-yes) FATE_EXTERN += $(FATE_OGG_VORBIS-yes) -fate-ogg-vorbis: $(FATE_OGG_VORBIS-yes) +FATE_SAMPLES_FFMPEG += $(FATE_OGG_COPY_VORBIS-yes) + +fate-ogg-vorbis: $(FATE_OGG_VORBIS-yes) $(FATE_OGG_COPY_VORBIS-yes)