Merge branch 'master' into lpcm_encoder

[vlc] / test / Makefile.am

diff --git a/test/Makefile.am b/test/Makefile.am
index 7fcef186f55d484a755c263fe9c89eff0df6c995..e88f78c35ea11c4e565fb8c1f0cb6fa32f421e47 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,28 +4,35 @@
 
 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 \
-       test_libvlc_media_list_player \
        test_libvlc_media_player \
+       test_src_config_chain \
+       test_src_misc_variables \
         $(NULL)
 
 # Disabled test:
 # meta: No suitable test file
 EXTRA_PROGRAMS = \
        test_libvlc_meta \
-       test_dummy \
+       test_libvlc_media_list_player \
        $(NULL)
 
 #check_DATA = samples/test.sample samples/meta.sample
-EXTRA_DIST = samples/empty.voc
+EXTRA_DIST = samples/empty.voc samples/image.jpg
 
-check_HEADERS = libvlc/test.h
+check_HEADERS = libvlc/test.h libvlc/libvlc_additions.h
 
 TESTS = $(check_PROGRAMS)
 
@@ -55,6 +62,11 @@ test_libvlc_events_LDADD = $(top_builddir)/src/libvlc.la
 test_libvlc_events_CFLAGS = $(CFLAGS_tests)
 test_libvlc_events_LDFLAGS = $(LDFLAGS_tests)
 
+test_libvlc_media_SOURCES = libvlc/media.c
+test_libvlc_media_LDADD = $(top_builddir)/src/libvlc.la
+test_libvlc_media_CFLAGS = $(CFLAGS_tests)
+test_libvlc_media_LDFLAGS = $(LDFLAGS_tests)
+
 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)
@@ -75,6 +87,16 @@ test_libvlc_meta_LDADD = $(top_builddir)/src/libvlc.la
 test_libvlc_meta_CFLAGS = $(CFLAGS_tests)
 test_libvlc_meta_LDFLAGS = $(LDFLAGS_tests)
 
+test_src_misc_variables_SOURCES = src/misc/variables.c
+test_src_misc_variables_LDADD = $(top_builddir)/src/libvlc.la
+test_src_misc_variables_CFLAGS = $(CFLAGS_tests)
+test_src_misc_variables_LDFLAGS = $(LDFLAGS_tests)
+
+test_src_config_chain_SOURCES = src/config/chain.c
+test_src_config_chain_LDADD = $(top_builddir)/src/libvlc.la
+test_src_config_chain_CFLAGS = $(CFLAGS_tests)
+test_src_config_chain_LDFLAGS = $(LDFLAGS_tests)
+
 checkall:
        $(MAKE) check_PROGRAMS="$(check_PROGRAMS) $(EXTRA_PROGRAMS)" check