claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

mmc_hl_cmds.c: remove gcc warning

Browse Source 
solaris.c: remove unused fn warning when not on solaris
check_cue.sh.in: fix so we can build outside of source tree. With this, "make distcheck" works again.
This commit is contained in:
R. Bernstein
2012-01-28 20:56:30 -05:00
parent bf40f778d1
commit f130f66c5d
3 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
test/check_cue.sh.in
View File

@@ -1,5 +1,4 @@
#!/bin/sh
#$Id: check_cue.sh.in,v 1.31 2007/12/28 02:11:01 rocky Exp $
# Tests to see that BIN/CUE and cdrdao TOC file iamge reading is correct
# (via cd-info).
@@ -7,8 +6,8 @@ if test "@VCDINFO_LIBS@X" != "X" ; then
vcd_opt='--no-vcd'
fi
if test "X$srcdir" = "X" ; then
srcdir=`pwd`
if test "X$abs_top_srcdir" = "X" ; then
abs_top_srcdir=@abs_top_srcdir@
fi
if test "X$top_srcdir" = "X" ; then
@@ -21,7 +20,7 @@ fi
. ${top_builddir}/test/check_common_fn
if test ! -x $top_srcdir/src/cd-info ; then
if test ! -x $abs_top_srcdir/src/cd-info ; then
exit 77
fi
@@ -29,107 +28,107 @@ BASE=`basename $0 .sh`
fname=cdda
testnum=CD-DA
opts="--quiet --no-device-info --cue-file ${srcdir}/data/${fname}.cue --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
opts="--quiet --no-device-info --cue-file ${abs_top_srcdir}/data/${fname}.cue --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info CUE test $testnum" "${CD_INFO} $opts"
opts="--quiet --no-device-info --bin-file ${srcdir}/data/${fname}.bin --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
opts="--quiet --no-device-info --bin-file ${abs_top_srcdir}/data/${fname}.bin --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info BIN test $testnum" "${CD_INFO} $opts"
opts="--quiet --no-device-info --toc-file ${srcdir}/data/${fname}.toc --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
opts="--quiet --no-device-info --toc-file ${abs_top_srcdir}/data/${fname}.toc --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info TOC test $testnum" "${CD_INFO} $opts"
fname=cdtext
testnum="CD-Text binary parser"
if test -f ${srcdir}/data/${fname}.bin ; then
if test -f ${srcdir}/data/${fname}.cdt ; then
opts="--quiet --no-device-info --cue-file ${srcdir}/data/${fname}.cue --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
if test -f ${abs_top_srcdir}/data/${fname}.bin ; then
if test -f ${abs_top_srcdir}/data/${fname}.cdt ; then
opts="--quiet --no-device-info --cue-file ${abs_top_srcdir}/data/${fname}.cue --no-cddb"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info CD-Text CUE test $testnum" "${CD_INFO} $opts"
else
echo "Don't see CD-Text file ${srcdir}/data/${fname}.cdt. Test $testnum skipped."
echo "Don't see CD-Text file ${abs_top_srcdir}/data/${fname}.cdt. Test $testnum skipped."
fi
else
echo "Don't see binary file ${srcdir}/data/${fname}.bin. Test $testnum skipped."
echo "Don't see binary file ${abs_top_srcdir}/data/${fname}.bin. Test $testnum skipped."
fi
fname=isofs-m1
testnum='ISO 9660 mode1 CUE'
if test -f ${srcdir}/data/${fname}.bin ; then
if test -f ${abs_top_srcdir}/data/${fname}.bin ; then
if test -n "@HAVE_ROCK@"; then
opts="-q --no-device-info --no-disc-mode --cue-file ${srcdir}/data/${fname}.cue --iso9660"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
opts="-q --no-device-info --no-disc-mode --cue-file ${abs_top_srcdir}/data/${fname}.cue --iso9660"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
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}/data/${fname}.cue --iso9660"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}-no-rr.right
opts="-q --no-device-info --no-disc-mode --no-rock-ridge --cue-file ${abs_top_srcdir}/data/${fname}.cue --iso9660"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}-no-rr.right
RC=$?
check_result $RC "cd-info no Rock-Ridge CUE test $testnum" "${CD_INFO} $opts"
fi
else
echo "Don't see CUE file ${srcdir}/data/${fname}.bin. Test $testnum skipped."
echo "Don't see CUE file ${abs_top_srcdir}/data/${fname}.bin. Test $testnum skipped."
fi
if test -n "@HAVE_ROCK@"; then
testnum='ISO 9660 mode1 TOC'
if test -f ${srcdir}/data/${fname}.bin ; then
opts="-q --no-device-info --no-disc-mode --toc-file ${srcdir}/data/${fname}.toc --iso9660"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
if test -f ${abs_top_srcdir}/data/${fname}.bin ; then
opts="-q --no-device-info --no-disc-mode --toc-file ${abs_top_srcdir}/data/${fname}.toc --iso9660"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info TOC test $testnum" "${CD_INFO} $opts"
else
echo "Don't see TOC file ${srcdir}/data/${fname}.bin. Test $testnum skipped."
echo "Don't see TOC file ${abs_top_srcdir}/data/${fname}.bin. Test $testnum skipped."
fi
fi
fname=vcd_demo
if test -z "@VCDINFO_LIBS@" ; then
right=${srcdir}/${fname}.right
right=${abs_top_srcdir}/${fname}.right
else
right=${srcdir}/${fname}_vcdinfo.right
right=${abs_top_srcdir}/${fname}_vcdinfo.right
fi
testnum='Video CD'
if test -f ${srcdir}/data/${fname}.bin ; then
opts="-q --no-device-info --no-disc-mode -c ${srcdir}/data/${fname}.cue --iso9660"
if test -f ${abs_top_srcdir}/data/${fname}.bin ; then
opts="-q --no-device-info --no-disc-mode -c ${abs_top_srcdir}/data/${fname}.cue --iso9660"
test_cdinfo "$opts" ${fname}.dump $right
RC=$?
check_result $RC "cd-info CUE test $testnum" "${CD_INFO} $opts"
if test -z "@VCDINFO_LIBS@" ; then
right=${srcdir}/${fname}.right
right=${abs_top_srcdir}/${fname}.right
else
right=${srcdir}/${fname}_vcdinfo.right
right=${abs_top_srcdir}/${fname}_vcdinfo.right
fi
opts="-q --no-device-info --no-disc-mode -t ${srcdir}/data/${fname}.toc --iso9660"
if test -f ${srcdir}/${fname}.toc ; then
opts="-q --no-device-info --no-disc-mode -t ${abs_top_srcdir}/data/${fname}.toc --iso9660"
if test -f ${abs_top_srcdir}/${fname}.toc ; then
test_cdinfo "$opts" ${fname}.dump $right
RC=$?
check_result $RC "cd-info TOC test $testnum" "${CD_INFO} $opts"
else
echo "Don't see TOC file ${srcdir}/data/${fname}.toc. Test $testnum skipped."
echo "Don't see TOC file ${abs_top_srcdir}/data/${fname}.toc. Test $testnum skipped."
fi
else
echo "Don't see BIN file ${srcdir}/data/${fname}.bin. Test $testnum skipped."
echo "Don't see BIN file ${abs_top_srcdir}/data/${fname}.bin. Test $testnum skipped."
fi
fname=svcd_ogt_test_ntsc
testnum='Super Video CD'
if test -f ${srcdir}/data/${fname}.bin ; then
opts="-q --no-device-info --no-disc-mode --cue-file ${srcdir}/data/${fname}.cue $vcd_opt --iso9660"
test_cdinfo "$opts" ${fname}.dump ${srcdir}/${fname}.right
if test -f ${abs_top_srcdir}/data/${fname}.bin ; then
opts="-q --no-device-info --no-disc-mode --cue-file ${abs_top_srcdir}/data/${fname}.cue $vcd_opt --iso9660"
test_cdinfo "$opts" ${fname}.dump ${abs_top_srcdir}/${fname}.right
RC=$?
check_result $RC "cd-info CUE test $testnum" "${CD_INFO} $opts"
else
echo "Don't see CUE file ${srcdir}/data/${fname}.bin. Test $testnum skipped."
echo "Don't see CUE file ${abs_top_srcdir}/data/${fname}.bin. Test $testnum skipped."
fi
exit $RC