shithub: aubio

Info  •  Files  •  Log  •  Branches

Merge branch 'develop' of aubio.org:/git/aubio/aubio into develop

--- a/python/build_linux

+++ b/python/build_linux

@@ -4,6 +4,6 @@

 set -x

 python setup.py clean build

-export PYTHONPATH=./build/lib.linux-x86_64-2.7/

-export LD_LIBRARY_PATH=../../build/src/

+export PYTHONPATH=./build/lib.linux-x86_64-2.7/:./tests

+export LD_LIBRARY_PATH=../build/src/

 ./run_all_tests --verbose

--- a/python/run_all_tests

+++ b/python/run_all_tests

@@ -6,7 +6,7 @@

     # get relevant files

     curdir = os.path.dirname(sys.argv[0])

     if curdir == '': curdir = '.'

-    files = os.listdir(curdir)

+    files = os.listdir(os.path.join(curdir, 'tests'))

     modfiles = filter (lambda y: y.endswith('.py'), files) 

     modfiles = filter (lambda f: f.startswith('test_'), modfiles)

     # get module names

--- a/wscript

+++ b/wscript

@@ -197,8 +197,7 @@

   # add sub directories

   bld.recurse('src examples')

   from waflib import Options

-  import sys

-  if Options.platform == sys.platform: bld.recurse('tests')

+  if Options.platform != 'ios': bld.recurse('tests')

   """

   # create the aubio.pc file for pkg-config