Commit a6a750c7 authored by Diego Biurrun's avatar Diego Biurrun

tests: Move all test programs to a subdirectory

parent 257f00ec
......@@ -17,7 +17,6 @@
*.so.*
*.swp
*.ver
*-test
/.config
/.version
/avconv
......
......@@ -15,8 +15,8 @@ LDLIBS = $(FFLIBS:%=%$(BUILDSUF))
FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS)
OBJS := $(sort $(OBJS:%=$(SUBDIR)%))
TESTOBJS := $(TESTOBJS:%=$(SUBDIR)%) $(TESTPROGS:%=$(SUBDIR)%-test.o)
TESTPROGS := $(TESTPROGS:%=$(SUBDIR)%-test$(EXESUF))
TESTOBJS := $(TESTOBJS:%=$(SUBDIR)tests/%) $(TESTPROGS:%=$(SUBDIR)tests/%.o)
TESTPROGS := $(TESTPROGS:%=$(SUBDIR)tests/%$(EXESUF))
HOSTOBJS := $(HOSTPROGS:%=$(SUBDIR)%.o)
HOSTPROGS := $(HOSTPROGS:%=$(SUBDIR)%$(HOSTEXESUF))
TOOLS += $(TOOLS-yes)
......@@ -58,8 +58,7 @@ LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
define RULES
clean::
$(RM) $(HOSTPROGS)
$(RM) $(TOOLS)
$(RM) $(HOSTPROGS) $(TESTPROGS) $(TOOLS)
endef
$(eval $(RULES))
......
......@@ -813,7 +813,7 @@ HOSTPROGS = aac_tablegen \
CLEANFILES = *_tables.c *_tables.h *_tablegen$(HOSTEXESUF)
$(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o $(SUBDIR)aandcttab.o
$(SUBDIR)tests/dct$(EXESUF): $(SUBDIR)dctref.o $(SUBDIR)aandcttab.o
$(SUBDIR)dv_tablegen$(HOSTEXESUF): $(SUBDIR)dvdata_host.o
TRIG_TABLES = cos cos_fixed sin
......
/dct
/fft
/fft-fixed
/golomb
/iirfilter
/rangecoder
......@@ -18,7 +18,7 @@
#include "config.h"
#include "idct.h"
#include "libavcodec/arm/idct.h"
static const struct algo fdct_tab_arch[] = {
{ 0 }
......
......@@ -36,17 +36,18 @@
#include "libavutil/cpu.h"
#include "libavutil/common.h"
#include "libavutil/internal.h"
#include "libavutil/lfg.h"
#include "libavutil/time.h"
#include "dct.h"
#include "idctdsp.h"
#include "simple_idct.h"
#include "xvididct.h"
#include "aandcttab.h"
#include "faandct.h"
#include "faanidct.h"
#include "dctref.h"
#include "libavcodec/aandcttab.h"
#include "libavcodec/dct.h"
#include "libavcodec/dctref.h"
#include "libavcodec/faandct.h"
#include "libavcodec/faanidct.h"
#include "libavcodec/idctdsp.h"
#include "libavcodec/simple_idct.h"
#include "libavcodec/xvididct.h"
struct algo {
const char *name;
......@@ -78,11 +79,11 @@ static const struct algo idct_tab[] = {
};
#if ARCH_ARM
#include "arm/dct-test.c"
#include "arm/dct.c"
#elif ARCH_PPC
#include "ppc/dct-test.c"
#include "ppc/dct.c"
#elif ARCH_X86
#include "x86/dct-test.c"
#include "x86/dct.c"
#else
static const struct algo fdct_tab_arch[] = { { 0 } };
static const struct algo idct_tab_arch[] = { { 0 } };
......
......@@ -17,4 +17,4 @@
*/
#define FFT_FLOAT 0
#include "fft-test.c"
#include "fft.c"
......@@ -39,10 +39,10 @@
#include "libavutil/mathematics.h"
#include "libavutil/time.h"
#include "fft.h"
#include "libavcodec/fft.h"
#if FFT_FLOAT
#include "dct.h"
#include "rdft.h"
#include "libavcodec/dct.h"
#include "libavcodec/rdft.h"
#endif
/* reference fft */
......
......@@ -21,9 +21,9 @@
#include "libavutil/mem.h"
#include "get_bits.h"
#include "golomb.h"
#include "put_bits.h"
#include "libavcodec/get_bits.h"
#include "libavcodec/put_bits.h"
#include "libavcodec/golomb.h"
#define COUNT 8191
#define SIZE (COUNT * 4)
......
......@@ -22,7 +22,7 @@
#include "libavutil/libm.h"
#include "iirfilter.h"
#include "libavcodec/iirfilter.h"
#define FILT_ORDER 4
#define SIZE 1024
......
......@@ -18,7 +18,7 @@
#include "config.h"
#include "fdct.h"
#include "libavcodec/ppc/fdct.h"
static const struct algo fdct_tab_arch[] = {
#if HAVE_ALTIVEC && HAVE_BIGENDIAN
......
......@@ -22,7 +22,7 @@
#include "libavutil/lfg.h"
#include "libavutil/log.h"
#include "rangecoder.h"
#include "libavcodec/rangecoder.h"
#define SIZE 10240
......
......@@ -18,9 +18,9 @@
#include "config.h"
#include "fdct.h"
#include "xvididct.h"
#include "simple_idct.h"
#include "libavcodec/x86/fdct.h"
#include "libavcodec/x86/xvididct.h"
#include "libavcodec/x86/simple_idct.h"
static const struct algo fdct_tab_arch[] = {
#if HAVE_MMX_INLINE
......
......@@ -21,7 +21,7 @@
#include "libavutil/common.h"
#include "libavutil/lfg.h"
#include "timefilter.h"
#include "libavdevice/timefilter.h"
#define LFG_MAX ((1LL << 32) - 1)
......
/movenc
/noproxy
/seek
/srtp
/url
......@@ -24,7 +24,7 @@
#include "libavutil/mathematics.h"
#include "libavutil/md5.h"
#include "avformat.h"
#include "libavformat/avformat.h"
#if HAVE_UNISTD_H
#include <unistd.h>
......
......@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "network.h"
#include "libavformat/network.h"
static void test(const char *pattern, const char *host)
{
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "rtmpdh.c"
#include "libavformat/rtmpdh.c"
#include <stdio.h>
......
......@@ -26,6 +26,7 @@
#include "libavutil/common.h"
#include "libavutil/mathematics.h"
#include "libavformat/avformat.h"
static char buffer[20];
......
......@@ -20,8 +20,8 @@
#include <stdio.h>
#include <string.h>
#include "rtpdec.h"
#include "srtp.h"
#include "libavformat/rtpdec.h"
#include "libavformat/srtp.h"
static const char *aes128_80_key = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmn";
......
......@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "url.h"
#include "libavformat/url.h"
static void test(const char *base, const char *rel)
{
......
......@@ -30,7 +30,8 @@
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "libavutil/samplefmt.h"
#include "avresample.h"
#include "libavresample/avresample.h"
static double dbl_rand(AVLFG *lfg)
{
......
......@@ -111,7 +111,7 @@ static const uint8_t S_boxes[8][32] = {
#else
/**
* This table contains the results of applying both the S-box and P-shuffle.
* It can be regenerated by compiling des-test.c with "-DCONFIG_SMALL -DGENTABLES".
* It can be regenerated by compiling tests/des.c with "-DCONFIG_SMALL -DGENTABLES".
*/
static const uint32_t S_boxes_P_shuffle[8][64] = {
{ 0x00808200, 0x00000000, 0x00008000, 0x00808202, 0x00808002, 0x00008202, 0x00000002, 0x00008000,
......
/adler32
/aes
/atomic
/avstring
/base64
/blowfish
/cpu
/crc
/des
/eval
/fifo
/float_dsp
/hmac
/lfg
/lls
/md5
/opt
/parseutils
/sha
/tree
/xtea
......@@ -18,9 +18,9 @@
#include <string.h>
#include "log.h"
#include "timer.h"
#include "adler32.h"
#include "libavutil/log.h"
#include "libavutil/timer.h"
#include "libavutil/adler32.h"
#define LEN 7001
......
......@@ -16,12 +16,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "aes.c"
#include "libavutil/aes.c"
#include <string.h>
#include "lfg.h"
#include "log.h"
#include "libavutil/lfg.h"
#include "libavutil/log.h"
int main(int argc, char **argv)
{
......
......@@ -18,7 +18,7 @@
#include <assert.h>
#include "atomic.h"
#include "libavutil/atomic.h"
int main(void)
{
......
......@@ -18,9 +18,9 @@
#include <stdio.h>
#include "common.h"
#include "mem.h"
#include "avstring.h"
#include "libavutil/common.h"
#include "libavutil/mem.h"
#include "libavutil/avstring.h"
int main(void)
{
......
......@@ -19,8 +19,8 @@
#include <stdint.h>
#include <stdio.h>
#include "common.h"
#include "base64.h"
#include "libavutil/common.h"
#include "libavutil/base64.h"
#define MAX_DATA_SIZE 1024
#define MAX_ENCODED_SIZE 2048
......
......@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include "blowfish.h"
#include "libavutil/blowfish.h"
#define NUM_VARIABLE_KEY_TESTS 34
......
......@@ -27,9 +27,9 @@
#include <stdint.h>
#include <stdio.h>
#include "avstring.h"
#include "common.h"
#include "cpu.h"
#include "libavutil/avstring.h"
#include "libavutil/common.h"
#include "libavutil/cpu.h"
static const struct {
int flag;
......
......@@ -19,7 +19,7 @@
#include <stdint.h>
#include <stdio.h>
#include "crc.h"
#include "libavutil/crc.h"
int main(void)
{
......
......@@ -16,14 +16,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "des.c"
#include "libavutil/des.c"
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "time.h"
#include "libavutil/time.h"
static uint64_t rand64(void)
{
......
......@@ -20,9 +20,9 @@
#include <stdio.h>
#include <string.h>
#include "libm.h"
#include "timer.h"
#include "eval.h"
#include "libavutil/libm.h"
#include "libavutil/timer.h"
#include "libavutil/eval.h"
static const double const_values[] = {
M_PI,
......
......@@ -18,7 +18,7 @@
#include <stdio.h>
#include "fifo.h"
#include "libavutil/fifo.h"
int main(void)
{
......
......@@ -21,12 +21,12 @@
#include <stdlib.h>
#include <string.h>
#include "cpu.h"
#include "internal.h"
#include "lfg.h"
#include "log.h"
#include "random_seed.h"
#include "float_dsp.h"
#include "libavutil/cpu.h"
#include "libavutil/internal.h"
#include "libavutil/lfg.h"
#include "libavutil/log.h"
#include "libavutil/random_seed.h"
#include "libavutil/float_dsp.h"
#define LEN 240
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "hmac.c"
#include "libavutil/hmac.c"
#include <stdio.h>
#include <string.h>
......
......@@ -16,9 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "log.h"
#include "timer.h"
#include "lfg.h"
#include "libavutil/log.h"
#include "libavutil/timer.h"
#include "libavutil/lfg.h"
int main(void)
{
......
......@@ -19,9 +19,9 @@
#include <limits.h>
#include <stdio.h>
#include "internal.h"
#include "lfg.h"
#include "lls.h"
#include "libavutil/internal.h"
#include "libavutil/lfg.h"
#include "libavutil/lls.h"
int main(void)
{
......
......@@ -19,7 +19,7 @@
#include <stdint.h>
#include <stdio.h>
#include "md5.h"
#include "libavutil/md5.h"
static void print_md5(uint8_t *md5)
{
......
......@@ -19,12 +19,12 @@
#include <limits.h>
#include <stdio.h>
#include "common.h"
#include "error.h"
#include "log.h"
#include "mem.h"
#include "rational.h"
#include "opt.h"
#include "libavutil/common.h"
#include "libavutil/error.h"
#include "libavutil/log.h"
#include "libavutil/mem.h"
#include "libavutil/rational.h"
#include "libavutil/opt.h"
typedef struct TestContext {
const AVClass *class;
......
......@@ -19,10 +19,10 @@
#include <stdint.h>
#include <stdio.h>
#include "common.h"
#include "log.h"
#include "rational.h"
#include "parseutils.h"
#include "libavutil/common.h"
#include "libavutil/log.h"
#include "libavutil/rational.h"
#include "libavutil/parseutils.h"
int main(void)
{
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "sha.c"
#include "libavutil/sha.c"
#include <stdio.h>
......
......@@ -16,13 +16,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "tree.c"
#include "libavutil/tree.c"
#include <stdint.h>
#include "common.h"
#include "lfg.h"
#include "log.h"
#include "libavutil/common.h"
#include "libavutil/lfg.h"
#include "libavutil/log.h"
static int check(AVTreeNode *t)
{
......
......@@ -21,8 +21,8 @@
#include <stdlib.h>
#include <string.h>
#include "intreadwrite.h"
#include "xtea.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/xtea.h"
#define XTEA_NUM_TESTS 6
......
......@@ -44,11 +44,12 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS)
$(SLIB_EXTRA_CMD)
clean::
$(RM) $(addprefix $(SUBDIR),*-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
$(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)
$(RM) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
$(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) $(CLEANSUFFIXES:%=$(SUBDIR)tests/%)
distclean:: clean
$(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)
$(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%) \
$(DISTCLEANSUFFIXES:%=$(SUBDIR)tests/%)
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
$(Q)mkdir -p "$(SHLIBDIR)"
......
/colorspace
/swscale
......@@ -23,10 +23,11 @@
#include <stdlib.h>
#include <inttypes.h>
#include "swscale.h"
#include "rgb2rgb.h"
#include "libavutil/mem.h"
#include "libswscale/rgb2rgb.h"
#include "libswscale/swscale.h"
#define SIZE 1000
#define srcByte 0x55
#define dstByte 0xBB
......
......@@ -31,7 +31,8 @@
#include "libavutil/crc.h"
#include "libavutil/pixdesc.h"
#include "libavutil/lfg.h"
#include "swscale.h"
#include "libswscale/swscale.h"
/* HACK Duplicated from swscale_internal.h.
* Should be removed when a cleaner pixel format system exists. */
......
......@@ -167,7 +167,7 @@ pixfmts(){
filter=${test#filter-pixfmts-}
filter_args=$1
showfiltfmts="$target_exec $target_path/libavfilter/filtfmts-test"
showfiltfmts="$target_exec $target_path/libavfilter/tests/filtfmts"
exclude_fmts=${outfile}${filter}_exclude_fmts
out_fmts=${outfile}${filter}_out_fmts
......
......@@ -23,8 +23,8 @@ fate-rdft-float: $(FATE_RDFT-yes)
FATE_FFT_ALL = $(FATE_DCT-yes) $(FATE_FFT-yes) $(FATE_MDCT-yes) $(FATE_RDFT-yes)
$(FATE_FFT_ALL): libavcodec/fft-test$(EXESUF)
$(FATE_FFT_ALL): CMD = run libavcodec/fft-test $(CPUFLAGS:%=-c%) $(ARGS)
$(FATE_FFT_ALL): libavcodec/tests/fft$(EXESUF)
$(FATE_FFT_ALL): CMD = run libavcodec/tests/fft $(CPUFLAGS:%=-c%) $(ARGS)
define DEF_FFT_FIXED
FATE_FFT_FIXED-$(CONFIG_FFT) += fate-fft-fixed-$(1) fate-ifft-fixed-$(1)
......@@ -43,8 +43,8 @@ fate-mdct-fixed: $(FATE_MDCT_FIXED-yes)
FATE_FFT_FIXED_ALL = $(FATE_FFT_FIXED-yes) $(FATE_MDCT_FIXED-yes)
$(FATE_FFT_FIXED_ALL): libavcodec/fft-fixed-test$(EXESUF)
$(FATE_FFT_FIXED_ALL): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) $(ARGS)
$(FATE_FFT_FIXED_ALL): libavcodec/tests/fft-fixed$(EXESUF)
$(FATE_FFT_FIXED_ALL): CMD = run libavcodec/tests/fft-fixed $(CPUFLAGS:%=-c%) $(ARGS)
$(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL): REF = /dev/null
......
......@@ -160,7 +160,7 @@ fate-filter-pixfmts-scale: CMD = pixfmts "200:100"
FATE_FILTER_PIXFMTS += fate-filter-pixfmts-vflip
fate-filter-pixfmts-vflip: CMD = pixfmts
$(FATE_FILTER_PIXFMTS): libavfilter/filtfmts-test$(EXESUF)
$(FATE_FILTER_PIXFMTS): libavfilter/tests/filtfmts$(EXESUF)
FATE_FILTER_VSYNTH-$(CONFIG_FORMAT_FILTER) += $(FATE_FILTER_PIXFMTS)
......
FATE_LIBAVCODEC-$(CONFIG_GOLOMB) += fate-golomb
fate-golomb: libavcodec/golomb-test$(EXESUF)
fate-golomb: CMD = run libavcodec/golomb-test
fate-golomb: libavcodec/tests/golomb$(EXESUF)
fate-golomb: CMD = run libavcodec/tests/golomb
fate-golomb: REF = /dev/null
FATE_LIBAVCODEC-$(CONFIG_IDCTDSP) += fate-idct8x8
fate-idct8x8: libavcodec/dct-test$(EXESUF)
fate-idct8x8: CMD = run libavcodec/dct-test -i
fate-idct8x8: libavcodec/tests/dct$(EXESUF)
fate-idct8x8: CMD = run libavcodec/tests/dct -i
fate-idct8x8: CMP = null
fate-idct8x8: REF = /dev/null
FATE_LIBAVCODEC-$(CONFIG_IIRFILTER) += fate-iirfilter
fate-iirfilter: libavcodec/iirfilter-test$(EXESUF)
fate-iirfilter: CMD = run libavcodec/iirfilter-test
fate-iirfilter: libavcodec/tests/iirfilter$(EXESUF)
fate-iirfilter: CMD = run libavcodec/tests/iirfilter
FATE_LIBAVCODEC-$(CONFIG_RANGECODER) += fate-rangecoder
fate-rangecoder: libavcodec/rangecoder-test$(EXESUF)
fate-rangecoder: CMD = run libavcodec/rangecoder-test
fate-rangecoder: libavcodec/tests/rangecoder$(EXESUF)
fate-rangecoder: CMD = run libavcodec/tests/rangecoder
fate-rangecoder: CMP = null
fate-rangecoder: REF = /dev/null
......
FATE_LIBAVDEVICE-$(CONFIG_JACK_INDEV) += fate-timefilter
fate-timefilter: libavdevice/timefilter-test$(EXESUF)
fate-timefilter: CMD = run libavdevice/timefilter-test
fate-timefilter: libavdevice/tests/timefilter$(EXESUF)
fate-timefilter: CMD = run libavdevice/tests/timefilter
FATE-$(CONFIG_AVDEVICE) += $(FATE_LIBAVDEVICE-yes)
fate-libavdevice: $(FATE_LIBAVDEVICE-yes)
FATE_LIBAVFORMAT-$(CONFIG_NETWORK) += fate-noproxy
fate-noproxy: libavformat/noproxy-test$(EXESUF)
fate-noproxy: CMD = run libavformat/noproxy-test
fate-noproxy: libavformat/tests/noproxy$(EXESUF)
fate-noproxy: CMD = run libavformat/tests/noproxy
FATE_LIBAVFORMAT-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += fate-rtmpdh
fate-rtmpdh: libavformat/rtmpdh-test$(EXESUF)
fate-rtmpdh: CMD = run libavformat/rtmpdh-test
fate-rtmpdh: libavformat/tests/rtmpdh$(EXESUF)
fate-rtmpdh: CMD = run libavformat/tests/rtmpdh
FATE_LIBAVFORMAT-$(CONFIG_SRTP) += fate-srtp
fate-srtp: libavformat/srtp-test$(EXESUF)
fate-srtp: CMD = run libavformat/srtp-test
fate-srtp: libavformat/tests/srtp$(EXESUF)
fate-srtp: CMD = run libavformat/tests/srtp
FATE_LIBAVFORMAT-yes += fate-url
fate-url: libavformat/url-test$(EXESUF)
fate-url: CMD = run libavformat/url-test
fate-url: libavformat/tests/url$(EXESUF)
fate-url: CMD = run libavformat/tests/url
FATE_LIBAVFORMAT-$(CONFIG_MOV_MUXER) += fate-movenc
fate-movenc: libavformat/movenc-test$(EXESUF)
fate-movenc: CMD = run libavformat/movenc-test
fate-movenc: libavformat/tests/movenc$(EXESUF)
fate-movenc: CMD = run libavformat/tests/movenc
FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT-yes)
fate-libavformat: $(FATE_LIBAVFORMAT)
FATE_LIBAVUTIL += fate-adler32
fate-adler32: libavutil/adler32-test$(EXESUF)