diff --git a/configure.in b/configure.in index ffe07ac4181abcfd89998739b7d484c9459ac0f0..b5f26accc4c2196f717f6b189034b87f38d19b19 100644 --- a/configure.in +++ b/configure.in @@ -105,7 +105,7 @@ AH_TEMPLATE(FLAC__NO_ASM, [define to disable use of assembly code]) fi AC_ARG_ENABLE(debug, -[ --enable-debug Turn on debugging], +AC_HELP_STRING([--enable-debug], [Turn on debugging]), [case "${enableval}" in yes) debug=true ;; no) debug=false ;; @@ -114,7 +114,7 @@ esac],[debug=false]) AM_CONDITIONAL(DEBUG, test "x$debug" = xtrue) AC_ARG_ENABLE(sse, -[ --enable-sse Enable SSE support by asserting that the OS supports SSE instructions], +AC_HELP_STRING([--enable-sse], [Enable SSE support by asserting that the OS supports SSE instructions]), [case "${enableval}" in yes) sse_os=true ;; no) sse_os=false ;; @@ -127,7 +127,7 @@ AH_TEMPLATE(FLAC__SSE_OS, [define if your operating system supports SSE instruct fi AC_ARG_ENABLE(3dnow, -[ --disable-3dnow Disable 3DNOW! optimizations], +AC_HELP_STRING([--disable-3dnow], [Disable 3DNOW! optimizations]), [case "${enableval}" in yes) use_3dnow=true ;; no) use_3dnow=false ;; @@ -140,7 +140,7 @@ AH_TEMPLATE(FLAC__USE_3DNOW, [define to enable use of 3Dnow! instructions]) fi AC_ARG_ENABLE(altivec, -[ --disable-altivec Disable Altivec optimizations], +AC_HELP_STRING([--disable-altivec], [Disable Altivec optimizations]), [case "${enableval}" in yes) use_altivec=true ;; no) use_altivec=false ;; @@ -153,7 +153,7 @@ AH_TEMPLATE(FLAC__USE_ALTIVEC, [define to enable use of Altivec instructions]) fi AC_ARG_ENABLE(local-xmms-plugin, -[ --enable-local-xmms-plugin Install XMMS plugin to ~/.xmms/Plugins instead of system location], +AC_HELP_STRING([--enable-local-xmms-plugin], [Install XMMS plugin to ~/.xmms/Plugins instead of system location]), [case "${enableval}" in yes) install_xmms_plugin_locally=true ;; no) install_xmms_plugin_locally=false ;; @@ -161,31 +161,37 @@ AC_ARG_ENABLE(local-xmms-plugin, esac],[install_xmms_plugin_locally=false]) AM_CONDITIONAL(FLaC__INSTALL_XMMS_PLUGIN_LOCALLY, test "x$install_xmms_plugin_locally" = xtrue) +AC_ARG_ENABLE(thorough-tests, +AC_HELP_STRING([--disable-thorough-tests], [Disable thorough (long) testing, do only basic tests]), +[case "${enableval}" in + yes) thorough_tests=true ;; + no) thorough_tests=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-thorough-tests) ;; +esac],[thorough_tests=true]) AC_ARG_ENABLE(exhaustive-tests, -[ --enable-exhaustive-tests Enable exhaustive testing], +AC_HELP_STRING([--enable-exhaustive-tests], [Enable exhaustive testing (VERY long)]), [case "${enableval}" in yes) exhaustive_tests=true ;; no) exhaustive_tests=false ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-exhaustive-tests) ;; esac],[exhaustive_tests=false]) -AM_CONDITIONAL(FLaC__EXHAUSTIVE_TESTS, test "x$exhaustive_tests" = xtrue) -if test "x$exhaustive_tests" = xtrue ; then -AC_DEFINE(FLAC__EXHAUSTIVE_TESTS) -AH_TEMPLATE(FLAC__EXHAUSTIVE_TESTS, [define to run even more tests]) +if test "x$thorough_tests" = xfalse ; then +FLAC__TEST_LEVEL=0 +elif test "x$exhaustive_tests" = xfalse ; then +FLAC__TEST_LEVEL=1 +else +FLAC__TEST_LEVEL=2 fi +AC_SUBST(FLAC__TEST_LEVEL) AC_ARG_ENABLE(valgrind-testing, AC_HELP_STRING([--enable-valgrind-testing], [Run all tests inside Valgrind]), [case "${enableval}" in - yes) valgrind_testing=true ;; - no) valgrind_testing=false ;; + yes) FLAC__TEST_WITH_VALGRIND=yes ;; + no) FLAC__TEST_WITH_VALGRIND=no ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-valgrind-testing) ;; -esac],[valgrind_testing=false]) -AM_CONDITIONAL(FLaC__VALGRIND_TESTING, test "x$valgrind_testing" = xtrue) -if test "x$valgrind_testing" = xtrue ; then -AC_DEFINE(FLAC__VALGRIND_TESTING) -AH_TEMPLATE(FLAC__VALGRIND_TESTING, [define to enable use of Valgrind in testers]) -fi +esac],[FLAC__TEST_WITH_VALGRIND=no]) +AC_SUBST(FLAC__TEST_WITH_VALGRIND) AC_ARG_ENABLE(doxygen-docs, AC_HELP_STRING([--disable-doxygen-docs], [Disable API documentation building via Doxygen]), diff --git a/doc/html/changelog.html b/doc/html/changelog.html index 144e06e813f816250ffc220fc9b07d7768748765..b74fdb158e863a40f4ad8c64f48922e96f4490c3 100644 --- a/doc/html/changelog.html +++ b/doc/html/changelog.html @@ -113,8 +113,9 @@
  • build system:
    • diff --git a/test/Makefile.am b/test/Makefile.am index 06868cf2ee33c9f8f33d5202872636260155749a..26eb28a20231ed565ac0cf267ffbbe8153cf28e6 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -15,19 +15,7 @@ # restrictive of those mentioned above. See the file COPYING.Xiph in this # distribution. -if FLaC__EXHAUSTIVE_TESTS -FLAC__EXHAUSTIVE_TESTS = yes -else -FLAC__EXHAUSTIVE_TESTS = no -endif - -if FLaC__VALGRIND_TESTING -FLAC__VALGRIND = yes -else -FLAC__VALGRIND = no -endif - -TESTS_ENVIRONMENT = FLAC__EXHAUSTIVE_TESTS=$(FLAC__EXHAUSTIVE_TESTS) FLAC__VALGRIND=$(FLAC__VALGRIND) +TESTS_ENVIRONMENT = FLAC__TEST_LEVEL=@FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALRGIND=@FLAC__TEST_WITH_VALGRIND@ SUBDIRS = cuesheets @@ -45,8 +33,7 @@ TESTS = \ ./test_metaflac.sh \ ./test_grabbag.sh \ ./test_seeking.sh \ - ./test_streams.sh \ - ./test_bins.sh + ./test_streams.sh EXTRA_DIST = \ Makefile.lite \ diff --git a/test/Makefile.lite b/test/Makefile.lite index d8a2e4ab3bd26c8c23de348d49882e098286239a..baf0f16cb33ee1a47a5f8654ccc49c478222f211 100644 --- a/test/Makefile.lite +++ b/test/Makefile.lite @@ -26,24 +26,24 @@ DEFAULT_CONFIG = release CONFIG = $(DEFAULT_CONFIG) all: clean - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libFLAC.sh $(CONFIG) - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libFLAC++.sh $(CONFIG) - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libOggFLAC.sh $(CONFIG) - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libOggFLAC++.sh $(CONFIG) - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_flac.sh $(CONFIG) - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_metaflac.sh $(CONFIG) - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_grabbag.sh $(CONFIG) - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_seeking.sh $(CONFIG) - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_streams.sh $(CONFIG) - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_bins.sh $(CONFIG) - -debug : FLAC__EXHAUSTIVE_TESTS=FLAC__EXHAUSTIVE_TESTS=yes -valgrind: FLAC__EXHAUSTIVE_TESTS=FLAC__EXHAUSTIVE_TESTS=no -release : FLAC__EXHAUSTIVE_TESTS=FLAC__EXHAUSTIVE_TESTS=yes - -debug : FLAC__VALGRIND=FLAC__VALGRIND=no -valgrind: FLAC__VALGRIND=FLAC__VALGRIND=yes -release : FLAC__VALGRIND=FLAC__VALGRIND=no + $(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_libFLAC.sh $(CONFIG) + $(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_libFLAC++.sh $(CONFIG) + $(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_libOggFLAC.sh $(CONFIG) + $(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_libOggFLAC++.sh $(CONFIG) + $(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_flac.sh $(CONFIG) + $(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_metaflac.sh $(CONFIG) + $(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_grabbag.sh $(CONFIG) + $(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_seeking.sh $(CONFIG) + $(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_streams.sh $(CONFIG) + $(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_bins.sh $(CONFIG) + +debug : FLAC__TEST_LEVEL=FLAC__TEST_LEVEL=2 +valgrind: FLAC__TEST_LEVEL=FLAC__TEST_LEVEL=1 +release : FLAC__TEST_LEVEL=FLAC__TEST_LEVEL=2 + +debug : FLAC__TEST_WITH_VALGRIND=FLAC__TEST_WITH_VALGRIND=no +valgrind: FLAC__TEST_WITH_VALGRIND=FLAC__TEST_WITH_VALGRIND=yes +release : FLAC__TEST_WITH_VALGRIND=FLAC__TEST_WITH_VALGRIND=no debug : CONFIG = debug valgrind: CONFIG = debug diff --git a/test/test_bins.sh b/test/test_bins.sh index 4d1898e228b63d364c9511f5c36b19c3d0b0d14c..2ed02585cbcb76b836b46906416269f072892b16 100755 --- a/test/test_bins.sh +++ b/test/test_bins.sh @@ -46,7 +46,7 @@ flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" run_flac () { - if [ x"$FLAC__VALGRIND" = xyes ] ; then + 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 else flac $* @@ -98,7 +98,7 @@ for f in b00 b01 b02 b03 b04 ; do done done done - if [ "$FLAC__EXHAUSTIVE_TESTS" = yes ] ; then + if [ "$FLAC__TEST_LEVEL" -gt 1 ] ; then test_file $binfile $channels $bps "-b 16384 -m -r 8 -l 32 -e -p $disable" fi done diff --git a/test/test_flac.sh b/test/test_flac.sh index fca6196960387fbc30da7f775d8a245ac161189b..dee8c6161e6c9e1e7888ae1bf631ac75fa74f39c 100755 --- a/test/test_flac.sh +++ b/test/test_flac.sh @@ -47,7 +47,7 @@ flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" run_flac () { - if [ x"$FLAC__VALGRIND" = xyes ] ; then + if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 flac $* 4>>test_flac.valgrind.log else flac $* @@ -56,7 +56,7 @@ run_flac () run_metaflac () { - if [ x"$FLAC__VALGRIND" = xyes ] ; then + if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 metaflac $* 4>>test_flac.valgrind.log else metaflac $* diff --git a/test/test_grabbag.sh b/test/test_grabbag.sh index c0ba85d88b2be34cf11ce636750ded5210583743..0edaf26f27e2b4a1643b2f53c095ad2f8780a350 100755 --- a/test/test_grabbag.sh +++ b/test/test_grabbag.sh @@ -41,7 +41,7 @@ test_cuesheet -h 1>/dev/null 2>/dev/null || die "ERROR can't find test_cuesheet run_test_cuesheet () { - if [ x"$FLAC__VALGRIND" = xyes ] ; then + 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 else test_cuesheet $* diff --git a/test/test_libFLAC++.sh b/test/test_libFLAC++.sh index ea0a2320b44fea5695b841bc37ef808dcbd5d3a3..0fbf9b7e7ce94da4987a2fbacf233486d17c1ec9 100755 --- a/test/test_libFLAC++.sh +++ b/test/test_libFLAC++.sh @@ -40,7 +40,7 @@ PATH=../obj/$BUILD/bin:$PATH run_test_libFLACpp () { - if [ x"$FLAC__VALGRIND" = xyes ] ; then + if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 test_libFLAC++ $* 4>>test_libFLAC++.valgrind.log else test_libFLAC++ $* diff --git a/test/test_libFLAC.sh b/test/test_libFLAC.sh index e40affc55936d0e5c2e2ccbb650e88a055784f53..23a60b684825f4ddff081f12c107265276c474ee 100755 --- a/test/test_libFLAC.sh +++ b/test/test_libFLAC.sh @@ -39,7 +39,7 @@ PATH=../obj/$BUILD/bin:$PATH run_test_libFLAC () { - if [ x"$FLAC__VALGRIND" = xyes ] ; then + if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 test_libFLAC $* 4>>test_libFLAC.valgrind.log else test_libFLAC $* diff --git a/test/test_libOggFLAC++.sh b/test/test_libOggFLAC++.sh index 16ca6e7116e53dfc6349f0c396798341580112ce..a3d8041c25704e46744860c36351f52d4935da4d 100755 --- a/test/test_libOggFLAC++.sh +++ b/test/test_libOggFLAC++.sh @@ -41,7 +41,7 @@ PATH=../obj/$BUILD/bin:$PATH run_test_libOggFLACpp () { - if [ x"$FLAC__VALGRIND" = xyes ] ; then + if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 test_libOggFLAC++ $* 4>>test_libOggFLAC++.valgrind.log else test_libOggFLAC++ $* diff --git a/test/test_libOggFLAC.sh b/test/test_libOggFLAC.sh index 32689ce261a1a27730619aeafa9d8ffce8dce583..c81fa872cd55fd67c8a22f9ed3652ef2ea50c36d 100755 --- a/test/test_libOggFLAC.sh +++ b/test/test_libOggFLAC.sh @@ -40,7 +40,7 @@ PATH=../obj/$BUILD/bin:$PATH run_test_libOggFLAC () { - if [ x"$FLAC__VALGRIND" = xyes ] ; then + if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 test_libOggFLAC $* 4>>test_libOggFLAC.valgrind.log else test_libOggFLAC $* diff --git a/test/test_metaflac.sh b/test/test_metaflac.sh index a0ba22b654dc8eda965d2ed4eea5f998cc7df712..1022ef3031d3297673b8f92bbdadff47412d8f14 100755 --- a/test/test_metaflac.sh +++ b/test/test_metaflac.sh @@ -49,7 +49,7 @@ 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 valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 flac $* 4>>test_metaflac.valgrind.log else flac $* @@ -58,7 +58,7 @@ run_flac () run_metaflac () { - if [ x"$FLAC__VALGRIND" = xyes ] ; then + if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 metaflac $* 4>>test_metaflac.valgrind.log else metaflac $* diff --git a/test/test_seeking.sh b/test/test_seeking.sh index 3b2db15a46d2b1a883e66175df5a122324253952..29c5ecebdac4821eeb008d0c35289d46ea04856f 100755 --- a/test/test_seeking.sh +++ b/test/test_seeking.sh @@ -44,7 +44,7 @@ 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 valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 flac $* 4>>test_seeking.valgrind.log else flac $* @@ -53,7 +53,7 @@ run_flac () run_metaflac () { - if [ x"$FLAC__VALGRIND" = xyes ] ; then + if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 metaflac $* 4>>test_seeking.valgrind.log else metaflac $* @@ -62,7 +62,7 @@ run_metaflac () run_test_seeking () { - if [ x"$FLAC__VALGRIND" = xyes ] ; then + if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 test_seeking $* 4>>test_seeking.valgrind.log else test_seeking $* diff --git a/test/test_streams.sh b/test/test_streams.sh index f27d8911d06d6d9358c7e557989196095fdeb293..96f2eb40bec7e6bde1e50b3a9a2c4a96f20ed7df 100755 --- a/test/test_streams.sh +++ b/test/test_streams.sh @@ -39,7 +39,7 @@ flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" run_flac () { - if [ x"$FLAC__VALGRIND" = xyes ] ; then + if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 flac $* 4>>test_streams.valgrind.log else flac $* @@ -131,7 +131,7 @@ test_file_piped () echo OK } -if [ "$FLAC__EXHAUSTIVE_TESTS" = yes ] ; then +if [ "$FLAC__TEST_LEVEL" -gt 1 ] ; then max_lpc_order=32 else max_lpc_order=16 @@ -212,44 +212,60 @@ test_file sine16-01 1 16 "-0 -l $max_lpc_order -m -e -p --lax --sample-rate=9000 echo "Testing option variations..." for f in 00 01 02 03 04 ; do for disable in '' '--disable-verbatim-subframes --disable-constant-subframes' '--disable-verbatim-subframes --disable-constant-subframes --disable-fixed-subframes' ; do - for opt in 0 1 2 4 5 6 8 ; do - for extras in '' '-p' '-e' ; do - test_file sine16-$f 1 16 "-$opt $extras $disable" + if [ -z "$disable" ] || [ "$FLAC__TEST_LEVEL" -gt 0 ] ; then + for opt in 0 1 2 4 5 6 8 ; do + for extras in '' '-p' '-e' ; do + if [ -z "$extras" ] || [ "$FLAC__TEST_LEVEL" -gt 0 ] ; then + test_file sine16-$f 1 16 "-$opt $extras $disable" + fi + done done - done - if [ "$FLAC__EXHAUSTIVE_TESTS" = yes ] ; then - test_file sine16-$f 1 16 "-b 16384 -m -r 8 -l $max_lpc_order -e -p $disable" + if [ "$FLAC__TEST_LEVEL" -gt 1 ] ; then + test_file sine16-$f 1 16 "-b 16384 -m -r 8 -l $max_lpc_order -e -p $disable" + fi fi done done for f in 10 11 12 13 14 15 16 17 18 19 ; do for disable in '' '--disable-verbatim-subframes --disable-constant-subframes' '--disable-verbatim-subframes --disable-constant-subframes --disable-fixed-subframes' ; do - for opt in 0 1 2 4 5 6 8 ; do - for extras in '' '-p' '-e' ; do - test_file sine16-$f 2 16 "-$opt $extras $disable" + if [ -z "$disable" ] || [ "$FLAC__TEST_LEVEL" -gt 0 ] ; then + for opt in 0 1 2 4 5 6 8 ; do + for extras in '' '-p' '-e' ; do + if [ -z "$extras" ] || [ "$FLAC__TEST_LEVEL" -gt 0 ] ; then + test_file sine16-$f 2 16 "-$opt $extras $disable" + fi + done done - done - if [ "$FLAC__EXHAUSTIVE_TESTS" = yes ] ; then - test_file sine16-$f 2 16 "-b 16384 -m -r 8 -l $max_lpc_order -e -p $disable" + if [ "$FLAC__TEST_LEVEL" -gt 1 ] ; then + test_file sine16-$f 2 16 "-b 16384 -m -r 8 -l $max_lpc_order -e -p $disable" + fi fi done done echo "Testing noise..." for disable in '' '--disable-verbatim-subframes --disable-constant-subframes' '--disable-verbatim-subframes --disable-constant-subframes --disable-fixed-subframes' ; do - for channels in 1 2 4 8 ; do - for bps in 8 16 24 ; do - for opt in 0 1 2 3 4 5 6 7 8 ; do - for extras in '' '-p' '-e' ; do - for blocksize in '' '--lax -b 32' '--lax -b 32768' '--lax -b 65535' ; do - test_file noise $channels $bps "-$opt $extras $blocksize $disable" + if [ -z "$disable" ] || [ "$FLAC__TEST_LEVEL" -gt 0 ] ; then + for channels in 1 2 4 8 ; do + if [ $channels -le 2 ] || [ "$FLAC__TEST_LEVEL" -gt 0 ] ; then + for bps in 8 16 24 ; do + for opt in 0 1 2 3 4 5 6 7 8 ; do + for extras in '' '-p' '-e' ; do + if [ -z "$extras" ] || [ "$FLAC__TEST_LEVEL" -gt 0 ] ; then + for blocksize in '' '--lax -b 32' '--lax -b 32768' '--lax -b 65535' ; do + if [ -z "$blocksize" ] || [ "$FLAC__TEST_LEVEL" -gt 0 ] ; then + test_file noise $channels $bps "-$opt $extras $blocksize $disable" + fi + done + fi + done done + if [ "$FLAC__TEST_LEVEL" -gt 1 ] ; then + test_file noise $channels $bps "-b 16384 -m -r 8 -l $max_lpc_order -e -p $disable" + fi done - done - if [ "$FLAC__EXHAUSTIVE_TESTS" = yes ] ; then - test_file noise $channels $bps "-b 16384 -m -r 8 -l $max_lpc_order -e -p $disable" fi done - done + fi done