[xiph-commits] r13666 - in trunk/vorbis: . lib

[giles at svn.xiph.org]

Author: giles
Date: 2007-08-30 20:16:30 -0700 (Thu, 30 Aug 2007)
New Revision: 13666

Modified:
   trunk/vorbis/Makefile.am
   trunk/vorbis/configure.in
   trunk/vorbis/lib/Makefile.am
Log:
Hook up the libvorbis self test code so it is run by automake's 'check' 
target. This only enables the sharedbook.c self test, as the codebook.c 
self test has bit rotted.

Unfortunately the doc stuff scrolls the results off the screen, but 
given the trouble we've had with the doc build in the past, I'm
loath to place it before the code.


Modified: trunk/vorbis/Makefile.am
===================================================================
--- trunk/vorbis/Makefile.am	2007-08-31 01:59:50 UTC (rev 13665)
+++ trunk/vorbis/Makefile.am	2007-08-31 03:16:30 UTC (rev 13666)
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
 
-SUBDIRS = lib include doc examples vq
+SUBDIRS = include vq lib examples doc
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = vorbis.m4

Modified: trunk/vorbis/configure.in
===================================================================
--- trunk/vorbis/configure.in	2007-08-31 01:59:50 UTC (rev 13665)
+++ trunk/vorbis/configure.in	2007-08-31 03:16:30 UTC (rev 13666)
@@ -49,6 +49,7 @@
 AC_C_INLINE
 
 AM_PROG_LIBTOOL
+AM_PROG_CC_C_O
 
 dnl docbook xml transform and processing tools
 AC_ARG_ENABLE(docs,

Modified: trunk/vorbis/lib/Makefile.am
===================================================================
--- trunk/vorbis/lib/Makefile.am	2007-08-31 01:59:50 UTC (rev 13665)
+++ trunk/vorbis/lib/Makefile.am	2007-08-31 03:16:30 UTC (rev 13666)
@@ -37,6 +37,23 @@
 
 EXTRA_DIST = lookups.pl 
 
+# build and run the self tests on 'make check'
+
+#vorbis_selftests = test_codebook test_sharedbook
+vorbis_selftests = test_sharedbook
+
+TESTS = $(vorbis_selftests)
+noinst_PROGRAMS = $(vorbis_selftests)
+
+test_codebook_SOURCES = codebook.c
+test_codebook_CFLAGS = -D_V_SELFTEST
+
+test_sharedbook_SOURCES = sharedbook.c
+test_sharedbook_CFLAGS = -D_V_SELFTEST
+test_sharedbook_LDADD = @VORBIS_LIBS@
+
+# recurse for alternate targets
+
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"