configure.ac: Add --disable-joliet and disable joliet if iconv is not around

iso9660_fs.c: Setting string length on of UCBE wrong?
test/*: add joliet regression test.
This commit is contained in:
rocky
2004-10-28 11:13:40 +00:00
parent 9cdc89f3f3
commit 6869e97bb2
9 changed files with 316 additions and 55 deletions

View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.31 2004/10/26 08:32:29 rocky Exp $
# $Id: Makefile.am,v 1.32 2004/10/28 11:13:40 rocky Exp $
#
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
#
@@ -59,7 +59,7 @@ check_DATA = vcd_demo.right \
bad-mode1.toc bad-msf-1.toc bad-msf-2.toc bad-msf-3.toc \
bad-cat1.cue bad-cat2.cue bad-cat3.cue \
bad-cat1.toc bad-cat2.toc bad-cat3.toc \
copying.iso copying.right
copying.iso copying.right joliet.iso
EXTRA_DIST = $(check_SCRIPTS) $(check_DATA) \
check_common_fn check_cue.sh.in check_nrg.sh.in check_iso.sh.in

View File

@@ -1,4 +1,4 @@
# $Id: check_common_fn.in,v 1.8 2004/05/06 12:05:49 rocky Exp $
# $Id: check_common_fn.in,v 1.9 2004/10/28 11:13:40 rocky Exp $
#
# Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
#
@@ -94,7 +94,8 @@ test_iso_info() {
return 1
fi
if ${ISO_INFO} --no-header ${opts} >${outfile} 2>&1 ; then
cmdline="${ISO_INFO} --no-header ${opts}"
if $cmdline >${outfile} 2>&1 ; then
if test "/usr/bin/diff" != no; then
if @DIFF@ @DIFF_OPTS@ ${outfile} ${rightfile} ; then
rm -f $outfile
@@ -108,7 +109,7 @@ test_iso_info() {
return 77
fi
else
echo "$0 failed running: ${ISO_INFO} ${opts}"
echo "$0 failed running: $cmdline"
return 2
fi

View File

@@ -1,5 +1,5 @@
#!/bin/sh
#$Id: check_iso.sh.in,v 1.3 2004/05/07 02:15:52 rocky Exp $
#$Id: check_iso.sh.in,v 1.4 2004/10/28 11:13:40 rocky Exp $
if test -z $srcdir ; then
srcdir=`pwd`
@@ -17,13 +17,27 @@ fname=copying
opts="--quiet ${srcdir}/${fname}.iso --iso9660 "
test_iso_info "$opts" ${fname}.dump ${srcdir}/${fname}.right
RC=$?
check_result $RC 'iso-info test 1' "iso-info $opts"
check_result $RC 'iso-info basic test' "iso-info $opts"
opts="--image ${srcdir}/${fname}.iso --extract $fname "
test_iso_read "$opts" ${fname} ${srcdir}/../COPYING
RC=$?
check_result $RC 'iso-read test 1' "iso-read $opts"
if test -n "@HAVE_JOLIET@" ; then
BASE=`basename $0 .sh`
fname=joliet
opts="--quiet ${srcdir}/${fname}.iso --iso9660 "
test_iso_info "$opts" ${fname}-nojoliet.dump ${srcdir}/${fname}.right
RC=$?
check_result $RC 'iso-info Joliet test' "$cmdline"
opts="--quiet ${srcdir}/${fname}.iso --iso9660 --no-joliet "
test_iso_info "$opts" ${fname}-nojoliet.dump \
${srcdir}/${fname}-nojoliet.right
RC=$?
check_result $RC 'iso-info --no-joliet test' "$cmdline"
fi
exit $RC
#;;; Local Variables: ***

View File

@@ -0,0 +1,23 @@
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
/:
Oct 22 2004 18:44 .
Oct 22 2004 18:44 ..
Oct 22 2004 18:44 libcdio
/LIBCDIO/:
Oct 22 2004 18:44 .
Oct 22 2004 18:44 ..
Mar 12 2004 02:18 copying
Jun 26 2004 06:01 readme
Aug 12 2004 05:22 readme.libcdio
Oct 22 2004 18:44 test
/LIBCDIO/TEST/:
Oct 22 2004 18:44 .
Oct 22 2004 18:44 ..
Jul 25 2004 05:52 isofs_m1.cue

BIN
test/joliet.iso Normal file

Binary file not shown.

23
test/joliet.right Normal file
View File

@@ -0,0 +1,23 @@
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
/:
Oct 22 2004 18:44 .
Oct 22 2004 18:44 ..
Oct 22 2004 18:44 libcdio
/libcdio/:
Oct 22 2004 18:44 .
Oct 22 2004 18:44 ..
Mar 12 2004 02:18 COPYING
Jun 26 2004 06:01 README
Aug 12 2004 05:22 README.libcdio
Oct 22 2004 18:44 test
/libcdio/test/:
Oct 22 2004 18:44 .
Oct 22 2004 18:44 ..
Jul 25 2004 05:52 isofs-m1.cue