Changeset 22e991b

Timestamp:

Nov 30, 2016, 7:05:43 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, sampler, yinfft+

Children:

a028a04

Parents:

e56ac16

Message:

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

Files:

• .travis.yml (modified) (1 diff)
• Makefile (modified) (2 diffs)

.travis.yml

@@ -87 +87 @@
 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
 

Makefile

@@ -35 +35 @@
 
 test_python: export LD_LIBRARY_PATH=$(PWD)/build/src
-test_python:
+test_python: local_dylib
         # clean
         -pip uninstall -v -y aubio
@@ -58 +58 @@
         # 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: