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 7878 run_test_thread ,
7979)
8080
81- RET_NO_DEVICES = 1001
82- RET_YOTTA_BUILD_FAIL = - 1
8381LOCAL_HOST_TESTS_DIR = './test/host_tests' # Used by mbedhtrun -e <dir>
8482
8583
@@ -339,7 +337,7 @@ def main():
339337 except KeyboardInterrupt :
340338 greentea_clean_kettle (gt_instance_uuid )
341339 gt_logger .gt_log_err ("ctrl+c keyboard interrupt!" )
342- return ( - 2 ) # Keyboard interrupt
340+ return 1 # Keyboard interrupt
343341 except :
344342 greentea_clean_kettle (gt_instance_uuid )
345343 gt_logger .gt_log_err ("unexpected error:" )
@@ -353,7 +351,7 @@ def main():
353351 cli_ret = main_cli (opts , args )
354352 except KeyboardInterrupt :
355353 gt_logger .gt_log_err ("ctrl+c keyboard interrupt!" )
356- return ( - 2 ) # Keyboard interrupt
354+ return 1 # Keyboard interrupt
357355 except Exception as e :
358356 gt_logger .gt_log_err ("unexpected error:" )
359357 gt_logger .gt_log_tab (str (e ))
@@ -364,6 +362,8 @@ def main():
364362 gt_logger .gt_log ("completed in %.2f sec" % delta )
365363
366364 if cli_ret :
365+ if cli_ret < 0 or cli_ret > 255 :
366+ cli_ret = 1
367367 gt_logger .gt_log_err ("exited with code %d" % cli_ret )
368368
369369 return (cli_ret )
Original file line number Diff line number Diff line change @@ -28,15 +28,18 @@ def main():
2828 2. Call default test execution function run() to start test instrumentation
2929 """
3030 freeze_support ()
31- result = - 2
31+ result = 1
3232 test_selector = DefaultTestSelector (init_host_test_cli_params ())
3333 try :
3434 result = test_selector .execute ()
3535 except (KeyboardInterrupt , SystemExit ):
3636 test_selector .finish ()
37- result = - 3
3837 raise
3938 else :
4039 test_selector .finish ()
4140
41+ # Ensure we don't return a negative value
42+ if result < 0 or result > 255 :
43+ result = 1
44+
4245 return result
Original file line number Diff line number Diff line change @@ -189,7 +189,7 @@ def mbedls_main():
189189
190190 if mbeds is None :
191191 logger .critical ('This platform is not supported! Pull requests welcome at github.com/ARMmbed/mbed-ls' )
192- sys .exit (- 1 )
192+ sys .exit (1 )
193193
194194 ret_code = args .command (mbeds , args )
195195 if not ret_code :
You can’t perform that action at this time.
0 commit comments