tests: Move all test programs to a subdirectory

11 files changed, 33 insertions, 26 deletions

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index d12c52e819..503ffd0eb4 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -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
diff --git a/libavcodec/tests/.gitignore b/libavcodec/tests/.gitignore
new file mode 100644
index 0000000000..31fa59b018
--- /dev/null
+++ b/libavcodec/tests/.gitignore
@@ -0,0 +1,6 @@
+/dct
+/fft
+/fft-fixed
+/golomb
+/iirfilter
+/rangecoder
diff --git a/libavcodec/arm/dct-test.c b/libavcodec/tests/arm/dct.c
index 70e5c1cb82..d18cb52b60 100644
--- a/libavcodec/arm/dct-test.c
+++ b/libavcodec/tests/arm/dct.c
@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "idct.h"
+#include "libavcodec/arm/idct.h"
 
 static const struct algo fdct_tab_arch[] = {
     { 0 }
diff --git a/libavcodec/dct-test.c b/libavcodec/tests/dct.c
index 262319e1b4..6c6a4e0d0d 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/tests/dct.c
@@ -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 } };
diff --git a/libavcodec/fft-fixed-test.c b/libavcodec/tests/fft-fixed.c
index d6ea987fa3..6edd810b25 100644
--- a/libavcodec/fft-fixed-test.c
+++ b/libavcodec/tests/fft-fixed.c
@@ -17,4 +17,4 @@
  */
 
 #define FFT_FLOAT 0
-#include "fft-test.c"
+#include "fft.c"
diff --git a/libavcodec/fft-test.c b/libavcodec/tests/fft.c
index 83b5546f08..db1ce9807f 100644
--- a/libavcodec/fft-test.c
+++ b/libavcodec/tests/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 */
diff --git a/libavcodec/golomb-test.c b/libavcodec/tests/golomb.c
index e740a20aea..7587402e24 100644
--- a/libavcodec/golomb-test.c
+++ b/libavcodec/tests/golomb.c
@@ -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)
diff --git a/libavcodec/iirfilter-test.c b/libavcodec/tests/iirfilter.c
index 5aa156cb90..a6001a3270 100644
--- a/libavcodec/iirfilter-test.c
+++ b/libavcodec/tests/iirfilter.c
@@ -22,7 +22,7 @@
 
 #include "libavutil/libm.h"
 
-#include "iirfilter.h"
+#include "libavcodec/iirfilter.h"
 
 #define FILT_ORDER 4
 #define SIZE 1024
diff --git a/libavcodec/ppc/dct-test.c b/libavcodec/tests/ppc/dct.c
index 2acbe2aeb0..3d160d33e0 100644
--- a/libavcodec/ppc/dct-test.c
+++ b/libavcodec/tests/ppc/dct.c
@@ -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
diff --git a/libavcodec/rangecoder-test.c b/libavcodec/tests/rangecoder.c
index f4c76c01f0..26bb589928 100644
--- a/libavcodec/rangecoder-test.c
+++ b/libavcodec/tests/rangecoder.c
@@ -22,7 +22,7 @@
 #include "libavutil/lfg.h"
 #include "libavutil/log.h"
 
-#include "rangecoder.h"
+#include "libavcodec/rangecoder.h"
 
 #define SIZE 10240
 
diff --git a/libavcodec/x86/dct-test.c b/libavcodec/tests/x86/dct.c
index 9d4aaf5415..2ddb55510e 100644
--- a/libavcodec/x86/dct-test.c
+++ b/libavcodec/tests/x86/dct.c
@@ -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