X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=test%2FMakefile.am;h=338c0740a7bf6390251a4ca182294779edeba139;hb=86ca82559b5f28aaa80a3029d07a3a51578bd3af;hp=e1d30cb689f1e9a5586ad9bbe5a65432dd120cbf;hpb=099bacb29a8e70ec553ea16c4c4a09099a165b2a;p=vlc

diff --git a/test/Makefile.am b/test/Makefile.am
index e1d30cb689..338c0740a7 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,22 +4,37 @@
 
 AUTOMAKE_OPTIONS = subdir-objects
 
+extra_check_verbose = $(extra_check_verbose_$(V))
+extra_check_verbose_ = $(extra_check_flags__$(AM_DEFAULT_VERBOSITY))
+extra_check_verbose_0 = @echo TEST $@
+extra_check_verbose__0 = $(extra_check_verbose_0)
+
 ###############################################################################
 # Unit/regression test
 ###############################################################################
 check_PROGRAMS = \
 	test_libvlc_core \
-	test_libvlc_events \
+	test_libvlc_media \
 	test_libvlc_media_list \
-	$(NULL)
-EXTRA_PROGRAMS = \
-	test_libvlc_media_list_player \
 	test_libvlc_media_player \
+	test_src_config_chain \
+	test_src_misc_variables \
+        $(NULL)
+
+check_SCRIPTS = \
+    modules/lua/telnet.sh
+
+# Disabled test:
+# meta: No suitable test file
+EXTRA_PROGRAMS = \
 	test_libvlc_meta \
+	test_libvlc_media_list_player \
 	$(NULL)
+
 #check_DATA = samples/test.sample samples/meta.sample
+EXTRA_DIST = samples/empty.voc samples/image.jpg $(check_SCRIPTS)
 
-check_HEADERS = libvlc/test.h
+check_HEADERS = libvlc/test.h libvlc/libvlc_additions.h
 
 TESTS = $(check_PROGRAMS)
 
@@ -36,32 +51,30 @@ samples/meta.sample:
 	mkdir -p `dirname $@`
 	curl $(SAMPLES_SERVER)/metadata/id3tag/Wesh-Bonneville.mp3 > $@
 
-CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
+AM_CFLAGS = -DSRCDIR=\"$(srcdir)\"
+AM_LDFLAGS = -no-install -static
+LIBVLCCORE = ../src/libvlccore.la
+LIBVLC = ../lib/libvlc.la
 
 test_libvlc_core_SOURCES = libvlc/core.c
-test_libvlc_core_LDADD = $(top_builddir)/src/libvlc.la
-test_libvlc_core_CFLAGS = $(CFLAGS_tests)
-
-test_libvlc_events_SOURCES = libvlc/events.c
-test_libvlc_events_LDADD = $(top_builddir)/src/libvlc.la
-test_libvlc_events_CFLAGS = $(CFLAGS_tests)
-
+test_libvlc_core_LDADD = $(LIBVLC)
+test_libvlc_media_SOURCES = libvlc/media.c
+test_libvlc_media_LDADD = $(LIBVLC)
 test_libvlc_media_list_player_SOURCES = libvlc/media_list_player.c
-test_libvlc_media_list_player_LDADD = $(top_builddir)/src/libvlc.la
-test_libvlc_media_list_player_CFLAGS = $(CFLAGS_tests)
-
+test_libvlc_media_list_player_LDADD = $(LIBVLC)
 test_libvlc_media_list_SOURCES = libvlc/media_list.c
-test_libvlc_media_list_LDADD = $(top_builddir)/src/libvlc.la
-test_libvlc_media_list_CFLAGS = $(CFLAGS_tests)
-
+test_libvlc_media_list_LDADD = $(LIBVLC)
 test_libvlc_media_player_SOURCES = libvlc/media_player.c
-test_libvlc_media_player_LDADD = $(top_builddir)/src/libvlc.la
-test_libvlc_media_player_CFLAGS = $(CFLAGS_tests)
-
+test_libvlc_media_player_LDADD = $(LIBVLC)
 test_libvlc_meta_SOURCES = libvlc/meta.c
-test_libvlc_meta_LDADD = $(top_builddir)/src/libvlc.la
-test_libvlc_meta_CFLAGS = $(CFLAGS_tests)
-
+test_libvlc_meta_LDADD = $(LIBVLC)
+test_src_misc_variables_SOURCES = src/misc/variables.c
+test_src_misc_variables_LDADD = $(LIBVLCCORE) $(LIBVLC)
+test_src_config_chain_SOURCES = src/config/chain.c
+test_src_config_chain_LDADD = $(LIBVLCCORE)
+
+checkall:
+	$(MAKE) check_PROGRAMS="$(check_PROGRAMS) $(EXTRA_PROGRAMS)" check
 
 FORCE:
 	@echo "Generated source cannot be phony. Go away." >&2