[FFmpeg-devel] [PATCH] Fix FATE id3v2 test when cross-compiling using wine. (PR #21265)

[FFmpeg-devel] [PATCH] Fix FATE id3v2 test when cross-compiling using wine. (PR #21265)

[toots via ffmpeg-devel]

PR #21265 opened by toots
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21265
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21265.patch


>From 55bc4867837aeb7cc9284f5278617cb56e009a71 Mon Sep 17 00:00:00 2001
From: Romain Beauxis <romain.beauxis@gmail.com>
Date: Mon, 22 Dec 2025 10:01:11 -0600
Subject: [PATCH] Fix FATE id3v2 test when cross-compiling using wine.

---
 tests/fate-run.sh    | 5 +++++
 tests/fate/id3v2.mak | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 0e0c11ac3b..8173c0ebcc 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -89,6 +89,11 @@ stddev(){
     do_tiny_psnr "$1" "$2" stddev
 }
 
+fail_stderr(){
+    run "$1" 2>&1
+    exit 0
+}
+
 oneline(){
     printf '%s\n' "$1" | diff -u -b - "$2"
 }
diff --git a/tests/fate/id3v2.mak b/tests/fate/id3v2.mak
index e3eadcbd04..8642cc57bf 100644
--- a/tests/fate/id3v2.mak
+++ b/tests/fate/id3v2.mak
@@ -2,7 +2,7 @@ FATE_ID3V2_FFPROBE-$(CONFIG_MP3_DEMUXER) += fate-id3v2-priv
 fate-id3v2-priv: CMD = probetags $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3
 
 FATE_ID3V2_FFMPEG-$(CONFIG_MP3_DEMUXER) += fate-id3v2-invalid-tags
-fate-id3v2-invalid-tags: CMD = $(FFMPEG) -nostdin -hide_banner -loglevel fatal -i $(TARGET_SAMPLES)/id3v2/invalid-tags.mp3 -f null - 2>&1 || true
+fate-id3v2-invalid-tags: CMD = fail_stderr "$(FFMPEG) -nostdin -hide_banner -loglevel fatal -i $(TARGET_SAMPLES)/id3v2/invalid-tags.mp3 -f null -"
 
 FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, MP3) += fate-id3v2-priv-remux
 fate-id3v2-priv-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp3 mp3 "-c copy" "-c copy -t 0.1" "-show_entries format_tags"
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org