From: Paul Brossier <piem@piem.org>
Date: Wed, 30 Nov 2016 18:05:43 +0000 (+0100)
Subject: Makefile, .travis.yml: merge test_python and test_python_osx rules
X-Git-Tag: 0.4.4~116
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=22e991bc47628c455d07c37b9bb6534ba1362b18;p=aubio.git

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

diff --git a/.travis.yml b/.travis.yml
index 534aaafb..e3b6f77a 100644
--- 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 bd0bf208..62cf0afe 100644
--- 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