[beast: 14/17] AF-TESTS: move Bse audio feature tests here and add af-tests/Makefile.sub



commit 39429278f7d70a42ffcea7c8b612d61d53d059c6
Author: Tim Janik <timj gnu org>
Date:   Mon Oct 16 00:31:42 2017 +0200

    AF-TESTS: move Bse audio feature tests here and add af-tests/Makefile.sub
    
    Signed-off-by: Tim Janik <timj gnu org>

 Makefile.am                                        |    6 +
 af-tests/Makefile.sub                              |  229 ++++++++++++++++++++
 {tests/audio => af-tests}/README                   |   17 +-
 {tests/audio => af-tests}/adsr-wave-1-test.bse     |    0
 {tests/audio => af-tests}/adsr-wave-1-test.ref     |    0
 {tests/audio => af-tests}/adsr-wave-2-test.bse     |    0
 {tests/audio => af-tests}/adsr-wave-2-test.ref     |    0
 {tests/audio => af-tests}/adsrtest.bse             |    0
 {tests/audio => af-tests}/adsrtest.ref             |    0
 {tests/audio => af-tests}/artscompressor.bse       |    0
 {tests/audio => af-tests}/artscompressor.ref       |    0
 {tests/audio => af-tests}/balance.bse              |    0
 {tests/audio => af-tests}/balance.ref              |    0
 {tests/audio => af-tests}/bseadder.bse             |    0
 {tests/audio => af-tests}/bseadder.ref             |    0
 {tests/audio => af-tests}/freak-noise.bse          |    0
 {tests/audio => af-tests}/freak-noise.ref          |    0
 {tests/audio => af-tests}/frowzy-drums.bsewave     |  Bin 12435 -> 12435 bytes
 {tests/audio => af-tests}/minfluid.sf2             |  Bin 84512 -> 84512 bytes
 {tests/audio => af-tests}/minfluid.sf2.LICENSE     |    0
 {tests/audio => af-tests}/minisong.bse             |    0
 {tests/audio => af-tests}/minisong.ref             |    0
 {tests/audio => af-tests}/organsong.bse            |    0
 {tests/audio => af-tests}/organsong.ref            |    0
 {tests/audio => af-tests}/osc-test.bse             |    0
 {tests/audio => af-tests}/osc-test.ref             |    0
 {tests/audio => af-tests}/osctranspose1.bse        |    0
 {tests/audio => af-tests}/osctranspose1.ref        |    0
 {tests/audio => af-tests}/osctranspose2.bse        |    0
 {tests/audio => af-tests}/osctranspose2.ref        |    0
 {tests/audio => af-tests}/partymonster.ref         |    0
 {tests/audio => af-tests}/plain-wave-1-test.bse    |    0
 {tests/audio => af-tests}/plain-wave-1-test.ref    |    0
 {tests/audio => af-tests}/plain-wave-2-test.bse    |    0
 {tests/audio => af-tests}/plain-wave-2-test.ref    |    0
 {tests/audio => af-tests}/pseudo-saw.bsewave       |  Bin 568 -> 568 bytes
 .../audio => af-tests}/pseudo-square-env.bsewave   |  Bin 4754 -> 4754 bytes
 .../audio => af-tests}/pseudo-stereo-env.bsewave   |  Bin 6699 -> 6699 bytes
 {tests/audio => af-tests}/pseudo-stereo.bsewave    |  Bin 826 -> 826 bytes
 {tests/audio => af-tests}/simple-loop.bse          |    0
 {tests/audio => af-tests}/simple-loop.ref          |    0
 {tests/audio => af-tests}/soundfont-test.bse       |    0
 {tests/audio => af-tests}/soundfont-test.ref       |    0
 {tests/audio => af-tests}/sum-diff-test.bse        |    0
 {tests/audio => af-tests}/sum-diff-test.ref        |    0
 {tests/audio => af-tests}/syndrum.bse              |    0
 {tests/audio => af-tests}/syndrum.ref              |    0
 {tests/audio => af-tests}/velocity.bse             |    0
 {tests/audio => af-tests}/velocity.ref             |    0
 {tests/audio => af-tests}/xtalstringssong.bse      |    0
 {tests/audio => af-tests}/xtalstringssong.ref      |    0
 configure.ac                                       |    1 -
 tests/Makefile.am                                  |    2 +-
 tests/Makefile.sub                                 |    2 +-
 tests/audio/Makefile.am                            |  227 -------------------
 55 files changed, 245 insertions(+), 239 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 620f319..259495e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ SUBDIRS         = sfi bse plugins drivers pybeast beast-gtk launchers library tools ebe
 # == make setup ==
 DEFS                    += -DBSE_CONVENIENCE
 QTEST                    = @echo '  TEST    ' $@;
