[FFmpeg-cvslog] Merge commit '4537647c0429fe7c8ee655ac3fda856ba67f58a0'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Fri Mar 31 10:13:25 2017 +0200| [a5c29c608fb810f46db5ef0c7400cca5be894844] | committer: Clément Bœsch

Merge commit '4537647c0429fe7c8ee655ac3fda856ba67f58a0'

* commit '4537647c0429fe7c8ee655ac3fda856ba67f58a0':
  fate: checkasm: Split monolithic test into individual components

Merged-by: Clément Bœsch <cboesch at gopro.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5c29c608fb810f46db5ef0c7400cca5be894844
---

 tests/fate/checkasm.mak | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak
index daefe69..aa37b96 100644
--- a/tests/fate/checkasm.mak
+++ b/tests/fate/checkasm.mak
@@ -1,5 +1,28 @@
-fate-checkasm: tests/checkasm/checkasm$(EXESUF)
-fate-checkasm: CMD = run tests/checkasm/checkasm
-fate-checkasm: REF = /dev/null
+FATE_CHECKASM = fate-checkasm-alacdsp                                   \
+                fate-checkasm-audiodsp                                  \
+                fate-checkasm-blockdsp                                  \
+                fate-checkasm-bswapdsp                                  \
+                fate-checkasm-flacdsp                                   \
+                fate-checkasm-fmtconvert                                \
+                fate-checkasm-h264dsp                                   \
+                fate-checkasm-h264pred                                  \
+                fate-checkasm-h264qpel                                  \
+                fate-checkasm-hevc_add_res                              \
+                fate-checkasm-hevc_idct                                 \
+                fate-checkasm-jpeg2000dsp                               \
+                fate-checkasm-llviddsp                                  \
+                fate-checkasm-pixblockdsp                               \
+                fate-checkasm-synth_filter                              \
+                fate-checkasm-v210enc                                   \
+                fate-checkasm-vf_blend                                  \
+                fate-checkasm-vf_colorspace                             \
+                fate-checkasm-videodsp                                  \
+                fate-checkasm-vp8dsp                                    \
+                fate-checkasm-vp9dsp                                    \
 
-FATE += fate-checkasm
+$(FATE_CHECKASM): tests/checkasm/checkasm$(EXESUF)
+$(FATE_CHECKASM): CMD = run tests/checkasm/checkasm --test=$(@:fate-checkasm-%=%)
+$(FATE_CHECKASM): REF = /dev/null
+
+FATE += $(FATE_CHECKASM)
+fate-checkasm: $(FATE_CHECKASM)


======================================================================

diff --cc tests/fate/checkasm.mak
index daefe69,939eb56..aa37b96
--- a/tests/fate/checkasm.mak
+++ b/tests/fate/checkasm.mak
@@@ -1,5 -1,23 +1,28 @@@
- fate-checkasm: tests/checkasm/checkasm$(EXESUF)
- fate-checkasm: CMD = run tests/checkasm/checkasm
- fate-checkasm: REF = /dev/null
 -FATE_CHECKASM = fate-checkasm-audiodsp                                  \
++FATE_CHECKASM = fate-checkasm-alacdsp                                   \
++                fate-checkasm-audiodsp                                  \
+                 fate-checkasm-blockdsp                                  \
+                 fate-checkasm-bswapdsp                                  \
 -                fate-checkasm-dcadsp                                    \
++                fate-checkasm-flacdsp                                   \
+                 fate-checkasm-fmtconvert                                \
+                 fate-checkasm-h264dsp                                   \
+                 fate-checkasm-h264pred                                  \
+                 fate-checkasm-h264qpel                                  \
+                 fate-checkasm-hevc_add_res                              \
+                 fate-checkasm-hevc_idct                                 \
 -                fate-checkasm-hevc_mc                                   \
 -                fate-checkasm-huffyuvdsp                                \
++                fate-checkasm-jpeg2000dsp                               \
++                fate-checkasm-llviddsp                                  \
++                fate-checkasm-pixblockdsp                               \
+                 fate-checkasm-synth_filter                              \
+                 fate-checkasm-v210enc                                   \
++                fate-checkasm-vf_blend                                  \
++                fate-checkasm-vf_colorspace                             \
++                fate-checkasm-videodsp                                  \
+                 fate-checkasm-vp8dsp                                    \
+                 fate-checkasm-vp9dsp                                    \
  
- FATE += fate-checkasm
+ $(FATE_CHECKASM): tests/checkasm/checkasm$(EXESUF)
+ $(FATE_CHECKASM): CMD = run tests/checkasm/checkasm --test=$(@:fate-checkasm-%=%)
+ $(FATE_CHECKASM): REF = /dev/null
+ 
+ FATE += $(FATE_CHECKASM)
+ fate-checkasm: $(FATE_CHECKASM)