add logging of command to valgrind log

[platform/upstream/flac.git] / test / test_seeking.sh

diff --git a/test/test_seeking.sh b/test/test_seeking.sh
index b85cff9..d8b3089 100755 (executable)
--- a/test/test_seeking.sh
+++ b/test/test_seeking.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2004,2005  Josh Coalson
+#  Copyright (C) 2004,2005,2006  Josh Coalson
 #
 #  This file is part the FLAC project.  FLAC is comprised of several
 #  components distributed under difference licenses.  The codec libraries
@@ -30,7 +30,6 @@ else
 fi
 
 LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
-LD_LIBRARY_PATH=../src/libOggFLAC/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 PATH=../src/flac:$PATH
@@ -44,7 +43,8 @@ metaflac --help 1>/dev/null 2>/dev/null || die "ERROR can't find metaflac execut
 
 run_flac ()
 {
-       if [ x"$FLAC__VALGRIND" = xyes ] ; then
+       if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then
+               echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 flac $*" >>test_seeking.valgrind.log
                valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 flac $* 4>>test_seeking.valgrind.log
        else
                flac $*
@@ -53,7 +53,8 @@ run_flac ()
 
 run_metaflac ()
 {
-       if [ x"$FLAC__VALGRIND" = xyes ] ; then
+       if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then
+               echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 metaflac $*" >>test_seeking.valgrind.log
                valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 metaflac $* 4>>test_seeking.valgrind.log
        else
                metaflac $*
@@ -62,7 +63,8 @@ run_metaflac ()
 
 run_test_seeking ()
 {
-       if [ x"$FLAC__VALGRIND" = xyes ] ; then
+       if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then
+               echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 test_seeking $*" >>test_seeking.valgrind.log
                valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 test_seeking $* 4>>test_seeking.valgrind.log
        else
                test_seeking $*
@@ -85,50 +87,58 @@ if [ ! -f noise.raw ] ; then
 fi
 
 echo "generating FLAC files for seeking:"
-run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=8 --channels=1 --blocksize=576 --output-name=tiny.flac noise8m32.raw || die "ERROR generating FLAC file"
-run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=16 --channels=2 --blocksize=576 --output-name=small.flac noise.raw || die "ERROR generating FLAC file"
+run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=8 --channels=1 --blocksize=576 -S- --output-name=tiny.flac noise8m32.raw || die "ERROR generating FLAC file"
+run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=16 --channels=2 --blocksize=576 -S- --output-name=small.flac noise.raw || die "ERROR generating FLAC file"
+run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=8 --channels=1 --blocksize=576 -S10x --output-name=tiny-s.flac noise8m32.raw || die "ERROR generating FLAC file"
+run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=16 --channels=2 --blocksize=576 -S10x --output-name=small-s.flac noise.raw || die "ERROR generating FLAC file"
 
-echo "testing tiny.flac:"
-if run_test_seeking tiny.flac 100 ; then : ; else
-       die "ERROR: during test_seeking"
-fi
+tiny_samples=`metaflac --show-total-samples tiny.flac`
+small_samples=`metaflac --show-total-samples small.flac`
 
-echo "testing small.flac:"
-if run_test_seeking small.flac 1000 ; then : ; else
-       die "ERROR: during test_seeking"
-fi
+for suffix in '' '-s' ; do
+       echo "testing tiny$suffix.flac:"
+       if run_test_seeking tiny$suffix.flac 100 $tiny_samples ; then : ; else
+               die "ERROR: during test_seeking"
+       fi
 
-echo "removing sample count from tiny.flac and small.flac:"
-if run_metaflac --no-filename --set-total-samples=0 tiny.flac small.flac ; then : ; else
-       die "ERROR: during metaflac"
-fi
+       echo "testing small$suffix.flac:"
+       if run_test_seeking small$suffix.flac 1000 $small_samples ; then : ; else
+               die "ERROR: during test_seeking"
+       fi
 
-echo "testing tiny.flac with total_samples=0:"
-if run_test_seeking tiny.flac 100 ; then : ; else
-       die "ERROR: during test_seeking"
-fi
+       echo "removing sample count from tiny$suffix.flac and small$suffix.flac:"
+       if run_metaflac --no-filename --set-total-samples=0 tiny$suffix.flac small$suffix.flac ; then : ; else
+               die "ERROR: during metaflac"
+       fi
 
-echo "testing small.flac with total_samples=0:"
-if run_test_seeking small.flac 1000 ; then : ; else
-       die "ERROR: during test_seeking"
-fi
+       echo "testing tiny$suffix.flac with total_samples=0:"
+       if run_test_seeking tiny$suffix.flac 100 $tiny_samples ; then : ; else
+               die "ERROR: during test_seeking"
+       fi
+
+       echo "testing small$suffix.flac with total_samples=0:"
+       if run_test_seeking small$suffix.flac 1000 $small_samples ; then : ; else
+               die "ERROR: during test_seeking"
+       fi
+done
 
 if [ $has_ogg = "yes" ] ; then
 
        echo "generating Ogg FLAC files for seeking:"
        run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=8 --channels=1 --blocksize=576 --output-name=tiny.ogg --ogg noise8m32.raw || die "ERROR generating Ogg FLAC file"
        run_flac --verify --force --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=16 --channels=2 --blocksize=576 --output-name=small.ogg --ogg noise.raw || die "ERROR generating Ogg FLAC file"
+       # seek tables are not used in Ogg FLAC
 
        echo "testing tiny.ogg:"
-       if run_test_seeking tiny.ogg 100 ; then : ; else
+       if run_test_seeking tiny.ogg 100 $tiny_samples ; then : ; else
                die "ERROR: during test_seeking"
        fi
 
        echo "testing small.ogg:"
-       if run_test_seeking small.ogg 1000 ; then : ; else
+       if run_test_seeking small.ogg 1000 $small_samples ; then : ; else
                die "ERROR: during test_seeking"
        fi
 
 fi
 
-rm -f tiny.flac tiny.ogg small.flac small.ogg
+rm -f tiny.flac tiny.ogg small.flac small.ogg tiny-s.flac small-s.flac