Merge commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 09:27:18 +0000 (11:27 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 09:27:18 +0000 (11:27 +0200)
* commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f':
  fate: Skip the checkasm test if CONFIG_STATIC is disabled

Merged-by: Clément Bœsch <cboesch@gopro.com>
1  2 
tests/fate/checkasm.mak

diff --combined tests/fate/checkasm.mak
@@@ -1,23 -1,17 +1,23 @@@
 -FATE_CHECKASM = fate-checkasm-audiodsp                                  \
 +FATE_CHECKASM = fate-checkasm-alacdsp                                   \
 +                fate-checkasm-audiodsp                                  \
                  fate-checkasm-blockdsp                                  \
                  fate-checkasm-bswapdsp                                  \
 -                fate-checkasm-dcadsp                                    \
 +                fate-checkasm-fixed_dsp                                 \
 +                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                                    \
  
@@@ -25,5 -19,5 +25,5 @@@ $(FATE_CHECKASM): tests/checkasm/checka
  $(FATE_CHECKASM): CMD = run tests/checkasm/checkasm --test=$(@:fate-checkasm-%=%)
  $(FATE_CHECKASM): REF = /dev/null
  
- FATE += $(FATE_CHECKASM)
+ FATE-$(CONFIG_STATIC) += $(FATE_CHECKASM)
  fate-checkasm: $(FATE_CHECKASM)