Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge commit '698ac8f9cabd053f2c19346a77b92f8eae4218fc'

Browse Source 
* commit '698ac8f9cabd053f2c19346a77b92f8eae4218fc':
  fate: Make null comparison method more useful

Merged-by: James Almer <jamrial@gmail.com>
pull/273/head
James Almer 8 years ago
parent 749b35799c 698ac8f9ca
commit e1f01ce8d2
6 changed files with 20 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      tests/fate-run.sh
  2. 4
      tests/fate/api.mak
  3. 2
      tests/fate/checkasm.mak
  4. 6
      tests/fate/fft.mak
  5. 17
      tests/fate/libavcodec.mak
  6. 22
      tests/fate/libavutil.mak

2
tests/fate-run.sh
Unescape View File

@ -367,7 +367,7 @@ if [ $err -gt 128 ]; then
test "${sig}" = "${sig%[!A-Za-z]*}" || unset sig
fi
if test -e "$ref" || test $cmp = "oneline" || test $cmp = "grep" ; then
if test -e "$ref" || test $cmp = "oneline" || test $cmp = "null" || test $cmp = "grep" ; then
case $cmp in
diff) diff -u -b "$ref" "$outfile" >$cmpfile ;;
rawdiff)diff -u "$ref" "$outfile" >$cmpfile ;;

4
tests/fate/api.mak
Unescape View File

@ -2,13 +2,11 @@ FATE_API_LIBAVCODEC-$(call ENCDEC, FLAC, FLAC) += fate-api-flac
fate-api-flac: $(APITESTSDIR)/api-flac-test$(EXESUF)
fate-api-flac: CMD = run $(APITESTSDIR)/api-flac-test
fate-api-flac: CMP = null
fate-api-flac: REF = /dev/null
FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, FLV, FLV) += fate-api-band
fate-api-band: $(APITESTSDIR)/api-band-test$(EXESUF)
fate-api-band: CMD = run $(APITESTSDIR)/api-band-test $(TARGET_SAMPLES)/mpeg4/resize_down-up.h263
fate-api-band: CMP = null
fate-api-band: REF = /dev/null
FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, H264, H264) += fate-api-h264
fate-api-h264: $(APITESTSDIR)/api-h264-test$(EXESUF)
@ -18,7 +16,6 @@ FATE_API_LIBAVFORMAT-$(call DEMDEC, FLV, FLV) += fate-api-seek
fate-api-seek: $(APITESTSDIR)/api-seek-test$(EXESUF) fate-lavf-flv_fmt
fate-api-seek: CMD = run $(APITESTSDIR)/api-seek-test $(TARGET_PATH)/tests/data/lavf/lavf.flv 0 720
fate-api-seek: CMP = null
fate-api-seek: REF = /dev/null
FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, IMAGE2, PNG) += fate-api-png-codec-param
fate-api-png-codec-param: $(APITESTSDIR)/api-codec-param-test$(EXESUF)
@ -32,7 +29,6 @@ FATE_API-$(HAVE_THREADS) += fate-api-threadmessage
fate-api-threadmessage: $(APITESTSDIR)/api-threadmessage-test$(EXESUF)
fate-api-threadmessage: CMD = run $(APITESTSDIR)/api-threadmessage-test 3 10 30 50 2 20 40
fate-api-threadmessage: CMP = null
fate-api-threadmessage: REF = /dev/null
FATE_API_SAMPLES-$(CONFIG_AVFORMAT) += $(FATE_API_SAMPLES_LIBAVFORMAT-yes)

2
tests/fate/checkasm.mak
Unescape View File

@ -28,7 +28,7 @@ FATE_CHECKASM = fate-checkasm-aacpsdsp \
$(FATE_CHECKASM): tests/checkasm/checkasm$(EXESUF)
$(FATE_CHECKASM): CMD = run tests/checkasm/checkasm --test=$(@:fate-checkasm-%=%)
$(FATE_CHECKASM): REF = /dev/null
$(FATE_CHECKASM): CMP = null
FATE-$(CONFIG_STATIC) += $(FATE_CHECKASM)
fate-checkasm: $(FATE_CHECKASM)

6
tests/fate/fft.mak
Unescape View File

