[vlc-devel] commit: Provide a dummy (empty) but valid sample file ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed Feb 25 19:07:03 CET 2009


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Wed Feb 25 20:06:05 2009 +0200| [97a25c1e1dad85be8bdb14c4b7e308d1eebf5c38] | committer: Rémi Denis-Courmont 

Provide a dummy (empty) but valid sample file

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=97a25c1e1dad85be8bdb14c4b7e308d1eebf5c38
---

 test/Makefile.am       |    3 ++-
 test/libvlc/test.h     |    3 ++-
 test/samples/empty.voc |  Bin 0 -> 26 bytes
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index e1d30cb..fa70e4c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -18,6 +18,7 @@ EXTRA_PROGRAMS = \
 	test_libvlc_meta \
 	$(NULL)
 #check_DATA = samples/test.sample samples/meta.sample
+EXTRA_DIST = samples/empty.voc
 
 check_HEADERS = libvlc/test.h
 
@@ -36,7 +37,7 @@ samples/meta.sample:
 	mkdir -p `dirname $@`
 	curl $(SAMPLES_SERVER)/metadata/id3tag/Wesh-Bonneville.mp3 > $@
 
-CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
+CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc` -DSRCDIR=\"$(srcdir)\"
 
 test_libvlc_core_SOURCES = libvlc/core.c
 test_libvlc_core_LDADD = $(top_builddir)/src/libvlc.la
diff --git a/test/libvlc/test.h b/test/libvlc/test.h
index 947caa9..388a465 100644
--- a/test/libvlc/test.h
+++ b/test/libvlc/test.h
@@ -62,7 +62,8 @@ static const char * test_defaults_args[] = {
 static const int test_defaults_nargs =
     sizeof (test_defaults_args) / sizeof (test_defaults_args[0]);
 
-static const char * test_default_sample = "samples/test.sample";
+/*static const char test_default_sample[] = "samples/test.sample";*/
+static const char test_default_sample[] = SRCDIR"/samples/empty.voc";
 
 
 /*********************************************************************
diff --git a/test/samples/empty.voc b/test/samples/empty.voc
new file mode 100644
index 0000000..ae564ba
Binary files /dev/null and b/test/samples/empty.voc differ




More information about the vlc-devel mailing list