tests/: move file around to match src/

diff --git a/tests/python/src/onset/peakpick.py b/tests/python/src/onset/peakpicker.py
similarity index 100%
rename from tests/python/src/onset/peakpick.py
rename to tests/python/src/onset/peakpicker.py

diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index ad98446e3721e1063ab697abf89a77b15916d17e..9c143af7c3b75ae79ae788a5d45bc1e6c94f03f9 100644 (file)
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -1,37 +1,42 @@
 AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/examples
 AM_LDFLAGS = -L$(top_builddir)/src -laubio @FFTWLIB_LIBS@
 
-test_phasevoc_jack_CFLAGS = $(AM_CFLAGS) @JACK_CFLAGS@
-test_phasevoc_jack_LDADD  = $(AM_LDFLAGS) @JACK_LIBS@ 
+spectral_test_phasevoc_jack_CFLAGS = $(AM_CFLAGS) @JACK_CFLAGS@
+spectral_test_phasevoc_jack_LDADD  = $(AM_LDFLAGS) @JACK_LIBS@ 
 
-bin_PROGRAMS = \
-       test-hist \
-       test-scale \
-       test-cvec \
-       test-fvec \
-       test-window \
-       test-filter \
-       test-biquad \
-       test-resample \
-       test-peakpick \
-       test-phasevoc \
-       test-filterbank \
-       test-filterbank_mel \
-       test-mfcc \
-       test-phasevoc-jack \
-       test-onsetdetection \
-       test-pitchyin \
-       test-pitchyinfft \
-       test-pitchschmitt \
-       test-pitchfcomb \
-       test-pitchmcomb \
-       test-pitch \
-       test-onset \
-       test-mathutils \
-       test-tss
+noinst_PROGRAMS = \
+  test-fvec \
+  test-cvec \
+  test-mathutils \
+  test-mathutils-window \
+  pitch/test-pitchyin \
+  pitch/test-pitchyinfft \
+  pitch/test-pitch \
+  pitch/test-pitchmcomb \
+  pitch/test-pitchfcomb \
+  pitch/test-pitchschmitt \
+  temporal/test-cweighting \
+  temporal/test-resampler \
+  temporal/test-filter \
+  temporal/test-biquad \
+  temporal/test-aweighting \
+  onset/test-peakpicker \
+  onset/test-onset \
+  tempo/test-tempo \
+  tempo/test-beattracking \
+  spectral/test-fft \
+  spectral/test-specdesc \
+  spectral/test-phasevoc \
+  spectral/test-phasevoc-jack \
+  spectral/test-tss \
+  spectral/test-filterbank \
+  spectral/test-filterbank_mel \
+  spectral/test-mfcc \
+  utils/test-scale \
+  utils/test-hist
 
-run-tests: $(bin_PROGRAMS)
-       @for i in $(bin_PROGRAMS); do echo -n $$i\ ; ./$$i > /dev/null && echo OK || echo FAILED: $$?; done
+run-tests: $(noinst_PROGRAMS)
+       @for i in $(noinst_PROGRAMS); do echo -n $$i\ ; ./$$i > /dev/null && echo OK || echo FAILED: $$?; done
 
-run-valgrind-tests: $(bin_PROGRAMS)
-       @for i in $(bin_PROGRAMS); do echo $$i; valgrind .libs/lt-$$i 2>&1 | grep ERROR\ SUMMARY -A4; echo $$?; done
+run-valgrind-tests: $(noinst_PROGRAMS)
+       @for i in $(noinst_PROGRAMS); do echo $$i; valgrind .libs/lt-$$i 2>&1 | grep ERROR\ SUMMARY -A4; echo $$?; done

diff --git a/tests/src/test-onset.c b/tests/src/onset/test-onset.c
similarity index 100%
rename from tests/src/test-onset.c
rename to tests/src/onset/test-onset.c

diff --git a/tests/src/test-peakpick.c b/tests/src/onset/test-peakpicker.c
similarity index 100%
rename from tests/src/test-peakpick.c
rename to tests/src/onset/test-peakpicker.c

diff --git a/tests/src/test-pitchdetection.c b/tests/src/pitch/test-pitch.c
similarity index 100%
rename from tests/src/test-pitchdetection.c
rename to tests/src/pitch/test-pitch.c

diff --git a/tests/src/test-pitchfcomb.c b/tests/src/pitch/test-pitchfcomb.c
similarity index 100%
rename from tests/src/test-pitchfcomb.c
rename to tests/src/pitch/test-pitchfcomb.c

diff --git a/tests/src/test-pitchmcomb.c b/tests/src/pitch/test-pitchmcomb.c
similarity index 100%
rename from tests/src/test-pitchmcomb.c
rename to tests/src/pitch/test-pitchmcomb.c