@ -46,7 +46,7 @@ FATE_FFT_FIXED_ALL = $(FATE_FFT_FIXED-yes) $(FATE_MDCT_FIXED-yes)
$(FATE_FFT_FIXED_ALL): libavcodec/tests/fft-fixed$(EXESUF)
$(FATE_FFT_FIXED_ALL): CMD = run libavcodec/tests/fft-fixed $(CPUFLAGS:%=-c%) $(ARGS)
$(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL): REF = /dev/null
$(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL): CMP = null
define DEF_FFT_FIXED32
FATE_FFT_FIXED32 += fate-fft-fixed32-$(1) fate-ifft-fixed32-$(1) \
@ -63,7 +63,7 @@ $(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_FFT_FIXED32,$(N))))
fate-fft-fixed32: $(FATE_FFT_FIXED32)
$(FATE_FFT_FIXED32): libavcodec/tests/fft-fixed32$(EXESUF)
$(FATE_FFT_FIXED32): CMD = run libavcodec/tests/fft-fixed32 $(CPUFLAGS:%=-c%) $(ARGS)
$(FATE_FFT_FIXED32): REF = /dev/null
$(FATE_FFT_FIXED32): CMP = null
define DEF_AV_FFT
FATE_AV_DCT-$(CONFIG_DCT) += fate-av-dct1d-$(1) fate-av-idct1d-$(1)
@ -92,7 +92,7 @@ FATE_AV_FFT_ALL = $(FATE_AV_DCT-yes) $(FATE_AV_FFT-yes) $(FATE_AV_MDCT-yes) $(FA
$(FATE_AV_FFT_ALL): libavcodec/tests/avfft$(EXESUF)
$(FATE_AV_FFT_ALL): CMD = run libavcodec/tests/avfft $(CPUFLAGS:%=-c%) $(ARGS)
$(FATE_AV_FFT_ALL): REF = /dev/null
$(FATE_AV_FFT_ALL): CMP = null
fate-dct: fate-dct-float
fate-fft: fate-fft-float fate-fft-fixed fate-fft-fixed32

17
tests/fate/libavcodec.mak
Unescape View File

@ -1,50 +1,45 @@
FATE_LIBAVCODEC-yes += fate-avpacket
fate-avpacket: libavcodec/tests/avpacket$(EXESUF)
fate-avpacket: CMD = run libavcodec/tests/avpacket
fate-avpacket: REF = /dev/null
fate-avpacket: CMP = null
FATE_LIBAVCODEC-$(CONFIG_CABAC) += fate-cabac
fate-cabac: libavcodec/tests/cabac$(EXESUF)
fate-cabac: CMD = run libavcodec/tests/cabac
fate-cabac: REF = /dev/null
fate-cabac: CMP = null
FATE_LIBAVCODEC-yes += fate-celp_math
fate-celp_math: libavcodec/tests/celp_math$(EXESUF)
fate-celp_math: CMD = run libavcodec/tests/celp_math
fate-celp_math: REF = /dev/null
fate-celp_math: CMP = null
FATE_LIBAVCODEC-$(CONFIG_GOLOMB) += fate-golomb
fate-golomb: libavcodec/tests/golomb$(EXESUF)
fate-golomb: CMD = run libavcodec/tests/golomb
fate-golomb: REF = /dev/null
fate-golomb: CMP = null
FATE_LIBAVCODEC-$(CONFIG_IDCTDSP) += fate-idct8x8-0 fate-idct8x8-1 fate-idct8x8-2 fate-idct248
fate-idct8x8-0: libavcodec/tests/dct$(EXESUF)
fate-idct8x8-0: CMD = run libavcodec/tests/dct -i 0
fate-idct8x8-0: CMP = null
fate-idct8x8-0: REF = /dev/null
fate-idct8x8-1: libavcodec/tests/dct$(EXESUF)
fate-idct8x8-1: CMD = run libavcodec/tests/dct -i 1
fate-idct8x8-1: CMP = null
fate-idct8x8-1: REF = /dev/null
fate-idct8x8-2: libavcodec/tests/dct$(EXESUF)
fate-idct8x8-2: CMD = run libavcodec/tests/dct -i 2
fate-idct8x8-2: CMP = null
fate-idct8x8-2: REF = /dev/null
fate-idct248: libavcodec/tests/dct$(EXESUF)
fate-idct248: CMD = run libavcodec/tests/dct -4
fate-idct248: CMP = null
fate-idct248: REF = /dev/null
FATE_LIBAVCODEC-$(CONFIG_IDCTDSP) += fate-dct8x8
fate-dct8x8: libavcodec/tests/dct$(EXESUF)
fate-dct8x8: CMD = run libavcodec/tests/dct
fate-dct8x8: CMP = null
fate-dct8x8: REF = /dev/null
FATE_LIBAVCODEC-$(CONFIG_IIRFILTER) += fate-iirfilter
fate-iirfilter: libavcodec/tests/iirfilter$(EXESUF)
@ -58,13 +53,11 @@ FATE_LIBAVCODEC-$(CONFIG_RANGECODER) += fate-rangecoder
fate-rangecoder: libavcodec/tests/rangecoder$(EXESUF)
fate-rangecoder: CMD = run libavcodec/tests/rangecoder
fate-rangecoder: CMP = null
fate-rangecoder: REF = /dev/null
FATE_LIBAVCODEC-yes += fate-mathops
fate-mathops: libavcodec/tests/mathops$(EXESUF)
fate-mathops: CMD = run libavcodec/tests/mathops
fate-mathops: CMP = null
fate-mathops: REF = /dev/null
FATE_LIBAVCODEC-$(CONFIG_JPEG2000_ENCODER) += fate-j2k-dwt
fate-j2k-dwt: libavcodec/tests/jpeg2000dwt$(EXESUF)
@ -74,13 +67,11 @@ FATE_LIBAVCODEC-yes += fate-libavcodec-utils
fate-libavcodec-utils: libavcodec/tests/utils$(EXESUF)
fate-libavcodec-utils: CMD = run libavcodec/tests/utils
fate-libavcodec-utils: CMP = null
fate-libavcodec-utils: REF = /dev/null
FATE_LIBAVCODEC-yes += fate-libavcodec-huffman
fate-libavcodec-huffman: libavcodec/tests/mjpegenc_huffman$(EXESUF)
fate-libavcodec-huffman: CMD = run libavcodec/tests/mjpegenc_huffman
fate-libavcodec-huffman: CMP = null
fate-libavcodec-huffman: REF = /dev/null
FATE_LIBAVCODEC-yes += fate-libavcodec-htmlsubtitles
fate-libavcodec-htmlsubtitles: libavcodec/tests/htmlsubtitles$(EXESUF)

22
tests/fate/libavutil.mak
Unescape View File

@ -1,32 +1,32 @@
FATE_LIBAVUTIL += fate-adler32
fate-adler32: libavutil/tests/adler32$(EXESUF)
fate-adler32: CMD = run libavutil/tests/adler32
fate-adler32: REF = /dev/null
fate-adler32: CMP = null
FATE_LIBAVUTIL += fate-aes
fate-aes: libavutil/tests/aes$(EXESUF)
fate-aes: CMD = run libavutil/tests/aes
fate-aes: REF = /dev/null
fate-aes: CMP = null
FATE_LIBAVUTIL += fate-aes_ctr
fate-aes_ctr: libavutil/tests/aes_ctr$(EXESUF)
fate-aes_ctr: CMD = run libavutil/tests/aes_ctr
fate-aes_ctr: REF = /dev/null
fate-aes_ctr: CMP = null
FATE_LIBAVUTIL += fate-camellia
fate-camellia: libavutil/tests/camellia$(EXESUF)
fate-camellia: CMD = run libavutil/tests/camellia
fate-camellia: REF = /dev/null
fate-camellia: CMP = null
FATE_LIBAVUTIL += fate-cast5
fate-cast5: libavutil/tests/cast5$(EXESUF)
fate-cast5: CMD = run libavutil/tests/cast5
fate-cast5: REF = /dev/null
fate-cast5: CMP = null
FATE_LIBAVUTIL += fate-atomic
fate-atomic: libavutil/tests/atomic$(EXESUF)
fate-atomic: CMD = run libavutil/tests/atomic
fate-atomic: REF = /dev/null
fate-atomic: CMP = null
FATE_LIBAVUTIL += fate-audio_fifo
fate-audio_fifo: libavutil/tests/audio_fifo$(EXESUF)
@ -51,12 +51,12 @@ fate-bprint: CMD = run libavutil/tests/bprint
FATE_LIBAVUTIL += fate-cpu
fate-cpu: libavutil/tests/cpu$(EXESUF)
fate-cpu: CMD = runecho libavutil/tests/cpu $(CPUFLAGS:%=-c%) $(THREADS:%=-t%)
fate-cpu: REF = /dev/null
fate-cpu: CMP = null
FATE_LIBAVUTIL-$(HAVE_THREADS) += fate-cpu_init
fate-cpu_init: libavutil/tests/cpu_init$(EXESUF)
fate-cpu_init: CMD = run libavutil/tests/cpu_init
fate-cpu_init: REF = /dev/null
fate-cpu_init: CMP = null
FATE_LIBAVUTIL += fate-crc
fate-crc: libavutil/tests/crc$(EXESUF)
@ -69,7 +69,7 @@ fate-color_utils: CMD = run libavutil/tests/color_utils
FATE_LIBAVUTIL += fate-des
fate-des: libavutil/tests/des$(EXESUF)
fate-des: CMD = run libavutil/tests/des
fate-des: REF = /dev/null
fate-des: CMP = null
FATE_LIBAVUTIL += fate-dict
fate-dict: libavutil/tests/dict$(EXESUF)
@ -142,12 +142,12 @@ fate-sha512: CMD = run libavutil/tests/sha512
FATE_LIBAVUTIL += fate-tree
fate-tree: libavutil/tests/tree$(EXESUF)
fate-tree: CMD = run libavutil/tests/tree
fate-tree: REF = /dev/null
fate-tree: CMP = null
FATE_LIBAVUTIL += fate-twofish
fate-twofish: libavutil/tests/twofish$(EXESUF)
fate-twofish: CMD = run libavutil/tests/twofish
fate-twofish: REF = /dev/null
fate-twofish: CMP = null
FATE_LIBAVUTIL += fate-xtea
fate-xtea: libavutil/tests/xtea$(EXESUF)

Write Preview
Loading…
Cancel
Save