tests: Move all test programs to a subdirectory

23 files changed, 76 insertions, 55 deletions

diff --git a/libavutil/des.c b/libavutil/des.c
index 1dbedd92cd..75a5d896fb 100644
--- a/libavutil/des.c
+++ b/libavutil/des.c
@@ -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,
diff --git a/libavutil/tests/.gitignore b/libavutil/tests/.gitignore
new file mode 100644
index 0000000000..c4d1d065fb
--- /dev/null
+++ b/libavutil/tests/.gitignore
@@ -0,0 +1,21 @@
+/adler32
+/aes
+/atomic
+/avstring
+/base64
+/blowfish
+/cpu
+/crc
+/des
+/eval
+/fifo
+/float_dsp
+/hmac
+/lfg
+/lls
+/md5
+/opt
+/parseutils
+/sha
+/tree
+/xtea
diff --git a/libavutil/adler32-test.c b/libavutil/tests/adler32.c
index ab109f9175..323690056c 100644
--- a/libavutil/adler32-test.c
+++ b/libavutil/tests/adler32.c
@@ -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
 
diff --git a/libavutil/aes-test.c b/libavutil/tests/aes.c
index afb5ad3685..49ca553e0a 100644
--- a/libavutil/aes-test.c
+++ b/libavutil/tests/aes.c
@@ -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)
 {
diff --git a/libavutil/atomic-test.c b/libavutil/tests/atomic.c
index c0a89a461e..70636f42fb 100644
--- a/libavutil/atomic-test.c
+++ b/libavutil/tests/atomic.c
@@ -18,7 +18,7 @@
 
 #include <assert.h>
 
-#include "atomic.h"
+#include "libavutil/atomic.h"
 
 int main(void)
 {
diff --git a/libavutil/avstring-test.c b/libavutil/tests/avstring.c
index fc4f0a415e..2e5ee2d44a 100644
--- a/libavutil/avstring-test.c
+++ b/libavutil/tests/avstring.c
@@ -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)
 {
diff --git a/libavutil/base64-test.c b/libavutil/tests/base64.c
index 3ce0518a84..16ea399788 100644
--- a/libavutil/base64-test.c
+++ b/libavutil/tests/base64.c
@@ -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
diff --git a/libavutil/blowfish-test.c b/libavutil/tests/blowfish.c
index 4281ca29bd..acaab70aeb 100644
--- a/libavutil/blowfish-test.c
+++ b/libavutil/tests/blowfish.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "blowfish.h"
+#include "libavutil/blowfish.h"
 
 #define NUM_VARIABLE_KEY_TESTS 34
 
diff --git a/libavutil/cpu-test.c b/libavutil/tests/cpu.c
index a2c3b38c0d..176b7eb030 100644
--- a/libavutil/cpu-test.c
+++ b/libavutil/tests/cpu.c
@@ -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;
diff --git a/libavutil/crc-test.c b/libavutil/tests/crc.c
index ef15fb5669..c2c609fba8 100644
--- a/libavutil/crc-test.c
+++ b/libavutil/tests/crc.c
@@ -19,7 +19,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "crc.h"
+#include "libavutil/crc.h"
 
 int main(void)
 {
diff --git a/libavutil/des-test.c b/libavutil/tests/des.c
index a372035a54..1e7a2fa50a 100644
--- a/libavutil/des-test.c
+++ b/libavutil/tests/des.c
@@ -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)
 {
diff --git a/libavutil/eval-test.c b/libavutil/tests/eval.c
index 3551f17b20..818c59ccdb 100644
--- a/libavutil/eval-test.c
+++ b/libavutil/tests/eval.c
@@ -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,
diff --git a/libavutil/fifo-test.c b/libavutil/tests/fifo.c
index f6615b1034..4c4b37a501 100644
--- a/libavutil/fifo-test.c
+++ b/libavutil/tests/fifo.c
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 
-#include "fifo.h"
+#include "libavutil/fifo.h"
 
 int main(void)
 {
diff --git a/libavutil/float_dsp-test.c b/libavutil/tests/float_dsp.c
index e24018c07d..ab6bf6a569 100644
--- a/libavutil/float_dsp-test.c
+++ b/libavutil/tests/float_dsp.c
@@ -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
 
diff --git a/libavutil/hmac-test.c b/libavutil/tests/hmac.c
index f97c8a6ab3..600240fe97 100644
--- a/libavutil/hmac-test.c
+++ b/libavutil/tests/hmac.c
@@ -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>
diff --git a/libavutil/lfg-test.c b/libavutil/tests/lfg.c
index 92b4259a3c..9a0c47c4de 100644
--- a/libavutil/lfg-test.c
+++ b/libavutil/tests/lfg.c
@@ -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)
 {
diff --git a/libavutil/lls-test.c b/libavutil/tests/lls.c
index f9814b3863..7866b38998 100644
--- a/libavutil/lls-test.c
+++ b/libavutil/tests/lls.c
@@ -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)
 {
diff --git a/libavutil/md5-test.c b/libavutil/tests/md5.c
index 8d5dd1e104..9fb7006dd8 100644
--- a/libavutil/md5-test.c
+++ b/libavutil/tests/md5.c
@@ -19,7 +19,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "md5.h"
+#include "libavutil/md5.h"
 
 static void print_md5(uint8_t *md5)
 {
diff --git a/libavutil/opt-test.c b/libavutil/tests/opt.c
index 6262b77e5b..350ce3d820 100644
--- a/libavutil/opt-test.c
+++ b/libavutil/tests/opt.c
@@ -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;
diff --git a/libavutil/parseutils-test.c b/libavutil/tests/parseutils.c
index 149861f1d5..805c01ff5a 100644
--- a/libavutil/parseutils-test.c
+++ b/libavutil/tests/parseutils.c
@@ -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)
 {
diff --git a/libavutil/sha-test.c b/libavutil/tests/sha.c
index 5f62a98ea3..0f1d514b44 100644
--- a/libavutil/sha-test.c
+++ b/libavutil/tests/sha.c
@@ -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>
 
diff --git a/libavutil/tree-test.c b/libavutil/tests/tree.c
index f93e53409d..fb19b27896 100644
--- a/libavutil/tree-test.c
+++ b/libavutil/tests/tree.c
@@ -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)
 {
diff --git a/libavutil/xtea-test.c b/libavutil/tests/xtea.c
index 98445760eb..326f2714a9 100644
--- a/libavutil/xtea-test.c
+++ b/libavutil/tests/xtea.c
@@ -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