Makefile, .travis.yml: merge test_python and test_python_osx rules

diff --git a/.travis.yml b/.travis.yml
index 534aaaf..e3b6f77 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,13 +86,7 @@ install:
 
 script:
   - make create_test_sounds
-  - make build
-  - make build_python
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make test_python; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make test_python_osx; fi
-  - make clean_python
-  - make clean
-  - make distcheck
+  - make test_python
   - make test_pure_python
 
 notifications:

diff --git a/Makefile b/Makefile
index bd0bf20..62cf0af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ build_python:
        python ./setup.py build_ext $(ENABLE_DOUBLE)
 
 test_python: export LD_LIBRARY_PATH=$(PWD)/build/src
-test_python:
+test_python: local_dylib
        # clean
        -pip uninstall -v -y aubio
        ./setup.py clean
@@ -58,8 +58,6 @@ local_dylib:
        # create links from ~/lib/lib* to build/src/lib*
        [ -f build/src/libaubio.[0-9].dylib ] && ( mkdir -p ~/lib && cp -prv build/src/libaubio.[0-9].dylib ~/lib ) || true
 
-test_python_osx: local_dylib test_python
-
 clean_python:
        ./setup.py clean