Makefile: pass options to waf distcheck

[aubio.git] / Makefile

diff --git a/Makefile b/Makefile
index 57d9060..939c7c1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ WAFCMD=python waf
 SOX=sox
 
 ENABLE_DOUBLE := $(shell [ -z $(HAVE_DOUBLE) ] || echo --enable-double )
-TESTSOUNDS := "python/tests/sounds"
+TESTSOUNDS := python/tests/sounds
 
 all: build
 
@@ -32,13 +32,13 @@ build_python:
 
 test_python:
        cd python && pip install -v .
-       LD_LIBRARY_PATH=$(PWD)/build/src python/tests/run_all_tests --verbose
+       cd python && LD_LIBRARY_PATH=$(PWD)/build/src nose2 --verbose
        cd python && pip uninstall -y -v aubio
 
 test_python_osx:
        cd python && pip install --user -v .
        [ -f build/src/libaubio.[0-9].dylib ] && ( mkdir -p ~/lib && cp -prv build/src/libaubio.4.dylib ~/lib ) || true
-       ./python/tests/run_all_tests --verbose
+       cd python && nose2 --verbose
        cd python && pip uninstall -y -v aubio
 
 clean_python:
@@ -54,16 +54,16 @@ clean:
        $(WAFCMD) clean
 
 distcheck: checkwaf
-       $(WAFCMD) distcheck
+       $(WAFCMD) distcheck $(WAFOPTS) $(ENABLE_DOUBLE)
 
 help:
        $(WAFCMD) --help
 
 create_test_sounds:
-       [ -z `which $(SOX)` ] && ( echo $(SOX) could not be found; false ) || true
-       $(MKDIR) -p $(TESTSOUNDS)
-       $(SOX) -r 44100 -n $(TESTSOUNDS)/44100Hz_1f_silence.wav synth 1s silence 0
-       $(SOX) -r  8000 -n $(TESTSOUNDS)/8000Hz_30s_silence.wav synth 30 silence 0
-       $(SOX) -r 32000 -n $(TESTSOUNDS)/32000Hz_127f_sine440.wav synth 127 sine 440
-       $(SOX) -r 22050 -n $(TESTSOUNDS)/22050Hz_5s_brownnoise.wav synth 5 brownnoise
-       $(SOX) -r 48000 -n $(TESTSOUNDS)/48000Hz_60s_sweep.wav synth 60 sine 200-24000
+       -[ -z `which $(SOX)` ] && ( echo $(SOX) could not be found) || true
+       -mkdir -p $(TESTSOUNDS)
+       -$(SOX) -r 44100 -b 16 -n "$(TESTSOUNDS)/44100Hz_1f_silence.wav"      synth 1s   silence 0
+       -$(SOX) -r 22050 -b 16 -n "$(TESTSOUNDS)/22050Hz_5s_brownnoise.wav"   synth 5    brownnoise      vol 0.9
+       -$(SOX) -r 32000 -b 16 -n "$(TESTSOUNDS)/32000Hz_127f_sine440.wav"    synth 127s sine 440        vol 0.9
+       -$(SOX) -r  8000 -b 16 -n "$(TESTSOUNDS)/8000Hz_30s_silence.wav"      synth 30   silence 0       vol 0.9
+       -$(SOX) -r 48000 -b 32 -n "$(TESTSOUNDS)/48000Hz_60s_sweep.wav"       synth 60   sine 100-20000  vol 0.9