rb_cdio 0.1.1 → 0.2.0

data/test/data/bad-file.toc

@@ -0,0 +1,13 @@
+// $Id: bad-file.toc,v 1.1 2005/01/23 00:45:57 rocky Exp $
+// XA disk 
+// 
+
+CD_ROM_XA
+
+TRACK MODE2_FORM2
+FILE "foo.bin" 00:00:00 00:13:57
+
+TRACK MODE2_FORM1
+PREGAP 0:2:0
+FILE "foo.bin" 00:20:71 00:00:00
+

data/test/data/cdda-read.right

@@ -1,3 +1,6 @@
+This is free software; see the source for copying conditions.
+There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
 0x0000: 0000 0000 0000 0000 0000 0000 0000 0000   ................
 0x0010: 0000 0000 0000 0000 0000 0000 0000 0000   ................
 0x0020: 0000 0000 0000 0000 0000 0000 0000 0000   ................

data/test/data/cdda.cue

@@ -3,4 +3,5 @@ CATALOG 0000010271955
 PERFORMER "Richard Stallman"
 FILE "BOING.BIN" BINARY
   TRACK 01 AUDIO
+    FLAGS DCP
     INDEX 01 00:00:00

data/test/data/cdda.right

@@ -1,37 +1,16 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
 Disc mode is listed as: CD-DA
 CD-ROM Track List (1 - 1)
-  #: MSF       LSN     Type  Green?
-  1: 00:02:00  000000  audio false
-170: 00:06:02  000302  leadout
+  #: MSF       LSN    Type   Green? Copy? Channels Premphasis?
+  1: 00:02:00  000000 audio  false  yes   2        no
+170: 00:06:02  000302 leadout (693 KB raw, 693 KB formatted)
 Media Catalog Number (MCN): 0000010271955
+Last CD Session LSN: not supported by drive/driver
+audio status: not implemented
 __________________________________
 CD Analysis Report
 Audio CD, CDDB disc ID is 02000401
@@ -40,5 +19,3 @@ CD-TEXT for Disc:
 	PERFORMER: Richard Stallman
 	TITLE: Join us now we have the software
 CD-TEXT for Track 1:
-	PERFORMER: Richard Stallman
-	TITLE: Join us now we have the software

data/test/data/cdda.toc

