diff --git a/configure.ac b/configure.ac index 8532f7d6..876fbfc6 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA dnl 02111-1307, USA. AC_PREREQ(2.52) -AC_REVISION([$Id: configure.ac,v 1.65 2004/02/28 03:57:41 rocky Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.66 2004/02/29 04:41:57 rocky Exp $])dnl AC_INIT(libcdio, 0.67cvs) AC_CONFIG_SRCDIR(src/cd-info.c) AM_INIT_AUTOMAKE @@ -360,6 +360,7 @@ AC_CONFIG_FILES([ \ src/Makefile \ test/check_nrg.sh \ test/check_cue.sh \ + test/check_iso.sh \ test/check_common_fn \ test/Makefile \ ]) @@ -368,6 +369,7 @@ AC_CONFIG_COMMANDS([default],[[ # Make sure scripts are executable chmod +x test/check_nrg.sh chmod +x test/check_cue.sh +chmod +x test/check_iso.sh ]],[[]]) AC_OUTPUT diff --git a/test/.cvsignore b/test/.cvsignore index 16b3770e..cb8240a0 100644 --- a/test/.cvsignore +++ b/test/.cvsignore @@ -4,6 +4,7 @@ Makefile Makefile.in check_cue.sh check_common_fn +check_iso.sh check_nrg.sh check_sizeof testassert diff --git a/test/Makefile.am b/test/Makefile.am index 522f1f09..b491aaf8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.15 2003/10/03 01:10:50 rocky Exp $ +# $Id: Makefile.am,v 1.16 2004/02/29 04:41:57 rocky Exp $ # -# Copyright (C) 2003 Rocky Bernstein +# Copyright (C) 2003, 2004 Rocky Bernstein # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -34,7 +34,8 @@ testischar_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) testiso9660_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) check_sizeof_LDADD = $(LIBISO9660_LIBS) $(LIBCDIO_LIBS) -check_SCRIPTS = check_nrg.sh check_cue.sh check_cd_read.sh check_opts.sh +check_SCRIPTS = check_nrg.sh check_cue.sh check_cd_read.sh \ + check_iso.sh check_opts.sh check_PROGRAMS = $(hack) @@ -48,7 +49,7 @@ check_DATA = vcd_demo.right \ isofs-m1-read.right cdda-read.right EXTRA_DIST = $(check_SCRIPTS) $(check_DATA) \ - check_common_fn check_cue.sh.in check_nrg.sh.in + check_common_fn check_cue.sh.in check_nrg.sh.in check_iso.sh.in TESTS = $(check_PROGRAMS) $(check_SCRIPTS) XFAIL_TESTS = testassert diff --git a/test/check_iso.sh.in b/test/check_iso.sh.in new file mode 100644 index 00000000..e7fae18c --- /dev/null +++ b/test/check_iso.sh.in @@ -0,0 +1,27 @@ +#!/bin/sh +#$Id: check_iso.sh.in,v 1.1 2004/02/29 04:41:57 rocky Exp $ + +if test -z $srcdir ; then + srcdir=`pwd` +fi + +. ${srcdir}/check_common_fn + +if test ! -x ../src/iso-info ; then + exit 77 +fi + +BASE=`basename $0 .sh` +fname=copying + +test_isoinfo "--quiet ${srcdir}/${fname}.iso --iso9660 " \ + ${fname}.dump ${srcdir}/${fname}.right +RC=$? +check_result $RC 'iso-info test 1' + +exit $RC + +#;;; Local Variables: *** +#;;; mode:shell-script *** +#;;; eval: (sh-set-shell "bash") *** +#;;; End: *** diff --git a/test/copying.right b/test/copying.right new file mode 100644 index 00000000..6d82353f --- /dev/null +++ b/test/copying.right @@ -0,0 +1,10 @@ +This is free software; see the source for copying conditions. +There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A +PARTICULAR PURPOSE. +__________________________________ +ISO-9660 Information +/: + Jan 10 2004 00:47 . + Jan 10 2004 00:47 .. + Jan 10 2004 00:47 copying +