Merge commit '07d8fa58121be8fe315bd51ab760547fe209a745'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 01:51:17 +0000 (03:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 01:51:17 +0000 (03:51 +0200)
* commit '07d8fa58121be8fe315bd51ab760547fe209a745':
  fate: add informative cpu test

Conflicts:
tests/fate/libavutil.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/cpu.c
tests/fate/libavutil.mak

diff --cc libavutil/cpu.c
Simple merge
@@@ -25,15 -25,10 +25,14 @@@ FATE_LIBAVUTIL += fate-blowfis
  fate-blowfish: libavutil/blowfish-test$(EXESUF)
  fate-blowfish: CMD = run libavutil/blowfish-test
  
 +FATE_LIBAVUTIL += fate-bprint
 +fate-bprint: libavutil/bprint-test$(EXESUF)
 +fate-bprint: CMD = run libavutil/bprint-test
 +
  FATE_LIBAVUTIL += fate-cpu
  fate-cpu: libavutil/cpu-test$(EXESUF)
- fate-cpu: CMD = runecho libavutil/cpu-test
+ fate-cpu: CMD = run libavutil/cpu-test $(CPUFLAGS:%=-c%)
  fate-cpu: REF = /dev/null
- fate-cpu: CMP = null
  
  FATE_LIBAVUTIL += fate-crc
  fate-crc: libavutil/crc-test$(EXESUF)