| Message ID | AS8P250MB074410B1ACDAD7C49F20F05D8F4F2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 99d33cc661fbd04e8657831b818042b11f1862a2 |
| Headers | show |
| Series | [FFmpeg-devel] fate/subtitles: Ignore line endings for sub-scc test | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Tue, 13 Feb 2024, Andreas Rheinhardt wrote: > Since 7bf1b9b35769b37684dd2f18a54f01d852a540c8, > the test produces ordinary \n, yet this is not what the reference > file used for the most time, leading to test failures. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > tests/fate/subtitles.mak | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak > index cea4c810dd..90412e9ac1 100644 > --- a/tests/fate/subtitles.mak > +++ b/tests/fate/subtitles.mak > @@ -114,6 +114,7 @@ fate-sub-charenc: CMD = fmtstdout ass -sub_charenc cp1251 -i $(TARGET_SAMPLES)/s > > FATE_SUBTITLES-$(call DEMDEC, SCC, CCAPTION) += fate-sub-scc > fate-sub-scc: CMD = fmtstdout ass -ss 57 -i $(TARGET_SAMPLES)/sub/witch.scc > +fate-sub-scc: CMP = diff > > FATE_SUBTITLES-$(call DEMMUX, SCC, SCC) += fate-sub-scc-remux > fate-sub-scc-remux: CMD = fmtstdout scc -i $(TARGET_SAMPLES)/sub/witch.scc -ss 4:00 -map 0 -c copy > -- > 2.34.1 Looks ok to me, as a temporary measure until we figure out the best way to upgrade everybody's workdirs without needing interaction. (As an added note to the other thread; even if we could easily patch fate.sh, every current user's workdir is also prone to this issue, and the way of fixing it is kinda non-obvious.) // Martin
diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index cea4c810dd..90412e9ac1 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -114,6 +114,7 @@ fate-sub-charenc: CMD = fmtstdout ass -sub_charenc cp1251 -i $(TARGET_SAMPLES)/s FATE_SUBTITLES-$(call DEMDEC, SCC, CCAPTION) += fate-sub-scc fate-sub-scc: CMD = fmtstdout ass -ss 57 -i $(TARGET_SAMPLES)/sub/witch.scc +fate-sub-scc: CMP = diff FATE_SUBTITLES-$(call DEMMUX, SCC, SCC) += fate-sub-scc-remux fate-sub-scc-remux: CMD = fmtstdout scc -i $(TARGET_SAMPLES)/sub/witch.scc -ss 4:00 -map 0 -c copy
Since 7bf1b9b35769b37684dd2f18a54f01d852a540c8, the test produces ordinary \n, yet this is not what the reference file used for the most time, leading to test failures. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- tests/fate/subtitles.mak | 1 + 1 file changed, 1 insertion(+)