aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-11-28 16:59:13 +0100
committerDiego Biurrun <diego@biurrun.de>2012-11-28 19:36:13 +0100
commit47e7fb88158416460a45f54f9dfbcd716cd7a3b0 (patch)
tree247f54d5946b013991f4bf109554548b655f1db4
parent2c4593dd132ee765aaedc553ab5f13ed9afd497b (diff)
downloadffmpeg-47e7fb88158416460a45f54f9dfbcd716cd7a3b0.tar.gz
fate: Do not unconditionally run libavutil tests
Now that libavutil can be disabled, this should be conditional.
-rw-r--r--tests/Makefile1
-rw-r--r--tests/fate/libavutil.mak1
2 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 64ad6ad8ae..4e4eb897c0 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -98,7 +98,6 @@ FATE_SAMPLES-$(CONFIG_AVCONV) += $(FATE_SAMPLES_AVCONV)
FATE_SAMPLES += $(FATE_SAMPLES-yes)
FATE += $(FATE-yes)
-FATE += $(FATE_LIBAVUTIL)
$(FATE_AVCONV) $(FATE_SAMPLES_AVCONV): avconv$(EXESUF)
diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak
index 54f5da3f4f..9e5716200c 100644
--- a/tests/fate/libavutil.mak
+++ b/tests/fate/libavutil.mak
@@ -53,4 +53,5 @@ FATE_LIBAVUTIL += fate-xtea
fate-xtea: libavutil/xtea-test$(EXESUF)
fate-xtea: CMD = run libavutil/xtea-test
+FATE-$(CONFIG_AVUTIL) += $(FATE_LIBAVUTIL)
fate-libavutil: $(FATE_LIBAVUTIL)