ffmpeg | branch: master | James Almer <[email protected]> | Sat Nov 11 13:16:24 2017 -0300| [37d5c6c30d38f8e2fe0a57afec58b0ae539c307d] | committer: James Almer
Merge commit '39e16ee2289e4240a82597b97db5541bbbd2b996' * commit '39e16ee2289e4240a82597b97db5541bbbd2b996': Revert "fate: Skip the checkasm test if CONFIG_STATIC is disabled" Merged-by: James Almer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37d5c6c30d38f8e2fe0a57afec58b0ae539c307d --- tests/fate/checkasm.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index fbf60e9848..fe0fd9729f 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -30,5 +30,5 @@ $(FATE_CHECKASM): tests/checkasm/checkasm$(EXESUF) $(FATE_CHECKASM): CMD = run tests/checkasm/checkasm --test=$(@:fate-checkasm-%=%) $(FATE_CHECKASM): CMP = null -FATE-$(CONFIG_STATIC) += $(FATE_CHECKASM) +FATE += $(FATE_CHECKASM) fate-checkasm: $(FATE_CHECKASM) ====================================================================== diff --cc tests/fate/checkasm.mak index fbf60e9848,939eb567cd..fe0fd9729f --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@@ -28,7 -17,7 +28,7 @@@ FATE_CHECKASM = fate-checkasm-aacpsds $(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 += $(FATE_CHECKASM) fate-checkasm: $(FATE_CHECKASM) _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
