epics/ci-scripts
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge pull request #73 from mdavidsaver/split-extra

Browse Source 
(closes #73)
This commit is contained in:
Ralph Lange
2023-03-09 11:55:06 +00:00
parent bd0cd5434c f47280547b
commit 1e0e326f74
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cue-test.py
View File

@@ -841,7 +841,7 @@ class TestSetupForBuild(unittest.TestCase):
def test_ExtraMakeArgs(self):
os.environ['EXTRA'] = 'bla'
for ind in range(1,5):
os.environ['EXTRA{0}'.format(ind)] = 'bla {0}'.format(ind)
os.environ['EXTRA{0}'.format(ind)] = '"bla {0}"'.format(ind)
cue.setup_for_build(self.args)
self.assertTrue(cue.extra_makeargs[0] == 'bla', 'Extra make arg [0] not set')
for ind in range(1,5):

4
cue.py
View File

@@ -4,7 +4,7 @@
from __future__ import print_function
import sys, os, stat, shutil
import sys, os, stat, shlex, shutil
import fileinput
import logging
import re
@@ -779,7 +779,7 @@ def setup_for_build(args):
for tag in ['EXTRA', 'EXTRA1', 'EXTRA2', 'EXTRA3', 'EXTRA4', 'EXTRA5']:
val = os.environ.get(tag, "")
if len(val)>0:
extra_makeargs.append(val)
extra_makeargs.extend(shlex.split(val))
def fix_etc_hosts():