diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/hil/hil_test.py | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/test/hil/hil_test.py b/test/hil/hil_test.py index f292bca15..93cc0a750 100755 --- a/test/hil/hil_test.py +++ b/test/hil/hil_test.py @@ -533,7 +533,7 @@ def test_example(board, f1, example): if not os.path.exists(fw_dir): fw_dir = f'{TINYUSB_ROOT}/examples/cmake-build-{name}{f1_str}/{example}' fw_name = f'{fw_dir}/{os.path.basename(example)}' - print(f'{name+f1_str:40} {example:30} ... ', end='') + print(f'{name+f1_str:40} {example:30} ...', end='') if not os.path.exists(fw_dir) or not (os.path.exists(f'{fw_name}.elf') or os.path.exists(f'{fw_name}.bin')): print('Skip (no binary)') @@ -544,29 +544,30 @@ def test_example(board, f1, example): # flash firmware. It may fail randomly, retry a few times max_rety = 3 + start_s = time.time() for i in range(max_rety): ret = globals()[f'flash_{board["flasher"]["name"].lower()}'](board, fw_name) if ret.returncode == 0: try: globals()[f'test_{example.replace("/", "_")}'](board) - print('OK') + print(' OK', end='') break except Exception as e: if i == max_rety - 1: err_count += 1 - print(STATUS_FAILED) - print(f' {e}') + print(f'{STATUS_FAILED}: {e}') else: - print() - print(f' Test failed: {e}, retry {i+2}/{max_rety}') - time.sleep(1) + print(f'\n Test failed: {e}, retry {i+2}/{max_rety}', end='') + time.sleep(0.5) else: - print(f'Flashing failed, retry {i+2}/{max_rety}') - time.sleep(1) + print(f'\n Flash failed, retry {i+2}/{max_rety}', end='') + time.sleep(0.5) if ret.returncode != 0: err_count += 1 - print(f'Flash {STATUS_FAILED}') + print(f' Flash {STATUS_FAILED}', end='') + + print(f' in {time.time() - start_s:.1f}s') return err_count @@ -606,7 +607,7 @@ def test_board(board): # flash board_test last to disable board's usb test_example(board, flags_on_list[0], 'device/board_test') - return err_count + return name, err_count def main(): @@ -620,11 +621,13 @@ def main(): parser = argparse.ArgumentParser() parser.add_argument('config_file', help='Configuration JSON file') parser.add_argument('-b', '--board', action='append', default=[], help='Boards to test, all if not specified') + parser.add_argument('-s', '--skip', action='append', default=[], help='Skip boards from test') parser.add_argument('-v', '--verbose', action='store_true', help='Verbose output') args = parser.parse_args() config_file = args.config_file boards = args.board + skip_boards = args.skip verbose = args.verbose # if config file is not found, try to find it in the same directory as this script @@ -634,12 +637,22 @@ def main(): config = json.load(f) if len(boards) == 0: - config_boards = config['boards'] + config_boards = [e for e in config['boards'] if e['name'] not in skip_boards] else: config_boards = [e for e in config['boards'] if e['name'] in boards] + err_count = 0 with Pool(processes=os.cpu_count()) as pool: - err_count = sum(pool.map(test_board, config_boards)) + mret = pool.map(test_board, config_boards) + err_count = sum(e[1] for e in mret) + # generate skip list for next re-run if failed + skip_fname = f'{config_file}.skip' + if err_count > 0: + skip_boards += [name for name, err in mret if err == 0] + with open(skip_fname, 'w') as f: + f.write(' '.join(f'-s {i}' for i in skip_boards)) + elif os.path.exists(skip_fname): + os.remove(skip_fname) duration = time.time() - duration print() |