diff --git a/tests/src/test-pitchschmitt.c b/tests/src/pitch/test-pitchschmitt.c
similarity index 100%
rename from tests/src/test-pitchschmitt.c
rename to tests/src/pitch/test-pitchschmitt.c

diff --git a/tests/src/test-pitchyin.c b/tests/src/pitch/test-pitchyin.c
similarity index 100%
rename from tests/src/test-pitchyin.c
rename to tests/src/pitch/test-pitchyin.c

diff --git a/tests/src/test-pitchyinfft.c b/tests/src/pitch/test-pitchyinfft.c
similarity index 100%
rename from tests/src/test-pitchyinfft.c
rename to tests/src/pitch/test-pitchyinfft.c

diff --git a/tests/src/test-filterbank.c b/tests/src/spectral/test-filterbank.c
similarity index 100%
rename from tests/src/test-filterbank.c
rename to tests/src/spectral/test-filterbank.c

diff --git a/tests/src/test-filterbank_mel.c b/tests/src/spectral/test-filterbank_mel.c
similarity index 100%
rename from tests/src/test-filterbank_mel.c
rename to tests/src/spectral/test-filterbank_mel.c

diff --git a/tests/src/test-mfcc.c b/tests/src/spectral/test-mfcc.c
similarity index 100%
rename from tests/src/test-mfcc.c
rename to tests/src/spectral/test-mfcc.c

diff --git a/tests/src/test-phasevoc-jack.c b/tests/src/spectral/test-phasevoc-jack.c
similarity index 100%
rename from tests/src/test-phasevoc-jack.c
rename to tests/src/spectral/test-phasevoc-jack.c

diff --git a/tests/src/test-phasevoc.c b/tests/src/spectral/test-phasevoc.c
similarity index 100%
rename from tests/src/test-phasevoc.c
rename to tests/src/spectral/test-phasevoc.c

diff --git a/tests/src/test-onsetdetection.c b/tests/src/spectral/test-specdesc.c
similarity index 100%
rename from tests/src/test-onsetdetection.c
rename to tests/src/spectral/test-specdesc.c

diff --git a/tests/src/test-tss.c b/tests/src/spectral/test-tss.c
similarity index 100%
rename from tests/src/test-tss.c
rename to tests/src/spectral/test-tss.c

diff --git a/tests/src/temporal/test-aweighting.c b/tests/src/temporal/test-a_weighting.c
similarity index 100%
rename from tests/src/temporal/test-aweighting.c
rename to tests/src/temporal/test-a_weighting.c

diff --git a/tests/src/test-biquad.c b/tests/src/temporal/test-biquad.c
similarity index 100%
rename from tests/src/test-biquad.c
rename to tests/src/temporal/test-biquad.c

diff --git a/tests/src/temporal/test-cweighting.c b/tests/src/temporal/test-c_weighting.c
similarity index 100%
rename from tests/src/temporal/test-cweighting.c
rename to tests/src/temporal/test-c_weighting.c

diff --git a/tests/src/test-filter.c b/tests/src/temporal/test-filter.c
similarity index 100%
rename from tests/src/test-filter.c
rename to tests/src/temporal/test-filter.c

diff --git a/tests/src/test-resample.c b/tests/src/temporal/test-resampler.c
similarity index 100%
rename from tests/src/test-resample.c
rename to tests/src/temporal/test-resampler.c

diff --git a/tests/src/test-window.c b/tests/src/test-mathutils-window.c
similarity index 100%
rename from tests/src/test-window.c
rename to tests/src/test-mathutils-window.c

diff --git a/tests/src/test-pitch.c b/tests/src/test-pitch.c
deleted file mode 100644 (file)
index e4e209e..0000000
--- a/tests/src/test-pitch.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <aubio.h>
-
-int main(){
-        /* allocate some memory */
-        uint_t win_s      = 1024; /* window size */
-        fvec_t * in       = new_fvec (win_s); /* input buffer */
-        fvec_t * out      = new_fvec (1); /* input buffer */
-        aubio_pitch_t *p = new_aubio_pitch ("default", win_s, win_s / 2, 44100);
-        uint_t i = 0;
-
-        while (i < 10) {
-          aubio_pitch_do (p, in, out);
-          i++;
-        };
-
-        del_fvec(in);
-        del_fvec(out);
-        aubio_cleanup();
-
-        return 0;
-}
-

diff --git a/tests/src/test-hist.c b/tests/src/utils/test-hist.c
similarity index 100%
rename from tests/src/test-hist.c
rename to tests/src/utils/test-hist.c

diff --git a/tests/src/test-scale.c b/tests/src/utils/test-scale.c
similarity index 100%
rename from tests/src/test-scale.c
rename to tests/src/utils/test-scale.c