mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-27 21:26:36 +00:00
package/aubio: disable unit tests with --notests
For each build step, --notests needs to be passed to waf script to avoid runing the unit tests. This allow to remove the patch removing the unit tests from wscript. Signed-off-by: Romain Naour <romain.naour@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
2618115c20
commit
3f16f40dfe
@ -1,63 +0,0 @@
|
|||||||
From c71d72262568907ae8c3b988d42e575a8bd3a207 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Romain Naour <romain.naour@gmail.com>
|
|
||||||
Date: Sat, 29 Oct 2016 20:14:02 +0200
|
|
||||||
Subject: [PATCH] remove unit test
|
|
||||||
|
|
||||||
Unit tests fail to build on some system.
|
|
||||||
|
|
||||||
Waf: Entering directory `output/build/aubio-0.4.3/build'
|
|
||||||
[170/217] Processing build/tests/test-sink
|
|
||||||
[170/217] Processing build/tests/test-sink_apple_audio-multi
|
|
||||||
[172/217] Processing build/tests/test-sink_sndfile-multi
|
|
||||||
[172/217] Processing build/tests/test-source_apple_audio
|
|
||||||
[174/217] Processing build/tests/test-source_avcodec
|
|
||||||
[174/217] Processing build/tests/test-source_multi
|
|
||||||
[174/217] Processing build/tests/test-source_seek
|
|
||||||
[176/217] Processing build/tests/test-source_sndfile
|
|
||||||
Waf: Leaving directory `output/build/aubio-0.4.3/build'
|
|
||||||
Build failed
|
|
||||||
Traceback (most recent call last):
|
|
||||||
File "output/build/aubio-0.4.3/waflib/Task.py", line 110, in process
|
|
||||||
ret=self.run()
|
|
||||||
File "output/build/aubio-0.4.3/waflib/Tools/waf_unit_test.py", line 66, in run
|
|
||||||
proc=Utils.subprocess.Popen(self.ut_exec,cwd=cwd,env=self.get_test_env(),stderr=Utils.subprocess.PIPE,stdout=Utils.subprocess.PIPE)
|
|
||||||
File "/usr/lib64/python2.7/subprocess.py", line 710, in __init__
|
|
||||||
errread, errwrite)
|
|
||||||
File "/usr/lib64/python2.7/subprocess.py", line 1335, in _execute_child
|
|
||||||
raise child_exception
|
|
||||||
OSError: [Errno 2] No such file or directory
|
|
||||||
|
|
||||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
||||||
---
|
|
||||||
wscript | 3 ---
|
|
||||||
1 file changed, 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/wscript b/wscript
|
|
||||||
index c665ff5..c8fae6c 100644
|
|
||||||
--- a/wscript
|
|
||||||
+++ b/wscript
|
|
||||||
@@ -95,13 +95,11 @@ def options(ctx):
|
|
||||||
help='set target platform for cross-compilation', dest='target_platform')
|
|
||||||
|
|
||||||
ctx.load('compiler_c')
|
|
||||||
- ctx.load('waf_unit_test')
|
|
||||||
ctx.load('gnu_dirs')
|
|
||||||
|
|
||||||
def configure(ctx):
|
|
||||||
from waflib import Options
|
|
||||||
ctx.load('compiler_c')
|
|
||||||
- ctx.load('waf_unit_test')
|
|
||||||
ctx.load('gnu_dirs')
|
|
||||||
|
|
||||||
# check for common headers
|
|
||||||
@@ -334,7 +332,6 @@ def build(bld):
|
|
||||||
bld.recurse('src')
|
|
||||||
if bld.env['DEST_OS'] not in ['ios', 'iosimulator', 'android']:
|
|
||||||
bld.recurse('examples')
|
|
||||||
- bld.recurse('tests')
|
|
||||||
|
|
||||||
bld( source = 'aubio.pc.in' )
|
|
||||||
|
|
||||||
--
|
|
||||||
2.5.5
|
|
||||||
|
|
@ -15,6 +15,10 @@ AUBIO_CONF_OPTS = \
|
|||||||
--disable-docs \
|
--disable-docs \
|
||||||
--disable-atlas
|
--disable-atlas
|
||||||
|
|
||||||
|
# Add --notests for each build step to avoid running unit tests on the
|
||||||
|
# build machine.
|
||||||
|
AUBIO_WAF_OPTS = --notests
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
|
ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
|
||||||
AUBIO_DEPENDENCIES += libsndfile
|
AUBIO_DEPENDENCIES += libsndfile
|
||||||
AUBIO_CONF_OPTS += --enable-sndfile
|
AUBIO_CONF_OPTS += --enable-sndfile
|
||||||
|
Loading…
x
Reference in New Issue
Block a user