@@ -1,4 +1,4 @@
-// $Id: cdda.toc,v 1.3 2004/07/25 09:57:04 rocky Exp $
+// $Id: cdda.toc,v 1.4 2004/12/31 07:51:43 rocky Exp $
 
 // Language number should always start with 0
 LANGUAGE 0 {
@@ -10,4 +10,5 @@ CATALOG "0000010271955"
 CD_DA
 
 TRACK	  AUDIO
+COPY
 FILE "cdda.bin"   00:00:00 00:00:00

data/test/data/check_common_fn

@@ -1,6 +1,6 @@
-# $Id: check_common_fn.in,v 1.8 2004/05/06 12:05:49 rocky Exp $
+# $Id: check_common_fn.in,v 1.11 2005/01/29 14:50:34 rocky Exp $
 #
-#    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+#    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 #
 #    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
@@ -33,10 +33,9 @@ check_result() {
   cmdline=$*
   if test $RC -ne 0 ; then 
     if test $RC -ne $SKIP_TEST_EXITCODE ; then
-      if test -z "$cmdline" ; then 
-        echo "$0: $msg failed."
-      else 
-        echo "$0: $msg failed running:"
+      echo "$0: $msg failed in comparing output."
+      if test -n "$cmdline" ; then 
+        echo "$0: failed command:"
         echo "	$cmdline"
       fi
       exit $RC
@@ -94,7 +93,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 /usr/bin/diff  -w --unified ${outfile} ${rightfile} ; then
 	rm -f $outfile
@@ -108,7 +108,7 @@ test_iso_info() {
       return 77
     fi
   else
-    echo "$0 failed running: ${ISO_INFO} ${opts}"
+    echo "$0 failed running: $cmdline"
     return 2
   fi
 
@@ -160,7 +160,7 @@ test_cd_read() {
     return 1
   fi
 
-  if ${CD_READ} ${opts} >${outfile} 2>&1 ; then 
+  if ${CD_READ} --no-header ${opts} >${outfile} 2>&1 ; then 
     if test "/usr/bin/diff" != no; then
       if /usr/bin/diff  -w --unified ${outfile} ${rightfile} ; then
 	rm -f $outfile

data/test/data/check_common_fn.in

@@ -1,6 +1,6 @@
-# $Id: check_common_fn.in,v 1.8 2004/05/06 12:05:49 rocky Exp $
+# $Id: check_common_fn.in,v 1.11 2005/01/29 14:50:34 rocky Exp $
 #
-#    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+#    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
 #
 #    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
@@ -33,10 +33,9 @@ check_result() {
   cmdline=$*
   if test $RC -ne 0 ; then 
     if test $RC -ne $SKIP_TEST_EXITCODE ; then
-      if test -z "$cmdline" ; then 
-        echo "$0: $msg failed."
-      else 
-        echo "$0: $msg failed running:"
+      echo "$0: $msg failed in comparing output."
+      if test -n "$cmdline" ; then 
+        echo "$0: failed command:"
         echo "	$cmdline"
       fi
       exit $RC
@@ -94,7 +93,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 +108,7 @@ test_iso_info() {
       return 77
     fi
   else
-    echo "$0 failed running: ${ISO_INFO} ${opts}"
+    echo "$0 failed running: $cmdline"
     return 2
   fi
 
@@ -160,7 +160,7 @@ test_cd_read() {
     return 1
   fi
 
-  if ${CD_READ} ${opts} >${outfile} 2>&1 ; then 
+  if ${CD_READ} --no-header ${opts} >${outfile} 2>&1 ; then 
     if test "@DIFF@" != no; then
       if @DIFF@ @DIFF_OPTS@ ${outfile} ${rightfile} ; then
 	rm -f $outfile

data/test/data/check_cue.sh.in

@@ -1,19 +1,23 @@
 #!/bin/sh
-#$Id: check_cue.sh.in,v 1.20 2004/07/24 14:23:39 rocky Exp $
+#$Id: check_cue.sh.in,v 1.28 2005/04/11 02:36:36 rocky Exp $
 # Tests to see that BIN/CUE and cdrdao TOC file iamge reading is correct
 # (via cd-info).
 
-if test -n "@VCDINFO_LIBS@" ; then
+if test "@VCDINFO_LIBS@X" != "X" ; then
   vcd_opt='--no-vcd'
 fi
 
-if test -z "$srcdir" ; then
+if test "X$srcdir" = "X" ; then
   srcdir=`pwd`
 fi
 
+if test "X$top_srcdir" = "X" ; then
+  top_srcdir=`pwd`/..
+fi
+
 . ${srcdir}/check_common_fn
 
-if test ! -x ../src/cd-info ; then
+if test ! -x $top_srcdir/src/cd-info ; then
   exit 77
 fi
 
@@ -21,39 +25,45 @@ BASE=`basename $0 .sh`
 
 fname=cdda
 testnum=CD-DA
-opts="--quiet --cue-file ${srcdir}/${fname}.cue --no-cddb"
+opts="--quiet --no-device-info --cue-file ${srcdir}/${fname}.cue --no-cddb"
 test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
 RC=$?
-check_result $RC "cd-info CUE test $testnum" "cd-info $opts"
+check_result $RC "cd-info CUE test $testnum" "${CD_INFO} $opts"
   
 
-opts="--quiet --bin-file ${srcdir}/${fname}.bin --no-cddb"
+opts="--quiet --no-device-info --bin-file ${srcdir}/${fname}.bin --no-cddb"
 test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
 RC=$?
-check_result $RC "cd-info BIN test $testnum" "cd-info $opts"
+check_result $RC "cd-info BIN test $testnum" "${CD_INFO} $opts"
 
-opts="--quiet --toc-file ${srcdir}/${fname}.toc --no-cddb"
+opts="--quiet --no-device-info --toc-file ${srcdir}/${fname}.toc --no-cddb"
 test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
 RC=$?
-check_result $RC "cd-info TOC test $testnum" "cd-info $opts"
+check_result $RC "cd-info TOC test $testnum" "${CD_INFO} $opts"
 
 fname=isofs-m1
 testnum='ISO 9660 mode1 CUE'
 if test -f  ${srcdir}/${fname}.bin ; then
-  opts="-q --no-disc-mode --cue-file ${srcdir}/${fname}.cue --iso9660"
+  opts="-q --no-device-info --no-disc-mode --cue-file ${srcdir}/${fname}.cue --iso9660"
   test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
   RC=$?
-  check_result $RC "cd-info CUE test $testnum" "$opts"
+  check_result $RC "cd-info Rock-Ridge CUE test $testnum" "${CD_INFO} $opts"
+
+  opts="-q --no-device-info --no-disc-mode --no-rock-ridge --cue-file ${srcdir}/${fname}.cue --iso9660"
+  test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}-no-rr.right
+  RC=$?
+  check_result $RC "cd-info no Rock-Ridge CUE test $testnum" "${CD_INFO} $opts"
+
 else 
   echo "Don't see CUE file ${srcdir}/${fname}.bin. Test $testnum skipped."
 fi
 
 testnum='ISO 9660 mode1 TOC'
 if test -f  ${srcdir}/${fname}.bin ; then
-  opts="-q --no-disc-mode --toc-file ${srcdir}/${fname}.toc --iso9660"
+  opts="-q --no-device-info --no-disc-mode --toc-file ${srcdir}/${fname}.toc --iso9660"
   test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
   RC=$?
-  check_result $RC "cd-info TOC test $testnum" "cd-info $opts"
+  check_result $RC "cd-info TOC test $testnum" "${CD_INFO} $opts"
 else 
   echo "Don't see TOC file ${srcdir}/${fname}.bin. Test $testnum skipped."
 fi
@@ -66,16 +76,21 @@ else
 fi
 testnum='Video CD'
 if test -f ${srcdir}/${fname}.bin ; then
-  opts="-q --no-disc-mode -c ${srcdir}/${fname}.cue --iso9660"
+  opts="-q --no-device-info --no-disc-mode -c ${srcdir}/${fname}.cue --iso9660"
   test_cdinfo "$opts" ${fname}.dump $right
   RC=$?
-  check_result $RC "cd-info CUE test $testnum" "cd-info $opts" 
+  check_result $RC "cd-info CUE test $testnum" "${CD_INFO} $opts"
 
-  opts="-q --no-disc-mode -t ${srcdir}/${fname}.toc --iso9660"
+  if test -z "@VCDINFO_LIBS@" ; then
+    right=${srcdir}/${fname}.right
+  else
+    right=${srcdir}/${fname}_vcdinfo.right
+  fi
+  opts="-q --no-device-info --no-disc-mode -t ${srcdir}/${fname}.toc --iso9660"
   if test -f ${srcdir}/${fname}.toc ; then
     test_cdinfo "$opts" ${fname}.dump $right
     RC=$?
-    check_result $RC "cd-info TOC test $testnum" "cd-info $opts"
+    check_result $RC "cd-info TOC test $testnum" "${CD_INFO} $opts"
   else 
     echo "Don't see TOC file ${srcdir}/${fname}.toc. Test $testnum skipped."
   fi
@@ -86,10 +101,10 @@ fi
 fname=svcd_ogt_test_ntsc
 testnum='Super Video CD'
 if test -f ${srcdir}/${fname}.bin ; then
-  opts="-q --no-disc-mode --cue-file ${srcdir}/${fname}.cue $vcd_opt --iso9660"
+  opts="-q --no-device-info --no-disc-mode --cue-file ${srcdir}/${fname}.cue $vcd_opt --iso9660"
   test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
   RC=$?
-  check_result $RC "cd-info CUE test $testnum" "cd-info $opts"
+  check_result $RC "cd-info CUE test $testnum" "${CD_INFO} $opts"
 else 
   echo "Don't see CUE file ${srcdir}/${fname}.bin. Test $testnum skipped."
 fi

data/test/data/check_iso.sh.in

@@ -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.9 2005/03/05 23:51:40 rocky Exp $
 
 if test -z $srcdir ; then
   srcdir=`pwd`
@@ -17,12 +17,32 @@ 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"
+check_result $RC 'iso-read basic test' "$ISO_READ $opts"
+
+fname=copying-rr
+opts="--quiet ${srcdir}/${fname}.iso --iso9660 "
+test_iso_info  "$opts" ${fname}.dump ${srcdir}/${fname}.right
+RC=$?
+check_result $RC 'iso-info Rock Ridge test' "$ISO_INFO $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
 

data/test/data/check_nrg.sh.in

@@ -1,33 +1,36 @@
 #!/bin/sh
-#$Id: check_nrg.sh.in,v 1.10 2004/05/31 13:32:19 rocky Exp $
+#$Id: check_nrg.sh.in,v 1.15 2005/04/11 02:36:36 rocky Exp $
 
-if test -n "@VCDINFO_LIBS@" ; then
+if test "@VCDINFO_LIBS@X" != "X" ; then
   vcd_opt='--no-vcd'
 fi
 
-if test -z $srcdir ; then
+if test "X$srcdir" = "X" ; then
   srcdir=`pwd`
 fi
 
+if test "X$top_srcdir" = "X" ; then
+  top_srcdir=`pwd`/..
+fi
+
 . ${srcdir}/check_common_fn
 
-if test ! -x ../src/cd-info ; then
+if test ! -x $top_srcdir/src/cd-info ; then
   exit 77
 fi
 
 BASE=`basename $0 .sh`
 test_name=videocd
-
-test_cdinfo "--quiet --nrg-file ${srcdir}/${test_name}.nrg $vcd_opt --iso9660 " \
-  ${test_name}.dump ${srcdir}/${test_name}.right
+opts="--quiet --no-device-info --nrg-file ${srcdir}/${test_name}.nrg $vcd_opt --iso9660"
+test_cdinfo "$opts" ${test_name}.dump ${srcdir}/${test_name}.right
 RC=$?
-check_result $RC 'cd-info NRG test 1'
+check_result $RC 'cd-info NRG test 1' "${CD_INFO} $opts"
 
 BASE=`basename $0 .sh`
 nrg_file=${srcdir}/monvoisin.nrg
 
 if test -f  $nrg_file ; then
-  test_cdinfo "-q --nrg-file $nrg_file $vcd_opt --iso9660 " \
+  test_cdinfo "-q --no-device-info --nrg-file $nrg_file $vcd_opt --iso9660 " \
     monvoisin.dump ${srcdir}/monvoisin.right
   RC=$?
   check_result $RC 'cd-info NRG test 2'
@@ -38,11 +41,11 @@ fi
 
 test_name='svcdgs'
 nrg_file=${srcdir}/${test_name}.nrg
+opts="-q --no-device-info --nrg-file $nrg_file $vcd_opt --iso9660"
 if test -f  $nrg_file ; then
-  test_cdinfo "-q --nrg-file $nrg_file $vcd_opt --iso9660" \
-    ${test_name}.dump ${srcdir}/${test_name}.right
+  test_cdinfo "$opts" ${test_name}.dump ${srcdir}/${test_name}.right
   RC=$?
-  check_result $RC "cd-info NRG $test_name"
+  check_result $RC "cd-info NRG $test_name" "${CD_INFO} $opts"
 else 
   echo "Don't see NRG file ${nrg_file}. Test skipped."
   exit $SKIP_TEST_EXITCODE
@@ -50,12 +53,11 @@ fi
 
 test_name='cdda-mcn'
 nrg_file=${srcdir}/${test_name}.nrg
+opts="-q --no-device-info --nrg-file $nrg_file --no-cddb"
 if test -f  $nrg_file ; then
-  test_cdinfo "-q --nrg-file $nrg_file --no-cddb" \
-    ${test_name}.dump ${srcdir}/${test_name}.right
+  test_cdinfo "$opts" ${test_name}.dump ${srcdir}/${test_name}.right
   RC=$?
-  check_result $RC "cd-info NRG $test_name"
-  
+  check_result $RC "cd-info NRG $test_name" "${CD_INFO} $opts"
   exit $RC
 else 
   echo "Don't see NRG file ${nrg_file}. Test skipped."

data/test/data/check_opts0.right

@@ -1,33 +1,11 @@
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
-Hardware                    : Disk Image
-Can eject                   : No
-Can close tray              : No
-Can disable manual eject    : No
-Can select juke-box disc    : No
-
-Can set drive speed         : No
-Can detect if CD changed    : No
-Can read multiple sessions  : No
-Can hard reset device       : No
-
-Reading....
-  Can play audio            : Yes
-  Can read  CD-R            : Yes
-  Can read  CD-RW           : Yes
-  Can read  DVD-ROM         : No
-
-Writing....
-  Can write CD-RW           : No
-  Can write DVD-R           : No
-  Can write DVD-RAM         : No
-  Can write DVD-RW          : No
-  Can write DVD+RW          : No
 __________________________________
 
-Disc mode is listed as: CD-DATA Form 1
+Disc mode is listed as: CD-DATA (Mode 1)
 Media Catalog Number (MCN): not available
+Last CD Session LSN: not supported by drive/driver
 __________________________________
 CD Analysis Report
 CD-ROM with ISO 9660 filesystem