diff --git a/test/Makefile.am b/test/Makefile.am index 39a4e448..8bd1f37c 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,7 @@ -# $Id: Makefile.am,v 1.58 2007/11/16 22:29:01 flameeyes Exp $ +# $Id: Makefile.am,v 1.59 2008/03/06 01:34:09 rocky Exp $ # -# Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein -# +# Copyright (C) 2003, 2004, 2005, 2006, 2008 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 @@ -66,6 +66,7 @@ check_DATA = vcd_demo.right vcd_demo_vcdinfo.right \ cdda.right cdda.toc cdda.cue cdda.bin \ isofs-m1.right isofs-m1-no-rr.right \ isofs-m1.toc isofs-m1.cue isofs-m1.bin \ + cd-paranoia-log.right \ 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/test/cd-paranoia-log.right b/test/cd-paranoia-log.right new file mode 100644 index 00000000..bf7db7cd --- /dev/null +++ b/test/cd-paranoia-log.right @@ -0,0 +1,3 @@ +outputting to cdda.raw + (== PROGRESS == [++- - - | 000301 10 ] == :^D * ==) + diff --git a/test/check_paranoia.sh.in b/test/check_paranoia.sh.in index 38b8fc23..082c47c8 100644 --- a/test/check_paranoia.sh.in +++ b/test/check_paranoia.sh.in @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: check_paranoia.sh.in,v 1.12 2008/02/29 11:34:15 rocky Exp $ +# $Id: check_paranoia.sh.in,v 1.13 2008/03/06 01:34:10 rocky Exp $ # Compare our cd-paranoia with known good results. if test "X$srcdir" = "X" ; then @@ -41,7 +41,7 @@ if test "@CMP@" != no -a "@BUILD_CD_PARANOIA_TRUE@"X = X ; then exit 3 fi # Start out with small jitter - $top_builddir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -x 5 -v -r -- "1-" + $top_builddir/src/cd-paranoia/cd-paranoia -l ./cd-paranoia.log -d $srcdir/cdda.cue -x 5 -v -r -- "1-" if test $? -ne 0 ; then exit 6 fi @@ -52,6 +52,14 @@ if test "@CMP@" != no -a "@BUILD_CD_PARANOIA_TRUE@"X = X ; then echo "** Small jitter correction problem" exit 3 fi + tail -3 ./cd-paranoia.log > ./cd-paranoia-filtered.log + if @CMP@ ./cd-paranoia-log.right ./cd-paranoia-filtered.log ; then + echo "** --log option okay" + rm ./cd-paranoia.log ./cd-paranoia-filtered.log + else + echo "** --log option problem" + exit 4 + fi # A more massive set of failures: underrun + small jitter $top_builddir/src/cd-paranoia/cd-paranoia -d $srcdir/cdda.cue -x 69 -v -r -- "1-" if test $? -ne 0 ; then