diff options
| author | George Boyle <george@thebuds.net> | 2015-06-25 18:37:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-27 03:43:23 +0200 |
| commit | 7728d231a6cb5c31bf59a29ccc89193c82389e01 (patch) | |
| tree | b5e32e2267c9d384651cb46acd1eb61432f05554 | |
| parent | 3f18cb97e5a7b1ef1094e78ef3937944573347eb (diff) | |
| download | ffmpeg-7728d231a6cb5c31bf59a29ccc89193c82389e01.tar.gz | |
fate/api-tests: Move api-flac-test to API tests directory.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | tests/Makefile | 1 | ||||
| -rw-r--r-- | tests/api/Makefile | 1 | ||||
| -rw-r--r-- | tests/api/api-flac-test.c (renamed from libavcodec/api-flac-test.c) | 2 | ||||
| -rw-r--r-- | tests/fate/api.mak | 8 | ||||
| -rw-r--r-- | tests/fate/libavcodec.mak | 6 |
6 files changed, 11 insertions, 9 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8ff9507283..bcb9217121 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -904,8 +904,6 @@ TESTPROGS = imgconvert \ options \ avfft \ -TESTPROGS += api-flac - TESTPROGS-$(CONFIG_CABAC) += cabac TESTPROGS-$(CONFIG_FFT) += fft fft-fixed fft-fixed32 TESTPROGS-$(CONFIG_IDCTDSP) += dct diff --git a/tests/Makefile b/tests/Makefile index f4f34a66b3..923ac72b47 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -104,6 +104,7 @@ include $(SRC_PATH)/tests/fate/alac.mak include $(SRC_PATH)/tests/fate/als.mak include $(SRC_PATH)/tests/fate/amrnb.mak include $(SRC_PATH)/tests/fate/amrwb.mak +include $(SRC_PATH)/tests/fate/api.mak include $(SRC_PATH)/tests/fate/atrac.mak include $(SRC_PATH)/tests/fate/audio.mak include $(SRC_PATH)/tests/fate/bmp.mak diff --git a/tests/api/Makefile b/tests/api/Makefile index 7010b00178..86c0cf22e5 100644 --- a/tests/api/Makefile +++ b/tests/api/Makefile @@ -1,3 +1,4 @@ +APITESTPROGS-$(call ENCDEC, FLAC, FLAC) += api-flac APITESTPROGS += $(APITESTPROGS-yes) APITESTOBJS := $(APITESTOBJS:%=$(APITESTSDIR)%) $(APITESTPROGS:%=$(APITESTSDIR)/%-test.o) diff --git a/libavcodec/api-flac-test.c b/tests/api/api-flac-test.c index 402d4df2e1..a6180bcf40 100644 --- a/libavcodec/api-flac-test.c +++ b/tests/api/api-flac-test.c @@ -27,7 +27,7 @@ * after that. */ -#include "avcodec.h" +#include "libavcodec/avcodec.h" #include "libavutil/common.h" #include "libavutil/samplefmt.h" diff --git a/tests/fate/api.mak b/tests/fate/api.mak new file mode 100644 index 0000000000..2127b9b94d --- /dev/null +++ b/tests/fate/api.mak @@ -0,0 +1,8 @@ +FATE_API_LIBAVCODEC-$(call ENCDEC, FLAC, FLAC) += fate-api-flac +fate-api-flac: $(APITESTSDIR)/api-flac-test$(EXESUF) +fate-api-flac: CMD = run $(APITESTSDIR)/api-flac-test +fate-api-flac: CMP = null +fate-api-flac: REF = /dev/null + +FATE-$(CONFIG_AVCODEC) += $(FATE_API_LIBAVCODEC-yes) +fate-api: $(FATE_API_LIBAVCODEC-yes) diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index fbd8b83527..22c08394b2 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -39,11 +39,5 @@ fate-j2k-dwt: libavcodec/jpeg2000dwt-test$(EXESUF) fate-j2k-dwt: CMD = run libavcodec/jpeg2000dwt-test -FATE_LIBAVCODEC-$(call ENCDEC, FLAC, FLAC) += fate-api-flac -fate-api-flac: libavcodec/api-flac-test$(EXESUF) -fate-api-flac: CMD = run libavcodec/api-flac-test -fate-api-flac: CMP = null -fate-api-flac: REF = /dev/null - FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC-yes) fate-libavcodec: $(FATE_LIBAVCODEC-yes) |