Move libvlccore test to their dir

diff --git a/configure.ac b/configure.ac
index 4085a9adc0ac9a23dca9bb48569c9c35bf2e49ad..e7dbaf974fd05f62836ca2a97e264c3d45f72453 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5860,6 +5860,7 @@ AC_CONFIG_FILES([
   share/vlc_win32_rc.rc
   share/libvlc_win32_rc.rc
   src/Makefile
+  src/test/Makefile
   test/Makefile
 ])
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 23067dc9095d06257dd46b49c9692451b71c3b13..0bba8ee358b9b1a5b65534583d3b5cfa95542c54 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@
 ###############################################################################
 
 AUTOMAKE_OPTIONS = subdir-objects
+SUBDIRS = . test
 
 NULL =
 EXTRA_DIST = extras/COPYING modules/builtin.h.in \
@@ -493,49 +494,9 @@ endif
 ###############################################################################
 # Unit/regression test
 ###############################################################################
-check_PROGRAMS = \
-       test_block \
-       test_dictionary \
-       test_i18n_atof \
-       test_url \
-       test_utf8 \
-       test_headers \
-       $(NULL)
 
 dist_check_SCRIPTS = check_symbols check_headers
-TESTS = $(check_PROGRAMS) check_symbols
-
-CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
-LDFLAGS_tests = $(AM_LDFLAGS) -no-install
-
-test_block_SOURCES = test/block.c
-test_block_LDADD = libvlccore.la
-test_block_CFLAGS = $(CFLAGS_tests)
-test_block_LDFLAGS = $(LDFLAGS_tests)
-
-test_dictionary_SOURCES = test/dictionary.c
-test_dictionary_LDADD = libvlccore.la
-test_dictionary_CFLAGS = $(CFLAGS_tests)
-test_dictionary_LDFLAGS = $(LDFLAGS_tests)
-
-test_i18n_atof_SOURCES = test/i18n_atof.c text/charset.c
-test_i18n_atof_LDADD = libvlccore.la
-test_i18n_atof_CFLAGS = $(CFLAGS_tests)
-test_i18n_atof_LDFLAGS = $(LDFLAGS_tests)
-
-test_url_SOURCES = test/url.c
-test_url_LDADD = libvlccore.la
-test_url_CFLAGS = $(CFLAGS_tests)
-test_url_LDFLAGS = $(LDFLAGS_tests)
-
-test_utf8_SOURCES = test/utf8.c
-test_utf8_LDADD = libvlccore.la
-test_utf8_CFLAGS = $(CFLAGS_tests)
-test_utf8_LDFLAGS = $(LDFLAGS_tests)
-
-test_headers_SOURCES = test/headers.c
-test_headers_CFLAGS = $(CFLAGS_tests)
-test_headers_LDFLAGS = $(LDFLAGS_tests)
+TESTS = check_symbols
 
 check-local:
        for h in `echo $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
new file mode 100644 (file)
index 0000000..52f55df
--- /dev/null
+++ b/src/test/Makefile.am
@@ -0,0 +1,23 @@
+# Unit/regression tests
+#
+check_PROGRAMS = \
+       test_block \
+       test_dictionary \
+       test_i18n_atof \
+       test_url \
+       test_utf8 \
+       test_headers
+
+TESTS = $(check_PROGRAMS)
+
+AM_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
+AM_LDFLAGS = -no-install
+LDADD = ../libvlccore.la
+
+test_block_SOURCES = test_block.c ../misc/block.c
+test_dictionary_SOURCES = dictionary.c
+test_i18n_atof_SOURCES = i18n_atof.c
+test_url_SOURCES = url.c
+test_utf8_SOURCES = utf8.c
+test_headers_SOURCES = headers.c
+

diff --git a/src/test/block.c b/src/test/test_block.c
similarity index 100%
rename from src/test/block.c
rename to src/test/test_block.c