From 92d62421b430f25bef68583086f7e1f745cae753 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Fri, 28 Jul 2023 11:38:44 +0100
Subject: [PATCH] TEST: MAke sure build env is activated
---
unit_tests/utils/feedsRun.fslStartup | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/unit_tests/utils/feedsRun.fslStartup b/unit_tests/utils/feedsRun.fslStartup
index b7f8e42..3219c45 100755
--- a/unit_tests/utils/feedsRun.fslStartup
+++ b/unit_tests/utils/feedsRun.fslStartup
@@ -6,20 +6,19 @@ import tempfile
import subprocess as sp
-def run(cmd, ompthreads=None, blasthreads=None, fslskipglobal=None, keepenv=False):
+def run(cmd, ompthreads=None, blasthreads=None, fslskipglobal=None):
env = os.environ.copy()
- if not keepenv:
- blacklist = ['OMP', 'GOTO', 'BLAS', 'FSL']
+ blacklist = ['OMP', 'GOTO', 'BLAS', 'FSL']
- for varname in list(env.keys()):
- if any(b in varname for b in blacklist):
- env.pop(varname)
+ for varname in list(env.keys()):
+ if any(b in varname for b in blacklist):
+ env.pop(varname)
- if ompthreads is not None: env['OMP_NUM_THREADS'] = str(ompthreads)
- if blasthreads is not None: env['BLAS_NUM_THREADS'] = str(blasthreads)
- if fslskipglobal is not None: env['FSL_SKIP_GLOBAL'] = str(fslskipglobal)
+ if ompthreads is not None: env['OMP_NUM_THREADS'] = str(ompthreads)
+ if blasthreads is not None: env['BLAS_NUM_THREADS'] = str(blasthreads)
+ if fslskipglobal is not None: env['FSL_SKIP_GLOBAL'] = str(fslskipglobal)
result = sp.run(shlex.split(cmd), check=True, text=True,
stdout=sp.PIPE, stderr=sp.STDOUT, env=env)
@@ -33,7 +32,10 @@ def run(cmd, ompthreads=None, blasthreads=None, fslskipglobal=None, keepenv=Fals
def main():
- run('make', keepenv=True)
+ buildcmds = ['source $FSLDIR/bin/activate $FSLDIR',
+ 'source $FSLDIR/etc/fslconf/fsl-devel.sh',
+ 'make']
+ sp.run('; '.join(buildcmds), check=True, shell=True)
# Default behaviour should be: OMP multi-threaded, BLAS single threaded.
assert run('./test_fslStartup', 8, 8) == '8 1 8'
--
GitLab