-
Notifications
You must be signed in to change notification settings - Fork 8.2k
nrf52_bsim: Use HW models from new west module #20731
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
nrf52_bsim: Use HW models from new west module #20731
Conversation
124b6d0 to
eca15ff
Compare
eca15ff to
57112f6
Compare
57112f6 to
7860c29
Compare
7860c29 to
b1a0fa1
Compare
mbolivar
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems fine, but I think that one cmake nit makes sense to clean up here.
|
if this fixes #20366, we should add a reference to the body. With this change, do we still need the code in the docker image? |
Yes, the code in the docker image (the simulator base components) are akin to cmake, and cannot be built by Zephyr's build system. |
ok, do we have documentation or instructions somewhere for how someone can get babblesim installed on their system to be able to run sanitycheck the same way it is run in CI? |
Here: |
This documentation would make more sense under doc/guides/test/ with reference to the board, can we move this and change it to explain how it would work with sanitycheck? |
We could. If the plan is just to document how it is today and leave it at that. I was thinking of maybe including the simulator in the SDK, in which case it could be transparent for users. |
b1a0fa1 to
e4d63d9
Compare
|
Just cleaned up a bit more the diff --git a/scripts/ci/run_ci.sh b/scripts/ci/run_ci.sh
index 3f4080d107..8a3a85af17 100755
--- a/scripts/ci/run_ci.sh
+++ b/scripts/ci/run_ci.sh
@@ -115,14 +115,6 @@ function on_complete() {
fi;
}
-
-function build_btsim() {
- pushd . ;
- cd ${BSIM_OUT_PATH}
- make everything -j 8 -s
- popd ;
-}
-
function run_bsim_bt_tests() {
WORK_DIR=${ZEPHYR_BASE}/bsim_bt_out tests/bluetooth/bsim_bt/compile.sh
RESULTS_FILE=${ZEPHYR_BASE}/${BSIM_BT_TEST_RESULTS_FILE} \
@@ -235,10 +227,7 @@ if [ -n "$MAIN_CI" ]; then
$short_git_log
if [ -n "${BSIM_OUT_PATH}" -a -d "${BSIM_OUT_PATH}" ]; then
- echo "Build BT simulator tests"
- # Build BT Simulator
- build_btsim
-
+ echo "Build and run BT simulator tests"
# Run BLE tests in simulator on the 1st CI instance:
if [ "$MATRIX" = "1" ]; then
run_bsim_bt_tests(and as a bonus we save ~50ms) |
Fetch HW models from a new west module. And, remove all pre-west glue which was used to: * Fetch them in CI * Validate their vesion * Modify the include path and link to them Signed-off-by: Alberto Escolar Piedras <[email protected]>
e4d63d9 to
d4e2bc7
Compare
|
Rebased due to run_ci.sh conflict (variables case change). No changes otherwise. |
Fetch HW models from a new west module.
And, remove all pre-west glue which was used to:
Signed-off-by: Alberto Escolar Piedras [email protected]
New west module provisional placement:
https://github.com/aescolar/nrf52_HW_models