+QWAVCHECK                = @echo '  WAVCHECK' $@;
 AM_CPPFLAGS             += -I$(top_srcdir) -I$(top_builddir)
 lib_LTLIBRARIES          =
 bin_PROGRAMS             =
@@ -20,6 +21,8 @@ noinst_LTLIBRARIES     =
 # == project tools and paths ==
 SFIDL                    = $(top_builddir)/sfi/sfidl
 SFIDL_INC                = --nostdinc -I$(top_srcdir) -I$(top_builddir)
+BSEFEXTRACT             = $(top_builddir)/tools/bsefextract
+BSEFCOMPARE             = $(top_builddir)/tools/bsefcompare
 
 # == early rules ==
 # Ideally, all directories would provide a Makefile.sub and be included here
@@ -222,3 +225,6 @@ am__CONFIG_DISTCLEAN_FILES =        \
 
 # == tests/ ==
 include tests/Makefile.sub
+
+# == af-tests/ ==
+include af-tests/Makefile.sub
diff --git a/af-tests/Makefile.sub b/af-tests/Makefile.sub
new file mode 100644
index 0000000..deb71d6
--- /dev/null
+++ b/af-tests/Makefile.sub
@@ -0,0 +1,229 @@
+# BEAST af-tests/ - audio feature tests
+
+AF_TESTS_CLEANFILES =
+
+# == clean-tests ==
+clean-af-tests:
+       rm -f $(AF_TESTS_CLEANFILES) af-tests/*.$(OBJEXT)
+clean-local: clean-af-tests
+.PHONY: clean-af-tests
+
+# == check-af-tests ==
+check-af-tests:
+check-local: check-af-tests
+.PHONY: check-af-tests
+
+# == MACROS ==
+AF_TESTS_BSE2WAV = $(strip                                     \
+       $(topdir)/bse/bsetool                                   \
+         $(if $(findstring 1, $(V)),, --quiet)                 \
+         render2wav                                            \
+         --bse-mixing-freq=48000                               \
+         --bse-pcm-driver null=nosleep                         \
+         --bse-midi-driver null                                \
+         --bse-rcfile "/dev/null"                              \
+         --bse-override-plugin-globs 
'$(top_builddir)/plugins/.libs/*.so:$(top_builddir)/plugins/freeverb/.libs/*.so' \
+         --bse-override-sample-path '$(top_srcdir)/af-tests:$(top_srcdir)/library/samples' \
+         --bse-disable-randomization )
+
+# == af-tests/adsrtest ==
+af-tests/adsrtest: af-tests/adsrtest.bse af-tests/adsrtest.ref
+       $(QWAVCHECK)    # ADSR Test checks the mono channel envelope rendering
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy > $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/adsrtest
+
+# == af-tests/adsr-wave-1-test ==
+af-tests/adsr-wave-1-test: af-tests/adsr-wave-1-test.bse af-tests/adsr-wave-1-test.ref 
af-tests/pseudo-saw.bsewave
+       $(QWAVCHECK)    # test for play-type=adsr-wave-1
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy --end-time  
$@.tmp
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 1 --avg-spectrum --spectrum --avg-energy --end-time 
$@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/adsr-wave-1-test
+
+# == af-tests/adsr-wave-2-test ==
+af-tests/adsr-wave-2-test: af-tests/adsr-wave-2-test.bse af-tests/adsr-wave-2-test.ref 
af-tests/pseudo-stereo.bsewave
+       $(QWAVCHECK)    # test for play-type=adsr-wave-2
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy --end-time  
$@.tmp
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 1 --avg-spectrum --spectrum --avg-energy --end-time 
$@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/adsr-wave-2-test
+
+# == af-tests/artscompressor ==
+af-tests/artscompressor: af-tests/artscompressor.bse af-tests/artscompressor.ref
+       $(QWAVCHECK)    # test for ArtsCompressor
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy > $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+# FIXME: check-af-tests: af-tests/artscompressor
+
+# == af-tests/bseadder ==
+af-tests/bseadder: af-tests/bseadder.bse af-tests/bseadder.ref
+       $(QWAVCHECK)
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy > $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/bseadder
+
+# == af-tests/balance ==
+af-tests/balance: af-tests/balance.bse af-tests/balance.ref
+       $(QWAVCHECK)
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy  > $@.tmp
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 1 --avg-spectrum --spectrum --avg-energy >> $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/balance
+
+# == af-tests/freak-noise ==
+af-tests/freak-noise: af-tests/freak-noise.bse af-tests/freak-noise.ref
+       $(QWAVCHECK)    # simple loop
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav --seconds 5
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy  > $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/freak-noise
+
+# == af-tests/minisong ==
+af-tests/minisong: af-tests/minisong.bse af-tests/minisong.ref
+       $(QWAVCHECK)
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy  > $@.tmp
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 1 --avg-spectrum --spectrum --avg-energy >> $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 98.00
+       $(Q) rm -f $@.wav $@.tmp
+# FIXME: check-af-tests: af-tests/minisong
+
+# == af-tests/organsong ==
+af-tests/organsong: af-tests/organsong.bse af-tests/organsong.ref
+       $(QWAVCHECK)    # test DavOrgan mono voice module
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy > $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 98.00
+       $(Q) rm -f $@.wav $@.tmp
+# FIXME: check-af-tests: af-tests/organsong
+
+# == af-tests/osc-test ==
+af-tests/osc-test: af-tests/osc-test.bse af-tests/osc-test.ref
+       $(QWAVCHECK)    # a test for the oscillator
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav --seconds 5
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy > $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/osc-test
+
+# == af-tests/osctranspose1 ==
+af-tests/osctranspose1: af-tests/osctranspose1.bse af-tests/osctranspose1.ref
+       $(QWAVCHECK)    # checks that oscillator transposing works if the frequency is constant
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy > $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/osctranspose1
+
+# == af-tests/osctranspose2 ==
+af-tests/osctranspose2: af-tests/osctranspose2.bse af-tests/osctranspose2.ref
+       $(QWAVCHECK)    # checks that oscillator transposing works if the frequency is a signal
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy > $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/osctranspose2
+
+
+# == af-tests/partymonster ==
+af-tests/partymonster: $(topdir)/library/demo/partymonster.bse af-tests/partymonster.ref
+       $(QWAVCHECK)    # Beast demo song
+       $(Q) $(AF_TESTS_BSE2WAV) $(topdir)/library/demo/partymonster.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum 
--join-spectrum-slices=10 --avg-energy --end-time  > $@.tmp
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 1 --avg-spectrum --spectrum 
--join-spectrum-slices=10 --avg-energy --end-time >> $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+slowcheck: af-tests/partymonster
+# FIXME: takes too long: check-af-tests: af-tests/partymonster
+
+# == af-tests/plain-wave-1-test ==
+af-tests/plain-wave-1-test: af-tests/plain-wave-1-test.bse af-tests/plain-wave-1-test.ref 
af-tests/pseudo-square-env.bsewave
+       $(QWAVCHECK)    # test for play-type=plain-wave-1
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy --end-time  
$@.tmp
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 1 --avg-spectrum --spectrum --avg-energy --end-time 
$@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/plain-wave-1-test
+
+# == af-tests/plain-wave-2-test ==
+af-tests/plain-wave-2-test: af-tests/plain-wave-2-test.bse af-tests/plain-wave-2-test.ref 
af-tests/pseudo-stereo-env.bsewave
+       $(QWAVCHECK)    # test for play-type=plain-wave-2
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy --end-time  
$@.tmp
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 1 --avg-spectrum --spectrum --avg-energy --end-time 
$@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/plain-wave-2-test
+
+# == af-tests/simple-loop ==
+af-tests/simple-loop: af-tests/simple-loop.bse af-tests/simple-loop.ref
+       $(QWAVCHECK)    # another simple loop
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav --seconds 5
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy  > $@.tmp
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 1 --avg-spectrum --spectrum --avg-energy >> $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+# FIXME: check-af-tests: af-tests/simple-loop
+
+# == af-tests/soundfont-test ==
+af-tests/soundfont-test: af-tests/soundfont-test.bse af-tests/soundfont-test.ref af-tests/minfluid.sf2 
af-tests/minfluid.sf2.LICENSE
+       $(QWAVCHECK)    # test for soundfont loading & rendering
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy --end-time  
$@.tmp
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 1 --avg-spectrum --spectrum --avg-energy --end-time 
$@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/soundfont-test
+
+# == af-tests/sum-diff-test ==
+af-tests/sum-diff-test: af-tests/sum-diff-test.bse af-tests/sum-diff-test.ref
+       $(QWAVCHECK)
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav --seconds 25
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy > $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/sum-diff-test
+
+# == af-tests/syndrum ==
+af-tests/syndrum: af-tests/syndrum.bse af-tests/syndrum.ref
+       $(QWAVCHECK)
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy  > $@.tmp
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 1 --avg-spectrum --spectrum --avg-energy >> $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 91.00
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/syndrum
+
+# == af-tests/velocity ==
+af-tests/velocity: af-tests/velocity.bse af-tests/velocity.ref
+       $(QWAVCHECK)
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy  > $@.tmp
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 1 --avg-spectrum --spectrum --avg-energy >> $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.99
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/velocity
+
+# == af-tests/xtalstringssong ==
+af-tests/xtalstringssong: af-tests/xtalstringssong.bse af-tests/xtalstringssong.ref
+       $(QWAVCHECK)
+       $(Q) $(AF_TESTS_BSE2WAV) $@.bse $@.wav
+       $(Q) $(BSEFEXTRACT) $@.wav --cut-zeros --channel 0 --avg-spectrum --spectrum --avg-energy  > $@.tmp
+       $(Q) $(BSEFCOMPARE) $@.ref $@.tmp --threshold 99.90
+       $(Q) rm -f $@.wav $@.tmp
+check-af-tests: af-tests/xtalstringssong
diff --git a/tests/audio/README b/af-tests/README
similarity index 89%
rename from tests/audio/README
rename to af-tests/README
index 90cf2db..0f0fc44 100644
--- a/tests/audio/README
+++ b/af-tests/README
@@ -13,7 +13,7 @@ which features are supported, call bsefextract --help.
 To run the currently available tests, there is a Makefile rule, so you can
 type:
 
-   make test
+   make check-af-tests
 
 Adding a new test
 =================
@@ -25,25 +25,24 @@ steps:
    ensure that the bse file terminates after some time (using the song
    sequencer is a good way to ensure this)
 
-   save foo.bse in this directory (add it to the CVS)
+   save foo.bse in this directory (add it to the repository)
 
-2) add a new target to Makefile.am (look at the other tests to see how its done)
+2) add a new target to Makefile.sub (look at the other tests to see how its done)
 
-3) add the target to the FEATURE_TESTS line in Makefile.am
+3) add the target to the check-af-tests rule
 
-4) run make foo-test once, the test will fail, but you will generate a foo.tmp
+4) run make af-tests/foo once, the test will fail, but you will generate a foo.tmp
    file, which you can move to the reference file using
 
      mv foo.tmp foo.ref
 
-   you need to add add the created foo.reference to CVS
+   you need to add the created reference file to the repository
 
-6) run make test, the newly added test should be executed and succeed now
+6) run make check-af-tests, the newly added test should be executed and succeed now
 
 Note, that if you need multiple tests for the same .bse file (for instance
 because you want to set a different threshold for different features), you can
-do so by adding multiple targets foo1-test, foo2-test,... using difference
-reference file names for the tests, like foo1.ref, foo2.ref,...
+do so by adding multiple test rules using different reference file names for the tests.
 
 
 Good features to use:
diff --git a/tests/audio/adsr-wave-1-test.bse b/af-tests/adsr-wave-1-test.bse
similarity index 100%
rename from tests/audio/adsr-wave-1-test.bse
rename to af-tests/adsr-wave-1-test.bse
diff --git a/tests/audio/adsr-wave-1-test.ref b/af-tests/adsr-wave-1-test.ref
similarity index 100%
rename from tests/audio/adsr-wave-1-test.ref
rename to af-tests/adsr-wave-1-test.ref
diff --git a/tests/audio/adsr-wave-2-test.bse b/af-tests/adsr-wave-2-test.bse
similarity index 100%
rename from tests/audio/adsr-wave-2-test.bse
rename to af-tests/adsr-wave-2-test.bse
diff --git a/tests/audio/adsr-wave-2-test.ref b/af-tests/adsr-wave-2-test.ref
similarity index 100%
rename from tests/audio/adsr-wave-2-test.ref
rename to af-tests/adsr-wave-2-test.ref
diff --git a/tests/audio/adsrtest.bse b/af-tests/adsrtest.bse
similarity index 100%
rename from tests/audio/adsrtest.bse
rename to af-tests/adsrtest.bse
diff --git a/tests/audio/adsrtest.ref b/af-tests/adsrtest.ref
similarity index 100%
rename from tests/audio/adsrtest.ref
rename to af-tests/adsrtest.ref
diff --git a/tests/audio/artscompressor.bse b/af-tests/artscompressor.bse
similarity index 100%
rename from tests/audio/artscompressor.bse
rename to af-tests/artscompressor.bse
diff --git a/tests/audio/artscompressor.ref b/af-tests/artscompressor.ref
similarity index 100%
rename from tests/audio/artscompressor.ref
rename to af-tests/artscompressor.ref
diff --git a/tests/audio/balance.bse b/af-tests/balance.bse
similarity index 100%
rename from tests/audio/balance.bse
rename to af-tests/balance.bse
diff --git a/tests/audio/balance.ref b/af-tests/balance.ref
similarity index 100%
rename from tests/audio/balance.ref
rename to af-tests/balance.ref
diff --git a/tests/audio/bseadder.bse b/af-tests/bseadder.bse
similarity index 100%
rename from tests/audio/bseadder.bse
rename to af-tests/bseadder.bse
diff --git a/tests/audio/bseadder.ref b/af-tests/bseadder.ref
similarity index 100%
rename from tests/audio/bseadder.ref
rename to af-tests/bseadder.ref
diff --git a/tests/audio/freak-noise.bse b/af-tests/freak-noise.bse
similarity index 100%
rename from tests/audio/freak-noise.bse
rename to af-tests/freak-noise.bse
diff --git a/tests/audio/freak-noise.ref b/af-tests/freak-noise.ref
similarity index 100%
rename from tests/audio/freak-noise.ref
rename to af-tests/freak-noise.ref
diff --git a/tests/audio/minfluid.sf2.LICENSE b/af-tests/minfluid.sf2.LICENSE
similarity index 100%
rename from tests/audio/minfluid.sf2.LICENSE
rename to af-tests/minfluid.sf2.LICENSE
diff --git a/tests/audio/minisong.bse b/af-tests/minisong.bse
similarity index 100%
rename from tests/audio/minisong.bse
rename to af-tests/minisong.bse
diff --git a/tests/audio/minisong.ref b/af-tests/minisong.ref
similarity index 100%
rename from tests/audio/minisong.ref
rename to af-tests/minisong.ref
diff --git a/tests/audio/organsong.bse b/af-tests/organsong.bse
similarity index 100%
rename from tests/audio/organsong.bse
rename to af-tests/organsong.bse
diff --git a/tests/audio/organsong.ref b/af-tests/organsong.ref
similarity index 100%
rename from tests/audio/organsong.ref
rename to af-tests/organsong.ref
diff --git a/tests/audio/osc-test.bse b/af-tests/osc-test.bse
similarity index 100%
rename from tests/audio/osc-test.bse
rename to af-tests/osc-test.bse
diff --git a/tests/audio/osc-test.ref b/af-tests/osc-test.ref
similarity index 100%
rename from tests/audio/osc-test.ref
rename to af-tests/osc-test.ref
diff --git a/tests/audio/osctranspose1.bse b/af-tests/osctranspose1.bse
similarity index 100%
rename from tests/audio/osctranspose1.bse
rename to af-tests/osctranspose1.bse
diff --git a/tests/audio/osctranspose1.ref b/af-tests/osctranspose1.ref
similarity index 100%
rename from tests/audio/osctranspose1.ref
rename to af-tests/osctranspose1.ref
diff --git a/tests/audio/osctranspose2.bse b/af-tests/osctranspose2.bse
similarity index 100%
rename from tests/audio/osctranspose2.bse
rename to af-tests/osctranspose2.bse
diff --git a/tests/audio/osctranspose2.ref b/af-tests/osctranspose2.ref
similarity index 100%
rename from tests/audio/osctranspose2.ref
rename to af-tests/osctranspose2.ref
diff --git a/tests/audio/partymonster.ref b/af-tests/partymonster.ref
similarity index 100%
rename from tests/audio/partymonster.ref
rename to af-tests/partymonster.ref
diff --git a/tests/audio/plain-wave-1-test.bse b/af-tests/plain-wave-1-test.bse
similarity index 100%
rename from tests/audio/plain-wave-1-test.bse
rename to af-tests/plain-wave-1-test.bse
diff --git a/tests/audio/plain-wave-1-test.ref b/af-tests/plain-wave-1-test.ref
similarity index 100%
rename from tests/audio/plain-wave-1-test.ref
rename to af-tests/plain-wave-1-test.ref
diff --git a/tests/audio/plain-wave-2-test.bse b/af-tests/plain-wave-2-test.bse
similarity index 100%
rename from tests/audio/plain-wave-2-test.bse
rename to af-tests/plain-wave-2-test.bse
diff --git a/tests/audio/plain-wave-2-test.ref b/af-tests/plain-wave-2-test.ref
similarity index 100%
rename from tests/audio/plain-wave-2-test.ref
rename to af-tests/plain-wave-2-test.ref
diff --git a/tests/audio/simple-loop.bse b/af-tests/simple-loop.bse
similarity index 100%
rename from tests/audio/simple-loop.bse
rename to af-tests/simple-loop.bse
diff --git a/tests/audio/simple-loop.ref b/af-tests/simple-loop.ref
similarity index 100%
rename from tests/audio/simple-loop.ref
rename to af-tests/simple-loop.ref
diff --git a/tests/audio/soundfont-test.bse b/af-tests/soundfont-test.bse
similarity index 100%
rename from tests/audio/soundfont-test.bse
rename to af-tests/soundfont-test.bse
diff --git a/tests/audio/soundfont-test.ref b/af-tests/soundfont-test.ref
similarity index 100%
rename from tests/audio/soundfont-test.ref
rename to af-tests/soundfont-test.ref
diff --git a/tests/audio/sum-diff-test.bse b/af-tests/sum-diff-test.bse
similarity index 100%
rename from tests/audio/sum-diff-test.bse
rename to af-tests/sum-diff-test.bse
diff --git a/tests/audio/sum-diff-test.ref b/af-tests/sum-diff-test.ref
similarity index 100%
rename from tests/audio/sum-diff-test.ref
rename to af-tests/sum-diff-test.ref
diff --git a/tests/audio/syndrum.bse b/af-tests/syndrum.bse
similarity index 100%
rename from tests/audio/syndrum.bse
rename to af-tests/syndrum.bse
diff --git a/tests/audio/syndrum.ref b/af-tests/syndrum.ref
similarity index 100%
rename from tests/audio/syndrum.ref
rename to af-tests/syndrum.ref
diff --git a/tests/audio/velocity.bse b/af-tests/velocity.bse
similarity index 100%
rename from tests/audio/velocity.bse
rename to af-tests/velocity.bse
diff --git a/tests/audio/velocity.ref b/af-tests/velocity.ref
similarity index 100%
rename from tests/audio/velocity.ref
rename to af-tests/velocity.ref
diff --git a/tests/audio/xtalstringssong.bse b/af-tests/xtalstringssong.bse
similarity index 100%
rename from tests/audio/xtalstringssong.bse
rename to af-tests/xtalstringssong.bse
diff --git a/tests/audio/xtalstringssong.ref b/af-tests/xtalstringssong.ref
similarity index 100%
rename from tests/audio/xtalstringssong.ref
rename to af-tests/xtalstringssong.ref
diff --git a/configure.ac b/configure.ac
index 959c402..496c48a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -761,7 +761,6 @@ tools/Makefile
 tools/scripts/Makefile
 po/Makefile
 tests/Makefile
-tests/audio/Makefile
 docs/Makefile
 docs/images/Makefile
 ])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 66fb1ca..d36489a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
 # BEAST & BSE
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = . audio
+SUBDIRS = .
diff --git a/tests/Makefile.sub b/tests/Makefile.sub
index 0d9378f..034de8e 100644
--- a/tests/Makefile.sub
+++ b/tests/Makefile.sub
@@ -198,7 +198,7 @@ TESTS_BSEFILE_CHECK_LOAD = $(strip                          \
          check-load                                            \
          --bse-pcm-driver null=nosleep                         \
          --bse-midi-driver null                                \
-         --bse-override-sample-path '$(top_srcdir)/tests/audio:$(top_srcdir)/library/samples' \
+         --bse-override-sample-path '$(top_srcdir)/af-tests:$(top_srcdir)/library/samples' \
          --bse-override-plugin-globs 
'$(top_builddir)/plugins/.libs/*.so:$(top_builddir)/plugins/freeverb/.libs/*.so' \
          --bse-rcfile "/dev/null" )
 tests/bsefile-checklist-%-test: tests/bsefile-checklist


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]