File tree Expand file tree Collapse file tree 3 files changed +10
-7
lines changed
mbed-greentea/mbed_greentea
mbed-host-tests/mbed_host_tests Expand file tree Collapse file tree 3 files changed +10
-7
lines changed Original file line number Diff line number Diff line change 78
78
run_test_thread ,
79
79
)
80
80
81
- RET_NO_DEVICES = 1001
82
- RET_YOTTA_BUILD_FAIL = - 1
83
81
LOCAL_HOST_TESTS_DIR = './test/host_tests' # Used by mbedhtrun -e <dir>
84
82
85
83
@@ -339,7 +337,7 @@ def main():
339
337
except KeyboardInterrupt :
340
338
greentea_clean_kettle (gt_instance_uuid )
341
339
gt_logger .gt_log_err ("ctrl+c keyboard interrupt!" )
342
- return ( - 2 ) # Keyboard interrupt
340
+ return 1 # Keyboard interrupt
343
341
except :
344
342
greentea_clean_kettle (gt_instance_uuid )
345
343
gt_logger .gt_log_err ("unexpected error:" )
@@ -353,7 +351,7 @@ def main():
353
351
cli_ret = main_cli (opts , args )
354
352
except KeyboardInterrupt :
355
353
gt_logger .gt_log_err ("ctrl+c keyboard interrupt!" )
356
- return ( - 2 ) # Keyboard interrupt
354
+ return 1 # Keyboard interrupt
357
355
except Exception as e :
358
356
gt_logger .gt_log_err ("unexpected error:" )
359
357
gt_logger .gt_log_tab (str (e ))
@@ -364,6 +362,8 @@ def main():
364
362
gt_logger .gt_log ("completed in %.2f sec" % delta )
365
363
366
364
if cli_ret :
365
+ if cli_ret < 0 or cli_ret > 255 :
366
+ cli_ret = 1
367
367
gt_logger .gt_log_err ("exited with code %d" % cli_ret )
368
368
369
369
return (cli_ret )
Original file line number Diff line number Diff line change @@ -28,15 +28,18 @@ def main():
28
28
2. Call default test execution function run() to start test instrumentation
29
29
"""
30
30
freeze_support ()
31
- result = - 2
31
+ result = 1
32
32
test_selector = DefaultTestSelector (init_host_test_cli_params ())
33
33
try :
34
34
result = test_selector .execute ()
35
35
except (KeyboardInterrupt , SystemExit ):
36
36
test_selector .finish ()
37
- result = - 3
38
37
raise
39
38
else :
40
39
test_selector .finish ()
41
40
41
+ # Ensure we don't return a negative value
42
+ if result < 0 or result > 255 :
43
+ result = 1
44
+
42
45
return result
Original file line number Diff line number Diff line change @@ -189,7 +189,7 @@ def mbedls_main():
189
189
190
190
if mbeds is None :
191
191
logger .critical ('This platform is not supported! Pull requests welcome at github.com/ARMmbed/mbed-ls' )
192
- sys .exit (- 1 )
192
+ sys .exit (1 )
193
193
194
194
ret_code = args .command (mbeds , args )
195
195
if not ret_code :
You can’t perform that action at this time.
0 commit comments