Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ports/zephyr-cp/tests/bsim/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,16 @@ def bsim_phy(request, bsim_phy_binary, native_sim_env, sim_id):
sample_device_id = int(sample_marker.kwargs.get("device_id", 1))
devices = max(devices, sample_device_id + 1)

sim_length_us = int(duration * 1e6)
# Do not pass -sim_length: if the PHY exits on simulated time, device 0 can
# still be flushing UART output and test output can get truncated. Instead,
# let pytest own process lifetime and terminate the PHY at fixture teardown.
cmd = [
"stdbuf",
"-oL",
str(bsim_phy_binary),
"-v=9", # Cleaning up level is on 9. Connecting is 7.
f"-s={sim_id}",
f"-D={devices}",
f"-sim_length={sim_length_us}",
]
print("Running:", " ".join(cmd))
proc = subprocess.Popen(
Expand Down
2 changes: 1 addition & 1 deletion ports/zephyr-cp/zephyr-config/west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ manifest:
projects:
- name: nrf_hw_models
url: https://github.com/tannewt/ext_nRF_hw_models
revision: 24de78c485dce1a6048f8ae1c69a8d70c93b8cdd
revision: bb351cef9e5ab4d175fe3cb7c4d6761d837bac20
path: modules/bsim_hw_models/nrf_hw_models
- name: zephyr
url: https://github.com/adafruit/zephyr
Expand Down