diff --git a/Makefile.am b/Makefile.am index 1c4a5699..772f6fa4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.2 2003/04/19 08:29:14 rocky Exp $ +# $Id: Makefile.am,v 1.3 2003/04/19 19:12:06 rocky Exp $ # # Copyright (C) 2003 Rocky Bernstein # @@ -25,6 +25,46 @@ EXTRA_DIST = libpopt.m4 THANKS # SUBDIRS = doc include lib src tests SUBDIRS = include lib src tests +# List of additional files for expanded regression tests +DISTFILES_REGRESSION = tests/monvoisin.nrg tests/monvoisin.right \ + tests/svcd_ogt_test_ntsc.bin \ + tests/svcd_ogt_test_ntsc.cue \ + tests/svcd_ogt_test_ntsc.right \ + tests/fsf.bin tests/fsf.cue tests/fsf.right +REGRESSION_VERSION = 1.0 +distdir_regression = ../$(PACKAGE)-$(REGRESSION_VERSION)-tests +dist-regression: distdir-regression + cd $(distdir) && $(AMTAR) chof - tests | GZIP=$(GZIP_ENV) gzip -c >$(distdir_regression).tar.gz + $(am__remove_distdir) + +distdir-regression: $(DISTFILES_REGRESSION) + $(am__remove_distdir) + mkdir $(distdir) + @list='$(DISTFILES_REGRESSION)'; for file in $$list; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir_regressoin)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) diff --git a/NEWS b/NEWS index 049ec8da..fb6b8586 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +0.3 +- facilitate inclusion into another project's local source tree (e.g. xine) +- version number in include +- cdinfo: lists number of CDDB matches +- fix some small compile warnings and configure bugs + 0.2 - Added Support for reading audio sectors - cdinfo can use libcddb (http://libcddb.sourceforge.net). If installed and @@ -6,5 +12,6 @@ - Don't need to open device to give get a default device. - Better device driver selection: We test for file/device-ness. - Bugs fixed (default device name on linux), + 0.1 Routines split off from VCDImager. \ No newline at end of file diff --git a/configure.ac b/configure.ac index 7ef8cb17..2f1eb6e2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ -AC_REVISION([$Id: configure.ac,v 1.10 2003/04/19 08:29:14 rocky Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.11 2003/04/19 19:12:06 rocky Exp $])dnl AC_INIT(lib/cdio.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libcdio, 0.2) +AM_INIT_AUTOMAKE(libcdio, 0.3) AM_SANITY_CHECK @@ -215,6 +215,7 @@ AC_OUTPUT([ \ Makefile \ include/Makefile \ include/cdio/Makefile \ + include/cdio/cdio.h \ lib/Makefile \ src/Makefile \ tests/check_opts.sh \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 5feea948..607d5886 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.6 2003/04/14 10:03:27 rocky Exp $ +# $Id: Makefile.am,v 1.7 2003/04/19 19:12:06 rocky Exp $ # # Copyright (C) 2003 Rocky Bernstein # @@ -22,9 +22,8 @@ # check_SCRIPTS = check_nrg.sh check_cue.sh check_opts.sh -check_DATA = monvoisin.right svcd_ogt_test_ntsc.right vcd_demo.right \ - fsf-tompox.right fsf-tompox.cue fsf-tompox.bin monvoisin.nrg \ - fsf.right fsf.bin fsf.cue \ +check_DATA = vcd_demo.right \ + fsf-tompox.right fsf-tompox.cue fsf-tompox.bin \ check_opts0.right check_opts1.right check_opts2.right \ check_opts3.right check_opts4.right check_opts5.right \ check_opts6.right check_opts7.right diff --git a/tests/check_common_fn b/tests/check_common_fn index caf209de..c6456f15 100755 --- a/tests/check_common_fn +++ b/tests/check_common_fn @@ -1,4 +1,5 @@ -# $Id: check_common_fn,v 1.1 2003/03/24 19:01:10 rocky Exp $ +# $Id: check_common_fn,v 1.2 2003/04/19 19:12:06 rocky Exp $ +SKIP_TEST_EXITCODE=77 have_cmp() { if cmp /dev/null /dev/null > /dev/null 2>&1; then @@ -20,7 +21,7 @@ check_result() { shift msg=$* if test $RC -ne 0 ; then - if test $RC -ne 77 ; then + if test $RC -ne $SKIP_TEST_EXITCODE ; then echo "$0: $msg failed." exit $RC else diff --git a/tests/check_cue.sh b/tests/check_cue.sh index d65dbb48..dae34766 100755 --- a/tests/check_cue.sh +++ b/tests/check_cue.sh @@ -1,5 +1,5 @@ #!/bin/sh -#$Id: check_cue.sh,v 1.4 2003/04/14 08:51:14 rocky Exp $ +#$Id: check_cue.sh,v 1.5 2003/04/19 19:12:06 rocky Exp $ if test -z $srcdir ; then srcdir=`pwd` @@ -9,32 +9,44 @@ fi BASE=`basename $0 .sh` -fname=fsf -test_cdinfo "--cue-file ${srcdir}/${fname}.cue --no-cddb" \ - ${fname}.dump ${srcdir}/${fname}.right -RC=$? -check_result $RC 'cdinfo CUE test 1' - fname=fsf-tompox +testnum=1 test_cdinfo "--cue-file ${srcdir}/${fname}.cue" \ ${fname}.dump ${srcdir}/${fname}.right RC=$? -check_result $RC 'cdinfo CUE test 2' - -fname=svcd_ogt_test_ntsc -if test -f ${srcdir}/${fname}.cue ; then - test_cdinfo "--cue-file ${srcdir}/${fname}.cue" \ - ${fname}.dump ${srcdir}/${fname}.right - RC=$? - check_result $RC 'cdinfo CUE test 3' -fi +check_result $RC "cdinfo CUE test $testnum" fname=vcd_demo +testnum=2 if test -f ${srcdir}/${fname}.cue ; then test_cdinfo "-c ${srcdir}/vcd_demo.cue" \ ${fname}.dump ${srcdir}/${fname}.right RC=$? - check_result $RC 'cdinfo CUE test 4' + check_result $RC "cdinfo CUE test $testnum" +else + echo "Don't see CUE file ${srcdir}/${fname}.cue. Test $testum skipped." +fi + +fname=svcd_ogt_test_ntsc +testnum=3 +if test -f ${srcdir}/${fname}.bin ; then + test_cdinfo "--cue-file ${srcdir}/${fname}.cue" \ + ${fname}.dump ${srcdir}/${fname}.right + RC=$? + check_result $RC "cdinfo CUE test $testnum" +else + echo "Don't see CUE file ${srcdir}/${fname}.bin. Test $testnum skipped." +fi + +fname=fsf +testnum=4 +if test -f ${srcdir}/${fname}.bin ; then + test_cdinfo "--cue-file ${srcdir}/${fname}.cue --no-cddb" \ + ${fname}.dump ${srcdir}/${fname}.right + RC=$? + check_result $RC "cdinfo CUE test $testnum" +else + echo "Don't see CUE file ${srcdir}/${fname}.bin. Test $testum skipped." fi exit $RC diff --git a/tests/check_nrg.sh b/tests/check_nrg.sh index d4c60164..cde97ebe 100755 --- a/tests/check_nrg.sh +++ b/tests/check_nrg.sh @@ -1,5 +1,5 @@ #!/bin/sh -#$Id: check_nrg.sh,v 1.1 2003/03/24 19:01:10 rocky Exp $ +#$Id: check_nrg.sh,v 1.2 2003/04/19 19:12:06 rocky Exp $ if test -z $srcdir ; then srcdir=`pwd` @@ -8,13 +8,19 @@ fi . ${srcdir}/check_common_fn BASE=`basename $0 .sh` +nrg_file=${srcdir}/monvoisin.nrg -test_cdinfo "--nrg-file ${srcdir}/monvoisin.nrg" \ - monvoisin.dump ${srcdir}/monvoisin.right -RC=$? -check_result $RC 'cdinfo NRG test 1' - -exit $RC +if test -f $nrg_file ; then + test_cdinfo "--nrg-file $nrg_file" \ + monvoisin.dump ${srcdir}/monvoisin.right + RC=$? + check_result $RC 'cdinfo NRG test 1' + + exit $RC +else + echo "Don't see NRG file ${nrg_file}. Test skipped." + exit $SKIP_TEST_EXITCODE +fi #;;; Local Variables: *** #;;; mode:shell-script *** diff --git a/tests/check_opts.sh.in b/tests/check_opts.sh.in index e6b0140f..ab54a96e 100755 --- a/tests/check_opts.sh.in +++ b/tests/check_opts.sh.in @@ -1,5 +1,5 @@ #!/bin/sh -#$Id: check_opts.sh.in,v 1.1 2003/04/14 10:03:27 rocky Exp $ +#$Id: check_opts.sh.in,v 1.2 2003/04/19 19:12:06 rocky Exp $ # Check cdinfo options if test -n "@CDDB_LIB@" ; then cddb_opt='--no-cddb' @@ -13,7 +13,7 @@ fi BASE=`basename $0 .sh` -fname=fsf +fname=fsf-tompox i=0 for opt in '-T' '--no-tracks' '-A' '--no-analyze' '-I' '-no-ioctl' \ '-q' '--quiet' ; do diff --git a/tests/check_opts0.right b/tests/check_opts0.right index 7ec8e65f..1fdc8636 100644 --- a/tests/check_opts0.right +++ b/tests/check_opts0.right @@ -4,4 +4,5 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. __________________________________ try to find out what sort of CD this is -Audio CD, CDDB disc ID is 02006c01 +CD-ROM with ISO 9660 filesystem and joliet extension level 3 +ISO 9660: 1744 blocks, label `Free Software Song ' diff --git a/tests/check_opts1.right b/tests/check_opts1.right index 7ec8e65f..1fdc8636 100644 --- a/tests/check_opts1.right +++ b/tests/check_opts1.right @@ -4,4 +4,5 @@ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. __________________________________ try to find out what sort of CD this is -Audio CD, CDDB disc ID is 02006c01 +CD-ROM with ISO 9660 filesystem and joliet extension level 3 +ISO 9660: 1744 blocks, label `Free Software Song ' diff --git a/tests/check_opts2.right b/tests/check_opts2.right index 4992a236..7e5cda4f 100644 --- a/tests/check_opts2.right +++ b/tests/check_opts2.right @@ -5,5 +5,5 @@ PARTICULAR PURPOSE. __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type - 1: 00:02:00 000000 audio -170: 01:50:20 008120 leadout + 1: 00:02:00 000000 data +170: 00:25:34 001759 leadout diff --git a/tests/check_opts3.right b/tests/check_opts3.right index 4992a236..7e5cda4f 100644 --- a/tests/check_opts3.right +++ b/tests/check_opts3.right @@ -5,5 +5,5 @@ PARTICULAR PURPOSE. __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type - 1: 00:02:00 000000 audio -170: 01:50:20 008120 leadout + 1: 00:02:00 000000 data +170: 00:25:34 001759 leadout diff --git a/tests/check_opts4.right b/tests/check_opts4.right index 7d1ebf9c..c52aac94 100644 --- a/tests/check_opts4.right +++ b/tests/check_opts4.right @@ -5,8 +5,9 @@ PARTICULAR PURPOSE. __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type - 1: 00:02:00 000000 audio -170: 01:50:20 008120 leadout + 1: 00:02:00 000000 data +170: 00:25:34 001759 leadout __________________________________ try to find out what sort of CD this is -Audio CD, CDDB disc ID is 02006c01 +CD-ROM with ISO 9660 filesystem and joliet extension level 3 +ISO 9660: 1744 blocks, label `Free Software Song ' diff --git a/tests/check_opts5.right b/tests/check_opts5.right index 7d1ebf9c..c52aac94 100644 --- a/tests/check_opts5.right +++ b/tests/check_opts5.right @@ -5,8 +5,9 @@ PARTICULAR PURPOSE. __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type - 1: 00:02:00 000000 audio -170: 01:50:20 008120 leadout + 1: 00:02:00 000000 data +170: 00:25:34 001759 leadout __________________________________ try to find out what sort of CD this is -Audio CD, CDDB disc ID is 02006c01 +CD-ROM with ISO 9660 filesystem and joliet extension level 3 +ISO 9660: 1744 blocks, label `Free Software Song ' diff --git a/tests/check_opts6.right b/tests/check_opts6.right index 7d1ebf9c..c52aac94 100644 --- a/tests/check_opts6.right +++ b/tests/check_opts6.right @@ -5,8 +5,9 @@ PARTICULAR PURPOSE. __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type - 1: 00:02:00 000000 audio -170: 01:50:20 008120 leadout + 1: 00:02:00 000000 data +170: 00:25:34 001759 leadout __________________________________ try to find out what sort of CD this is -Audio CD, CDDB disc ID is 02006c01 +CD-ROM with ISO 9660 filesystem and joliet extension level 3 +ISO 9660: 1744 blocks, label `Free Software Song ' diff --git a/tests/check_opts7.right b/tests/check_opts7.right index 7d1ebf9c..c52aac94 100644 --- a/tests/check_opts7.right +++ b/tests/check_opts7.right @@ -5,8 +5,9 @@ PARTICULAR PURPOSE. __________________________________ CD-ROM Track List (1 - 1) #: MSF LSN Type - 1: 00:02:00 000000 audio -170: 01:50:20 008120 leadout + 1: 00:02:00 000000 data +170: 00:25:34 001759 leadout __________________________________ try to find out what sort of CD this is -Audio CD, CDDB disc ID is 02006c01 +CD-ROM with ISO 9660 filesystem and joliet extension level 3 +ISO 9660: 1744 blocks, label `Free Software Song '