Skip to content

Commit bf6e6ee

Browse files
author
Cruz Monrreal
authored
Merge pull request #10038 from kfnta/tool_fix
PSA: release.py updates to fixes situation where the script would get stuck
2 parents 83d7019 + dad75b5 commit bf6e6ee

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

tools/psa/release.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def build_mbed_spm_platform(target, toolchain, profile='release'):
110110
:param profile: build profile.
111111
"""
112112
subprocess.check_call([
113-
sys.executable, '-u', TEST_PY_LOCATTION,
113+
sys.executable, TEST_PY_LOCATTION,
114114
'--greentea',
115115
'--profile', profile,
116116
'-t', toolchain,
@@ -122,17 +122,17 @@ def build_mbed_spm_platform(target, toolchain, profile='release'):
122122
'--build-data', os.path.join(ROOT, 'BUILD', 'tests',
123123
target, 'build_data.json'),
124124
'-n', MBED_PSA_TESTS
125-
], stdout=subprocess.PIPE)
125+
])
126126

127127
subprocess.check_call([
128-
sys.executable, '-u', MAKE_PY_LOCATTION,
128+
sys.executable, MAKE_PY_LOCATTION,
129129
'-t', toolchain,
130130
'-m', target,
131131
'--profile', profile,
132132
'--source', ROOT,
133133
'--build', os.path.join(ROOT, 'BUILD', target),
134134
'--artifact-name', 'psa_release_1.0'
135-
], stdout=subprocess.PIPE)
135+
])
136136

137137

138138
def _tfm_test_defines(test):
@@ -155,7 +155,7 @@ def build_tfm_platform(target, toolchain, profile='release'):
155155
"""
156156
for test in TFM_TESTS.keys():
157157
subprocess.check_call([
158-
sys.executable, '-u', TEST_PY_LOCATTION,
158+
sys.executable, TEST_PY_LOCATTION,
159159
'--greentea',
160160
'--profile', profile,
161161
'-t', toolchain,
@@ -170,14 +170,14 @@ def build_tfm_platform(target, toolchain, profile='release'):
170170
stdout=subprocess.PIPE)
171171

172172
subprocess.check_call([
173-
sys.executable, '-u', MAKE_PY_LOCATTION,
173+
sys.executable, MAKE_PY_LOCATTION,
174174
'-t', toolchain,
175175
'-m', target,
176176
'--profile', profile,
177177
'--source', ROOT,
178178
'--build', os.path.join(ROOT, 'BUILD', target),
179179
'--app-config', TFM_MBED_APP
180-
], stdout=subprocess.PIPE)
180+
])
181181

182182

183183
def commit_binaries(target, delivery_dir):
@@ -191,24 +191,24 @@ def commit_binaries(target, delivery_dir):
191191
changes_made = subprocess.call([
192192
'git',
193193
'-C', ROOT,
194-
'diff', '--exit-code',
194+
'diff', '--exit-code', '--quiet',
195195
delivery_dir
196-
], stdout=subprocess.PIPE)
196+
])
197197

198198
if changes_made:
199199
subprocess.check_call([
200200
'git',
201201
'-C', ROOT,
202202
'add', os.path.relpath(delivery_dir, ROOT)
203-
], stdout=subprocess.PIPE)
203+
])
204204

205205
commit_message = '-m\"Update secure binaries for {}\"'.format(target)
206206
subprocess.check_call([
207207
'git',
208208
'-C', ROOT,
209209
'commit',
210210
commit_message
211-
], stdout=subprocess.PIPE)
211+
])
212212

213213

214214
def build_psa_platform(target, toolchain, delivery_dir, debug=False,

0 commit comments

Comments
 (0)