From ca3b27455234fbd216a1be088587c97a1927e316 Mon Sep 17 00:00:00 2001
From: Ludmila Glinskih <lglinskih@gmail.com>
Date: Sun, 28 Jun 2015 01:50:25 +0300
Subject: [PATCH] api-h264-test: build with another api test
Location of api-h264-test changed to special directory for api tests.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavformat/Makefile | 1 -
tests/api/Makefile | 1 +
{libavformat => tests/api}/api-h264-test.c | 0
tests/fate/api.mak | 9 ++++++++-
tests/fate/libavformat.mak | 4 ----
5 files changed, 9 insertions(+), 6 deletions(-)
rename {libavformat => tests/api}/api-h264-test.c (100%)
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 17e2214d798..cfff6aab46c 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -549,7 +549,6 @@ TESTPROGS = seek \
url \
TESTPROGS-$(CONFIG_NETWORK) += noproxy
-TESTPROGS-yes += api-h264
TESTPROGS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh
TOOLS = aviocat \
diff --git a/tests/api/Makefile b/tests/api/Makefile
index 9f82be2c291..704987e1ade 100644
--- a/tests/api/Makefile
+++ b/tests/api/Makefile
@@ -1,4 +1,5 @@
APITESTPROGS-$(call ENCDEC, FLAC, FLAC) += api-flac
+APITESTPROGS-$(call DEMDEC, H264, H264) += api-h264
APITESTPROGS += $(APITESTPROGS-yes)
APITESTOBJS := $(APITESTOBJS:%=$(APITESTSDIR)%) $(APITESTPROGS:%=$(APITESTSDIR)/%-test.o)
diff --git a/libavformat/api-h264-test.c b/tests/api/api-h264-test.c
similarity index 100%
rename from libavformat/api-h264-test.c
rename to tests/api/api-h264-test.c
diff --git a/tests/fate/api.mak b/tests/fate/api.mak
index 2127b9b94d4..da5003646b5 100644
--- a/tests/fate/api.mak
+++ b/tests/fate/api.mak
@@ -4,5 +4,12 @@ fate-api-flac: CMD = run $(APITESTSDIR)/api-flac-test
fate-api-flac: CMP = null
fate-api-flac: REF = /dev/null
+FATE_API_SAMPLES-LIBAVFORMAT-$(call DEMDEC, H264, H264) += fate-api-h264
+fate-api-h264: $(APITESTSDIR)/api-h264-test$(EXESUF)
+fate-api-h264: CMD = run $(APITESTSDIR)/api-h264-test $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264
+
FATE-$(CONFIG_AVCODEC) += $(FATE_API_LIBAVCODEC-yes)
-fate-api: $(FATE_API_LIBAVCODEC-yes)
+FATE_API_SAMPLES-$(CONFIG_AVFORMAT) += $(FATE_API_SAMPLES-LIBAVFORMAT-yes)
+FATE_SAMPLES_AVCONV += $(FATE_API_SAMPLES-yes)
+
+fate-api: $(FATE_API_LIBAVCODEC-yes) $(FATE_API_SAMPLES-yes)
diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak
index 0e1ff62ba1a..a9c02bcbaf9 100644
--- a/tests/fate/libavformat.mak
+++ b/tests/fate/libavformat.mak
@@ -14,9 +14,5 @@ FATE_LIBAVFORMAT-yes += fate-url
fate-url: libavformat/url-test$(EXESUF)
fate-url: CMD = run libavformat/url-test
-FATE_SAMPLES_AVCONV-$(call DEMDEC, H264, H264) += fate-api-h264
-fate-api-h264: libavformat/api-h264-test$(EXESUF)
-fate-api-h264: CMD = run libavformat/api-h264-test $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264
-
FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT-yes)
fate-libavformat: $(FATE_LIBAVFORMAT)
--
GitLab