From: nasm-bot f. C. G. <gor...@gm...> - 2018-11-12 07:01:37
|
Commit-ID: 0f26c1ec54b8332f33c5db966390271d8f908435 Gitweb: http://repo.or.cz/w/nasm.git?a=commitdiff;h=0f26c1ec54b8332f33c5db966390271d8f908435 Author: Cyrill Gorcunov <gor...@gm...> AuthorDate: Sun, 11 Nov 2018 17:58:49 +0300 Committer: Cyrill Gorcunov <gor...@gm...> CommitDate: Sun, 11 Nov 2018 21:43:46 +0300 test: nasm-t -- Add ability to pass environ variables to test Signed-off-by: Cyrill Gorcunov <gor...@gm...> --- travis/nasm-t.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/travis/nasm-t.py b/travis/nasm-t.py index 49c547f..e925a6e 100755 --- a/travis/nasm-t.py +++ b/travis/nasm-t.py @@ -277,11 +277,24 @@ def exec_nasm(desc): print("\tProcessing %s" % (desc['_test-name'])) opts = [args.nasm] + prepare_run_opts(desc) + desc_env = desc.get('environ') + if desc_env: + nasm_env = os.environ.copy() + for i in desc_env: + v = i.split('=') + if len(v) == 2: + nasm_env[v[0]] = v[1] + else: + nasm_env[v[0]] = None + else: + nasm_env = None + print("\tExecuting %s" % (" ".join(opts))) pnasm = subprocess.Popen(opts, stdout = subprocess.PIPE, stderr = subprocess.PIPE, - close_fds = True) + close_fds = True, + env = nasm_env) if pnasm == None: test_fail(desc['_test-name'], "Unable to execute test") return None |