diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 03:51:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 03:51:17 +0200 |
| commit | 01fc6533aa4175bad4b926361d017801aff9c53c (patch) | |
| tree | c01a1315b2e41eb376a03436d1040bb0db30005e /tests/fate/libavutil.mak | |
| parent | b4d4f8f8266e6407f21a62110905b27d3d3d71da (diff) | |
| parent | 07d8fa58121be8fe315bd51ab760547fe209a745 (diff) | |
| download | ffmpeg-01fc6533aa4175bad4b926361d017801aff9c53c.tar.gz | |
Merge commit '07d8fa58121be8fe315bd51ab760547fe209a745'
* commit '07d8fa58121be8fe315bd51ab760547fe209a745':
fate: add informative cpu test
Conflicts:
tests/fate/libavutil.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/libavutil.mak')
| -rw-r--r-- | tests/fate/libavutil.mak | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak index 526ec16faf..8784cff019 100644 --- a/tests/fate/libavutil.mak +++ b/tests/fate/libavutil.mak @@ -31,9 +31,8 @@ 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) |