From a598375e3d43760562fccacfa45fc0ad6a30bcb7 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Mon, 26 Sep 2016 14:26:44 +0200
Subject: [PATCH 1/2] Add missing release c/cxx flags
---
bob/buildout/envwrapper.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/bob/buildout/envwrapper.py b/bob/buildout/envwrapper.py
index d3066d0..d316902 100644
--- a/bob/buildout/envwrapper.py
+++ b/bob/buildout/envwrapper.py
@@ -30,6 +30,7 @@ class EnvironmentWrapper(object):
if platform.system() == 'Darwin':
DEBUG_CFLAGS += ' -pthread'
+ RELEASE_CFLAGS += ' -pthread'
LDFLAGS = '-lpthread'
# Note: CLang does not work well with BZ_DEBUG\n
--
GitLab
From 199567c59516163724cd7c4fe40197469d4ef783 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Mon, 26 Sep 2016 14:35:54 +0200
Subject: [PATCH 2/2] Clean-up before all tests
---
bob/buildout/test_envwrapper.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/bob/buildout/test_envwrapper.py b/bob/buildout/test_envwrapper.py
index 7eb558e..9e23c9c 100644
--- a/bob/buildout/test_envwrapper.py
+++ b/bob/buildout/test_envwrapper.py
@@ -12,6 +12,15 @@ import platform
from .envwrapper import EnvironmentWrapper
+def cleanup():
+ '''Removes weird variables from the user environment just for the tests'''
+
+ remove = ['CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'BOB_PREFIX_PATH',
+ 'PKG_CONFIG_PATH', 'CMAKE_PREFIX_PATH', 'MACOSX_DEPLOYMENT_TARGET']
+ for key in remove:
+ if key in os.environ: del os.environ[key]
+
+@nose.with_setup(cleanup)
def test_default():
e = EnvironmentWrapper(logging.getLogger())
@@ -32,14 +41,6 @@ def test_default():
assert key in before, "key `%s' was not on os.environ before" % (key,)
nose.tools.eq_(before, os.environ)
-def cleanup():
- '''Removes weird variables from the user environment just for the tests'''
-
- remove = ['CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'BOB_PREFIX_PATH',
- 'PKG_CONFIG_PATH', 'CMAKE_PREFIX_PATH', 'MACOSX_DEPLOYMENT_TARGET']
- for key in remove:
- if key in os.environ: del os.environ[key]
-
@nose.with_setup(cleanup)
def test_set_debug_true():
--
GitLab