[FFmpeg-cvslog] Merge commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Fri May  5 11:27:18 2017 +0200| [373bfe4fcaff48e0546662e818bfce7812bf75e7] | committer: Clément Bœsch

Merge commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f'

* commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f':
  fate: Skip the checkasm test if CONFIG_STATIC is disabled

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

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

 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 c7b6b36ebb..70ec824f5b 100644
--- a/tests/fate/checkasm.mak
+++ b/tests/fate/checkasm.mak
@@ -25,5 +25,5 @@ $(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-$(CONFIG_STATIC) += $(FATE_CHECKASM)
 fate-checkasm: $(FATE_CHECKASM)


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