Skip to content

Commit

Permalink
Merge pull request #2823 from hathach/hil-piousb-host-optional
Browse files Browse the repository at this point in the history
HIL have dual/host_info_to_device_cdc optional for pico/pico2
  • Loading branch information
hathach authored Sep 30, 2024
2 parents e209acb + d6c8719 commit 254167b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
13 changes: 9 additions & 4 deletions test/hil/hil_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,13 @@ def test_dual_host_info_to_device_cdc(board):
print(f'\r\n {l} ', end='')
enum_dev_sn.append(f'{vid_pid_sn.group(1)}_{vid_pid_sn.group(2)}_{vid_pid_sn.group(3)}')

assert(set(declared_devs) == set(enum_dev_sn)), \
f'Enumerated devices {enum_dev_sn} not match with declared {declared_devs}'
if set(declared_devs) != set(enum_dev_sn):
# for pico/pico2 make this test optional
failed_msg = f'Enumerated devices {enum_dev_sn} not match with declared {declared_devs}'
if 'raspberry_pi_pico' in board['name']:
print(f'\r\n {failed_msg} ', end='')
else:
assert False, failed_msg
return 0


Expand Down Expand Up @@ -405,15 +410,15 @@ def test_board(board):

if 'tests' in board:
board_tests = board['tests']
if 'dual_attached' in board_tests:
test_list += dual_tests
if 'only' in board_tests:
test_list = board_tests['only']
if 'skip' in board_tests:
for skip in board_tests['skip']:
if skip in test_list:
test_list.remove(skip)
print(f'{name:25} {skip:30} ... Skip')
if 'dual_attached' in board_tests:
test_list += dual_tests

# board_test is added last to disable board's usb
test_list.append('device/board_test')
Expand Down
1 change: 0 additions & 1 deletion test/hil/tinyusb.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"flasher_sn": "E6633861A3978538",
"flasher_args": "-f interface/cmsis-dap.cfg -f target/rp2350.cfg -c \"adapter speed 5000\"",
"tests": {
"skip": ["dual/host_info_to_device_cdc"],
"dual_attached": [{"vid_pid": "1a86_55d4", "serial": "533D004242"}]
}
},
Expand Down

0 comments on commit 254167b

Please sign in to comment.