On Sun, Dec 02, 2012 at 08:59:33PM +0100, Janne Grunau wrote:
> Each fate-seek test depends now only on the corresponding fate-acodec,
> fate-vsynth2 or fate-lavf test which creates the file seek-tests
> operates on. The tests and references are renamed to match the test they
> depend on.
> ---
I totally love you ... :-)
I'm working on FATE myself at the moment and I ran into this issue the
other day and made a mental note to address this at some point. Thanks
for beating me to it ..
> --- a/tests/fate-run.sh
> +++ b/tests/fate-run.sh
> @@ -160,21 +160,6 @@ lavfitest(){
>
> -seektest(){
> - t="${test#seek-}"
> - ref=${base}/ref/seek/$t
> - case $t in
> - image_*) file="tests/data/images/${t#image_}/%02d.${t#image_}" ;;
> - *) file=$(echo $t | tr _ '?')
> - for d in fate/acodec- fate/vsynth2- lavf/; do
> - test -f tests/data/$d$file && break
> - done
> - file=$(echo tests/data/$d$file)
> - ;;
> - esac
> - run libavformat/seek-test $target_path/$file
> -}
This is a step in the right direction.
> --- a/tests/fate/seek.mak
> +++ b/tests/fate/seek.mak
> @@ -1,119 +1,231 @@
> +
> +fate-seek-acodec-adpcm-ima_qt: SRC = fate/acodec-adpcm-ima_qt.aiff
> +fate-seek-acodec-adpcm-ima_wav: SRC = fate/acodec-adpcm-ima_wav.wav
> +fate-seek-acodec-adpcm-ms: SRC = fate/acodec-adpcm-ms.wav
> +fate-seek-acodec-adpcm-swf: SRC = fate/acodec-adpcm-swf.flv
> +fate-seek-acodec-adpcm-yamaha: SRC = fate/acodec-adpcm-yamaha.wav
> +fate-seek-acodec-alac: SRC = fate/acodec-alac.mov
> +fate-seek-acodec-flac: SRC = fate/acodec-flac.flac
> +fate-seek-acodec-mp2: SRC = fate/acodec-mp2.mp2
> +fate-seek-acodec-pcm-alaw: SRC = fate/acodec-pcm-alaw.wav
> +fate-seek-acodec-pcm-f32be: SRC = fate/acodec-pcm-f32be.au
> +fate-seek-acodec-pcm-f32le: SRC = fate/acodec-pcm-f32le.wav
> +fate-seek-acodec-pcm-f64be: SRC = fate/acodec-pcm-f64be.au
> +fate-seek-acodec-pcm-f64le: SRC = fate/acodec-pcm-f64le.wav
> +fate-seek-acodec-pcm-mulaw: SRC = fate/acodec-pcm-mulaw.wav
> +fate-seek-acodec-pcm-s16be: SRC = fate/acodec-pcm-s16be.mov
> +fate-seek-acodec-pcm-s16le: SRC = fate/acodec-pcm-s16le.wav
> +fate-seek-acodec-pcm-s24be: SRC = fate/acodec-pcm-s24be.mov
> +fate-seek-acodec-pcm-s24le: SRC = fate/acodec-pcm-s24le.wav
> +fate-seek-acodec-pcm-s32be: SRC = fate/acodec-pcm-s32be.mov
> +fate-seek-acodec-pcm-s32le: SRC = fate/acodec-pcm-s32le.wav
> +fate-seek-acodec-pcm-s8: SRC = fate/acodec-pcm-s8.mov
> +fate-seek-acodec-pcm-u8: SRC = fate/acodec-pcm-u8.wav
> +
> +FATE_SEEK += $(FATE_SEEK-ACODEC-yes:%=fate-seek-acodec-%)
fate-seek-acodec-%: SRC = fate/acodec-$(*).aiff
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, MPEG4, MP4 MOV) += mpeg4
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, MPEG4, AVI) += $(FATE_MPEG4_AVI)
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, MSMPEG4V3, AVI) += msmpeg4
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, MSMPEG4V2, AVI) += msmpeg4v2
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, RAWVIDEO, AVI) += rgb
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, ROQ, ROQ) += roqvideo
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, RV10, RM) += rv10
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, RV20, RM) += rv20
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, SNOW, AVI) += snow
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, SNOW, AVI) += snow-ll
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, SVQ1, MOV) += svq1
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, WMV1, AVI) += wmv1
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, WMV2, AVI) += wmv2
> +FATE_SEEK-VSYNTH2-$(call ENCDEC, RAWVIDEO, AVI) += yuv
All the FATE_ variables use underscores throughout, so please stick
to that naming convention (same above).
> +fate-seek-vsynth2-asv1: SRC = fate/vsynth2-asv1.avi
> +fate-seek-vsynth2-asv2: SRC = fate/vsynth2-asv2.avi
> +fate-seek-vsynth2-dnxhd-1080i: SRC = fate/vsynth2-dnxhd-1080i.mov
> +fate-seek-vsynth2-dnxhd-720p: SRC = fate/vsynth2-dnxhd-720p.dnxhd
> +fate-seek-vsynth2-dnxhd-720p-rd: SRC = fate/vsynth2-dnxhd-720p.dnxhd
> +fate-seek-vsynth2-dv: SRC = fate/vsynth2-dv.dv
> +fate-seek-vsynth2-dv-411: SRC = fate/vsynth2-dv-411.dv
> +fate-seek-vsynth2-dv-50: SRC = fate/vsynth2-dv-50.dv
> +fate-seek-vsynth2-ffv1: SRC = fate/vsynth2-ffv1.avi
> +fate-seek-vsynth2-flashsv: SRC = fate/vsynth2-flashsv.flv
> +fate-seek-vsynth2-flv: SRC = fate/vsynth2-flv.flv
> +fate-seek-vsynth2-h261: SRC = fate/vsynth2-h261.avi
> +fate-seek-vsynth2-h263: SRC = fate/vsynth2-h263.avi
> +fate-seek-vsynth2-h263p: SRC = fate/vsynth2-h263p.avi
> +fate-seek-vsynth2-huffyuv: SRC = fate/vsynth2-huffyuv.avi
> +fate-seek-vsynth2-jpegls: SRC = fate/vsynth2-jpegls.avi
> +fate-seek-vsynth2-ljpeg: SRC = fate/vsynth2-ljpeg.avi
> +fate-seek-vsynth2-mjpeg: SRC = fate/vsynth2-mjpeg.avi
> +fate-seek-vsynth2-mpeg1: SRC = fate/vsynth2-mpeg1.mpeg1video
> +fate-seek-vsynth2-mpeg1b: SRC = fate/vsynth2-mpeg1b.mpeg1video
> +fate-seek-vsynth2-mpeg2-422: SRC = fate/vsynth2-mpeg2-422.mpeg2video
> +fate-seek-vsynth2-mpeg2-idct-int: SRC =
> fate/vsynth2-mpeg2-idct-int.mpeg2video
> +fate-seek-vsynth2-mpeg2-ilace: SRC =
> fate/vsynth2-mpeg2-ilace.mpeg2video
> +fate-seek-vsynth2-mpeg2-ivlc-qprd: SRC =
> fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video
> +fate-seek-vsynth2-mpeg2-thread: SRC =
> fate/vsynth2-mpeg2-thread.mpeg2video
> +fate-seek-vsynth2-mpeg2-thread-ivlc: SRC =
> fate/vsynth2-mpeg2-thread-ivlc.mpeg2video
> +fate-seek-vsynth2-mpeg4: SRC = fate/vsynth2-mpeg4.mp4
> +fate-seek-vsynth2-mpeg4-adap: SRC = fate/vsynth2-mpeg4-adap.avi
> +fate-seek-vsynth2-mpeg4-adv: SRC = fate/vsynth2-mpeg4-adv.avi
> +fate-seek-vsynth2-mpeg4-error: SRC = fate/vsynth2-mpeg4-error.avi
> +fate-seek-vsynth2-mpeg4-nr: SRC = fate/vsynth2-mpeg4-nr.avi
> +fate-seek-vsynth2-mpeg4-qpel: SRC = fate/vsynth2-mpeg4-qpel.avi
> +fate-seek-vsynth2-mpeg4-qprd: SRC = fate/vsynth2-mpeg4-qprd.avi
> +fate-seek-vsynth2-mpeg4-rc: SRC = fate/vsynth2-mpeg4-rc.avi
> +fate-seek-vsynth2-mpeg4-thread: SRC = fate/vsynth2-mpeg4-thread.avi
> +fate-seek-vsynth2-msmpeg4: SRC = fate/vsynth2-msmpeg4.avi
> +fate-seek-vsynth2-msmpeg4v2: SRC = fate/vsynth2-msmpeg4v2.avi
> +fate-seek-vsynth2-rgb: SRC = fate/vsynth2-rgb.avi
> +fate-seek-vsynth2-roqvideo: SRC = fate/vsynth2-roqvideo.roq
> +fate-seek-vsynth2-rv10: SRC = fate/vsynth2-rv10.rm
> +fate-seek-vsynth2-rv20: SRC = fate/vsynth2-rv20.rm
> +fate-seek-vsynth2-svq1: SRC = fate/vsynth2-svq1.mov
> +fate-seek-vsynth2-wmv1: SRC = fate/vsynth2-wmv1.avi
> +fate-seek-vsynth2-wmv2: SRC = fate/vsynth2-wmv2.avi
> +fate-seek-vsynth2-yuv: SRC = fate/vsynth2-yuv.avi
alignment
> diff --git a/tests/ref/seek/dv_411_dv b/tests/ref/seek/vsynth2-dv
> similarity index 100%
> rename from tests/ref/seek/dv_411_dv
> rename to tests/ref/seek/vsynth2-dv
> diff --git a/tests/ref/seek/dv_dv b/tests/ref/seek/vsynth2-dv-411
> similarity index 100%
> rename from tests/ref/seek/dv_dv
> rename to tests/ref/seek/vsynth2-dv-411
Are the files identical and git's rename detection tripped or did you
slip up during rename?
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
