| Message ID | tencent_BFB0A6C0E7C8EABBD30BDC564B90E62E1006@qq.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] tests/fate-run: Fix pixdesc failure | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
On 10/21/2024 2:03 PM, Zhao Zhili wrote: > From: Zhao Zhili <zhilizhao@tencent.com> > > -u and -q doesn't work together for diff on macOS. Lovely. > --- > tests/fate-run.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/fate-run.sh b/tests/fate-run.sh > index f8d67de25a..c371bd1c3c 100755 > --- a/tests/fate-run.sh > +++ b/tests/fate-run.sh > @@ -519,7 +519,7 @@ pixdesc(){ > $FLAGS $ENC_OPTS -vf "scale,format=$pix_fmt,pixdesctest" -vcodec rawvideo -frames:v 5 \ > "-pix_fmt $pix_fmt" -f nut md5:$md5file2 > > - diff -u -q $md5file1 $md5file2 || return > + diff -q $md5file1 $md5file2 || return > printf '%-20s' $label > cat $md5file1 > } LGTM
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index f8d67de25a..c371bd1c3c 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -519,7 +519,7 @@ pixdesc(){ $FLAGS $ENC_OPTS -vf "scale,format=$pix_fmt,pixdesctest" -vcodec rawvideo -frames:v 5 \ "-pix_fmt $pix_fmt" -f nut md5:$md5file2 - diff -u -q $md5file1 $md5file2 || return + diff -q $md5file1 $md5file2 || return printf '%-20s' $label cat $md5file1 }
From: Zhao Zhili <zhilizhao@tencent.com> -u and -q doesn't work together for diff on macOS. --- tests/fate-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)