Language fix: "difference licenses"

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

diff --git a/test/test_bins.sh b/test/test_bins.sh
index 2f65c22..a345b6e 100755 (executable)
--- a/test/test_bins.sh
+++ b/test/test_bins.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 
 #  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2001,2002,2003,2004,2005,2006  Josh Coalson
+#  Copyright (C) 2001-2009  Josh Coalson
+#  Copyright (C) 2011-2013  Xiph.Org Foundation
 #
 #  This file is part the FLAC project.  FLAC is comprised of several
-#  components distributed under difference licenses.  The codec libraries
+#  components distributed under different licenses.  The codec libraries
 #  are distributed under Xiph.Org's BSD-like license (see the file
 #  COPYING.Xiph in this distribution).  All other programs, libraries, and
 #  plugins are distributed under the GPL (see COPYING.GPL).  The documentation
@@ -35,10 +36,12 @@ LD_LIBRARY_PATH=../src/share/getopt/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/utf8/.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/flac:$PATH
-PATH=../obj/$BUILD/bin:$PATH
+PATH=../objs/$BUILD/bin:$PATH
 BINS_PATH=../../test_files/bins
 
 if [ x"$FLAC__TEST_LEVEL" = x ] ; then
@@ -50,7 +53,8 @@ flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable"
 run_flac ()
 {
        if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then
-               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 flac $* 4>>test_bins.valgrind.log
+               echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 flac $*" >>test_bins.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac $* 4>>test_bins.valgrind.log
        else
                flac $*
        fi
@@ -66,7 +70,7 @@ test_file ()
        encode_options="$4"
 
        echo -n "$name.bin (--channels=$channels --bps=$bps $encode_options): encode..."
-       cmd="run_flac --verify --silent --force --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options $name.bin"
+       cmd="run_flac --verify --silent --force --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options --no-padding $name.bin"
        echo "### ENCODE $name #######################################################" >> ./streams.log
        echo "###    cmd=$cmd" >> ./streams.log
        $cmd 2>>./streams.log || die "ERROR during encode of $name"
@@ -102,7 +106,7 @@ for f in b00 b01 b02 b03 b04 ; do
                                                done
                                        done
                                        if [ "$FLAC__TEST_LEVEL" -gt 1 ] ; then
-                                               test_file $binfile $channels $bps "-b 16384 -m -r 8 -l 32 -e -p $disable"
+                                               test_file $binfile $channels $bps "--lax -b 16384 -m -r 8 -l 32 -e -p $disable"
                                        fi
                                done
                        done