add --force to run_flac invocations

diff --git a/test/test_bins.sh b/test/test_bins.sh
index 92b1ffa..7478cd8 100755 (executable)
--- a/test/test_bins.sh
+++ b/test/test_bins.sh
@@ -49,13 +49,13 @@ test_file ()
        encode_options="$4"
 
        echo -n "$name (--channels=$channels --bps=$bps $encode_options): encode..."
-       cmd="run_flac --verify --silent --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 $name.bin"
        echo "### ENCODE $name #######################################################" >> ./streams.log
        echo "###    cmd=$cmd" >> ./streams.log
        $cmd 2>>./streams.log || die "ERROR during encode of $name"
 
        echo -n "decode..."
-       cmd="run_flac --silent --endian=big --sign=signed --decode --force-raw-format $name.flac";
+       cmd="run_flac --silent --force --endian=big --sign=signed --decode --force-raw-format $name.flac";
        echo "### DECODE $name #######################################################" >> ./streams.log
        echo "###    cmd=$cmd" >> ./streams.log
        $cmd 2>>./streams.log || die "ERROR during decode of $name"

diff --git a/test/test_streams.sh b/test/test_streams.sh
index 2eb80e1..9d0f8a8 100755 (executable)
--- a/test/test_streams.sh
+++ b/test/test_streams.sh
@@ -55,13 +55,13 @@ test_file ()
        encode_options="$4"
 
        echo -n "$name (--channels=$channels --bps=$bps $encode_options): encode..."
-       cmd="run_flac --verify --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options $name.raw"
+       cmd="run_flac --verify --silent --force --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options $name.raw"
        echo "### ENCODE $name #######################################################" >> ./streams.log
        echo "###    cmd=$cmd" >> ./streams.log
        $cmd 2>>./streams.log || die "ERROR during encode of $name"
 
        echo -n "decode..."
-       cmd="run_flac --silent --endian=big --sign=signed --decode --force-raw-format --output-name=$name.cmp $name.flac"
+       cmd="run_flac --silent --force --endian=big --sign=signed --decode --force-raw-format --output-name=$name.cmp $name.flac"
        echo "### DECODE $name #######################################################" >> ./streams.log
        echo "###    cmd=$cmd" >> ./streams.log
        $cmd 2>>./streams.log || die "ERROR during decode of $name"
@@ -91,24 +91,24 @@ test_file_piped ()
 
        echo -n "$name: encode via pipes..."
        if [ $is_win = yes ] ; then
-               cmd="run_flac --verify --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options --stdout $name.raw"
+               cmd="run_flac --verify --silent --force --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options --stdout $name.raw"
                echo "### ENCODE $name #######################################################" >> ./streams.log
                echo "###    cmd=$cmd" >> ./streams.log
                $cmd 1>$name.flac 2>>./streams.log || die "ERROR during encode of $name"
        else
-               cmd="run_flac --verify --silent --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options --stdout -"
+               cmd="run_flac --verify --silent --force --force-raw-format --endian=big --sign=signed --sample-rate=44100 --bps=$bps --channels=$channels $encode_options --stdout -"
                echo "### ENCODE $name #######################################################" >> ./streams.log
                echo "###    cmd=$cmd" >> ./streams.log
                cat $name.raw | $cmd 1>$name.flac 2>>./streams.log || die "ERROR during encode of $name"
        fi
        echo -n "decode via pipes..."
        if [ $is_win = yes ] ; then
-               cmd="run_flac --silent --endian=big --sign=signed --decode --force-raw-format --stdout $name.flac"
+               cmd="run_flac --silent --force --endian=big --sign=signed --decode --force-raw-format --stdout $name.flac"
                echo "### DECODE $name #######################################################" >> ./streams.log
                echo "###    cmd=$cmd" >> ./streams.log
                $cmd 1>$name.cmp 2>>./streams.log || die "ERROR during decode of $name"
        else
-               cmd="run_flac --silent --endian=big --sign=signed --decode --force-raw-format --stdout -"
+               cmd="run_flac --silent --force --endian=big --sign=signed --decode --force-raw-format --stdout -"
                echo "### DECODE $name #######################################################" >> ./streams.log
                echo "###    cmd=$cmd" >> ./streams.log
                cat $name.flac | $cmd 1>$name.cmp 2>>./streams.log || die "ERROR during decode of $name"