From facfadfcb065686cb6422f8251c451a8d97a6ecd Mon Sep 17 00:00:00 2001 From: softworkz Date: Mon, 12 May 2025 08:50:37 +0200 Subject: [PATCH 1/3] tests/fate: Fix subtitle fate tests on Windows ..when checked out with autocrlf=on, which is Git default on Windows. Signed-off-by: softworkz --- .gitattributes | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index b64bbed2eb45b..eaf7f7f9a1910 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,38 @@ *.pnm -diff -text -Changelog merge=union +Changelog merge=union +tests/ref/fate/sub-aqtitle eol=lf +tests/ref/fate/sub-ass-to-ass-transcode eol=lf +tests/ref/fate/sub-cc eol=lf +tests/ref/fate/sub-cc-realtime +tests/ref/fate/sub-cc-realtime eol=lf +tests/ref/fate/sub-cc-scte20 eol=lf +tests/ref/fate/sub-charenc eol=lf +tests/ref/fate/sub-dvb eol=lf +tests/ref/fate/sub-jacosub eol=lf +tests/ref/fate/sub-lrc-remux eol=lf +tests/ref/fate/sub-microdvd eol=lf +tests/ref/fate/sub-microdvd-remux eol=lf +tests/ref/fate/sub-movtext eol=lf +tests/ref/fate/sub-mpl2 eol=lf +tests/ref/fate/sub-mpsub eol=lf +tests/ref/fate/sub-mpsub-frames eol=lf +tests/ref/fate/sub-pgs-remux eol=lf +tests/ref/fate/sub-pjs eol=lf +tests/ref/fate/sub-realtext eol=lf +tests/ref/fate/sub-sami eol=lf +tests/ref/fate/sub-sami2 eol=lf +tests/ref/fate/sub-scc-remux eol=lf +tests/ref/fate/sub-srt eol=lf +tests/ref/fate/sub-srt-badsyntax eol=lf +tests/ref/fate/sub-srt-empty-events eol=lf +tests/ref/fate/sub-srt-madness-timeshift eol=lf +tests/ref/fate/sub-srt-rrn-remux eol=lf +tests/ref/fate/sub-ssa-to-ass-remux eol=lf +tests/ref/fate/sub-stl eol=lf +tests/ref/fate/sub-subviewer eol=lf +tests/ref/fate/sub-subviewer1 eol=lf +tests/ref/fate/sub-ttmlenc eol=lf +tests/ref/fate/sub-vplayer eol=lf +tests/ref/fate/sub-webvtt eol=lf +tests/ref/fate/sub-webvtt2 eol=lf +tests/ref/fate/sub-webvttenc eol=lf From 73ab2c2be54d092246c42c0e243efedb049165ef Mon Sep 17 00:00:00 2001 From: softworkz Date: Mon, 12 May 2025 11:25:37 +0200 Subject: [PATCH 2/3] tests/source-check: Fix make inclusion-guard check EOL-agnostic ..to make it work when checked out with autocrlf=on, which is Git default on Windows. Signed-off-by: softworkz --- tests/fate/source-check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/source-check.sh b/tests/fate/source-check.sh index 4d7e175784141..99e869e869f62 100755 --- a/tests/fate/source-check.sh +++ b/tests/fate/source-check.sh @@ -28,7 +28,7 @@ for f in `git ls-files | grep '\.h$'` ; do -e 's/_vaf_/_/' \ | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`" - git grep -L "^#define $macro$" $f + git grep -L "^#define $macro\>" $f done echo "Use of av_clip() where av_clip_uintp2() could be used:" From c9e21574c0c8be252b3ff83133a004e3eef6803c Mon Sep 17 00:00:00 2001 From: softworkz Date: Mon, 12 May 2025 11:25:31 +0200 Subject: [PATCH 3/3] tests/hevc: Fix concat input when running in MSYS2 shell MSYS2 considers the colon (:) as path separator (=separating multiple paths) and thinks it needs to convert it to a Windows path separator (;). Setting the MSYS2_ARG_CONV_EXCL environment variable keeps MSYS2 from doing this replacement. NOTE: This makes it possible to run the test from an MSYS2 shell, but it only works when using a relative path like --samples=../fate-suite (in configure) or SAMPLES=../fate-suite (in make fate) Reviewed-by: Zhao Zhili Signed-off-by: softworkz --- tests/fate/hevc.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index e432345ef73be..dee34e940daad 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -283,7 +283,7 @@ $(TARGET_SAMPLES)/hevc-conformance/LS_A_Orange_2.bit|$\ $(TARGET_SAMPLES)/hevc/mv_nuh_layer_id.bit|$\ $(TARGET_SAMPLES)/hevc-conformance/NoOutPrior_B_Qualcomm_1.bit|$\ $(TARGET_SAMPLES)/hevc-conformance/MVHEVCS_A.bit -fate-hevc-mv-switch: CMD = framecrc -i "concat:$(INPUT)" -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags +accurate_rnd+bitexact +fate-hevc-mv-switch: CMD = MSYS2_ARG_CONV_EXCL=concat: framecrc -i "concat:$(INPUT)" -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags +accurate_rnd+bitexact FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, SCALE_FILTER CONCAT_PROTOCOL) += fate-hevc-mv-switch # multiview stream, select view by position