Skip to content

Commit 254167b

Browse files
authored
Merge pull request #2823 from hathach/hil-piousb-host-optional
HIL have dual/host_info_to_device_cdc optional for pico/pico2
2 parents e209acb + d6c8719 commit 254167b

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

test/hil/hil_test.py

+9-4
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,13 @@ def test_dual_host_info_to_device_cdc(board):
240240
print(f'\r\n {l} ', end='')
241241
enum_dev_sn.append(f'{vid_pid_sn.group(1)}_{vid_pid_sn.group(2)}_{vid_pid_sn.group(3)}')
242242

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

247252

@@ -405,15 +410,15 @@ def test_board(board):
405410

406411
if 'tests' in board:
407412
board_tests = board['tests']
413+
if 'dual_attached' in board_tests:
414+
test_list += dual_tests
408415
if 'only' in board_tests:
409416
test_list = board_tests['only']
410417
if 'skip' in board_tests:
411418
for skip in board_tests['skip']:
412419
if skip in test_list:
413420
test_list.remove(skip)
414421
print(f'{name:25} {skip:30} ... Skip')
415-
if 'dual_attached' in board_tests:
416-
test_list += dual_tests
417422

418423
# board_test is added last to disable board's usb
419424
test_list.append('device/board_test')

test/hil/tinyusb.json

-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
"flasher_sn": "E6633861A3978538",
6060
"flasher_args": "-f interface/cmsis-dap.cfg -f target/rp2350.cfg -c \"adapter speed 5000\"",
6161
"tests": {
62-
"skip": ["dual/host_info_to_device_cdc"],
6362
"dual_attached": [{"vid_pid": "1a86_55d4", "serial": "533D004242"}]
6463
}
6564
},

0 commit comments

Comments
 (0)