Correctly initialize FLAC_API_SUPPORTS_OGG_FLAC

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

diff --git a/test/test_grabbag.sh b/test/test_grabbag.sh
index f7bda57..c91f58c 100755 (executable)
--- a/test/test_grabbag.sh
+++ b/test/test_grabbag.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2001,2002,2003,2004,2005,2006  Josh Coalson
+#  Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
 #
 #  This file is part the FLAC project.  FLAC is comprised of several
 #  components distributed under difference licenses.  The codec libraries
@@ -32,22 +32,37 @@ fi
 LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
-LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
+export MALLOC_CHECK_=3
+export MALLOC_PERTURB_=$((1$(date +%N) % 255 + 1))
 PATH=../src/test_grabbag/cuesheet:$PATH
-PATH=../obj/$BUILD/bin:$PATH
+PATH=../src/test_grabbag/picture:$PATH
+PATH=../objs/$BUILD/bin:$PATH
 
 test_cuesheet -h 1>/dev/null 2>/dev/null || die "ERROR can't find test_cuesheet executable"
+test_picture -h 1>/dev/null 2>/dev/null || die "ERROR can't find test_picture executable"
 
 run_test_cuesheet ()
 {
        if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then
-               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 test_cuesheet $* 4>>test_grabbag.valgrind.log
+               echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 test_cuesheet $*" >>test_grabbag.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_cuesheet $* 4>>test_grabbag.valgrind.log
        else
                test_cuesheet $*
        fi
 }
 
+run_test_picture ()
+{
+       if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then
+               echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 test_picture $*" >>test_grabbag.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_picture $* 4>>test_grabbag.valgrind.log
+       else
+               test_picture $*
+       fi
+}
+
 if [ `env | grep -ic '^comspec='` != 0 ] ; then
        is_win=yes
 else
@@ -56,6 +71,29 @@ fi
 
 ########################################################################
 #
+# test_picture
+#
+########################################################################
+
+log=picture.log
+picture_dir=pictures
+
+echo "Running test_picture..."
+
+rm -f $log
+
+run_test_picture $picture_dir >> $log 2>&1
+
+if [ $is_win = yes ] ; then
+       diff -w picture.ok $log > picture.diff || die "Error: .log file does not match .ok file, see picture.diff"
+else
+       diff picture.ok $log > picture.diff || die "Error: .log file does not match .ok file, see picture.diff"
+fi
+
+echo "PASSED (results are in $log)"
+
+########################################################################
+#
 # test_cuesheet
 #
 ########################################################################
@@ -66,6 +104,8 @@ good_cuesheets=cuesheets/good.*.cue
 good_leadout=`expr 80 \* 60 \* 44100`
 bad_leadout=`expr $good_leadout + 1`
 
+echo "Running test_cuesheet..."
+
 rm -f $log
 
 #
@@ -73,7 +113,7 @@ rm -f $log
 #
 for cuesheet in $bad_cuesheets ; do
        echo "NEGATIVE $cuesheet" >> $log 2>&1
-       run_test_cuesheet $cuesheet $good_leadout cdda >> $log 2>&1
+       run_test_cuesheet $cuesheet $good_leadout 44100 cdda >> $log 2>&1
        exit_code=$?
        if [ "$exit_code" = 255 ] ; then
                die "Error: test script is broken"
@@ -88,7 +128,7 @@ done
 #
 for cuesheet in $good_cuesheets ; do
        echo "POSITIVE $cuesheet" >> $log 2>&1
-       run_test_cuesheet $cuesheet $good_leadout cdda >> $log 2>&1
+       run_test_cuesheet $cuesheet $good_leadout 44100 cdda >> $log 2>&1
        exit_code=$?
        if [ "$exit_code" = 255 ] ; then
                die "Error: test script is broken"