sys: model ecc, evtimer, pipe and shell_lock in kconfig #19636

aabadie · 2023-05-20T16:37:45Z

Contribution description

This PR also drops the xtimer backend from evtimer so simplify the Kconfig dependency modeling.
For shell_lock, I tried to expose some compile time configuration as Kconfig option but for some reason the automated test doesn't work with TEST_KCONFIG=1 on native. Some Kconfig expert help is appreciated for this one.

I can split in smaller PRs of needed.

Testing procedure

Green CI

Issues/PRs references

Tick some items in #16875

riot-ci · 2023-05-20T18:44:41Z

Murdock results

✔️ PASSED

8b53e74 tests/net/gnrc_netif: remove non necessary xtimer include

Success	Failures	Total	Runtime
6932	0	6933	10m:47s

Artifacts

Documentation preview

MrKevinWeiss · 2023-05-22T09:39:41Z

After a bit of digging I think I figured out why there is a hash mismatch for native and tests/sys/shell_lock.

The problem is that CONFIG_SHELL_SHUTDOWN_ON_EXIT should be 0 for the kconfig, but, when you turn off a symbol in kconfig it just doesn't set anything rather than explicitly setting it to 0. This can be found by looking in the tests/sys/shell_lock/bin/native/generated/autoconf.h.

Now, since we have the logic of enabling it by default if native also in the header file, and kconfig does not explicitly set it to 0, it would enable by default, even though we want it disabled...

The possible solutions would be:

remove the logic in the header file, meaning that make would have to implement that logic somewhere.
Not only disable it in the app.config.test but also keep define the cflag for both kconfig and make, ie:

diff --git a/tests/sys/shell_lock/Makefile b/tests/sys/shell_lock/Makefile
index 78f8bdb5fd..f7e3ccfd88 100644
--- a/tests/sys/shell_lock/Makefile
+++ b/tests/sys/shell_lock/Makefile
@@ -10,11 +10,12 @@ USEMODULE += shell_lock_auto_locking
 ifneq (1,$(TEST_KCONFIG))
 CFLAGS += -DCONFIG_SHELL_LOCK_PASSWORD=\"password\"
 CFLAGS += -DCONFIG_SHELL_LOCK_AUTO_LOCK_TIMEOUT_MS=7000
+endif
 
 # This config defaults to 1 on native, such that pm_off() would be called as soon as
 # shell_run_once is terminated in shell_run_forever. We do not want this behavior for this test.
 CFLAGS += -DCONFIG_SHELL_SHUTDOWN_ON_EXIT=0
-endif
+
 
 # test_utils_interactive_sync_shell assumes that the prompt is always '> ' which breaks
 # with the password prompt of the shell_lock module which is different from the shell's prompt

Add an override symbol that would be set in order to override it only in kconfig.

sys/include/evtimer.h

maribu

Looks good to me. See above comment. Please squash / amend directly, my ACK remains valid.

MrKevinWeiss

LGTM, if murdock is happy I think it is OK. ACK.

MrKevinWeiss · 2023-05-23T08:04:03Z

bors merge

bors · 2023-05-23T08:04:06Z

🕐 Waiting for PR status (GitHub check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set.

bors · 2023-05-23T08:35:50Z

GitHub status checks took too long to complete, so bors is giving up. You can adjust bors configuration to have it wait longer if you like.

19620: dist/tools/openocd: fix parsing of flash bank base r=aabadie a=maribu ### Contribution description Since [80fc9fabc66a0bc767467fa14c703e5a9f340cd3] the format of the `flash list` command changed to a more human readable multi-line variant. Technically, the change is white-space only. Still, the current approach of parsing them with awk, sed and cut doesn't like the new multi-line format. The parsing is now delegated into a python script that is compatible across OpenOCD versions. [80fc9fabc66a0bc767467fa14c703e5a9f340cd3]: openocd-org/openocd@80fc9fa 19636: sys: model ecc, evtimer, pipe and shell_lock in kconfig r=aabadie a=aabadie 19639: tests/net/gnrc_mac_timeout: add automated test r=aabadie a=aabadie Co-authored-by: Marian Buschsieweke <[email protected]> Co-authored-by: Alexandre Abadie <[email protected]>

bors · 2023-05-23T16:23:09Z

Build failed (retrying...):

Murdock

maribu · 2023-05-23T17:38:47Z

diff --git a/tests/net/gnrc_netif/main.c b/tests/net/gnrc_netif/main.c
index 34fff1e905..caf86553e1 100644
--- a/tests/net/gnrc_netif/main.c
+++ b/tests/net/gnrc_netif/main.c
@@ -38,7 +38,6 @@
 #include "net/netif.h"
 #include "test_utils/expect.h"
 #include "utlist.h"
-#include "xtimer.h"
 
 #define ETHERNET_STACKSIZE          (THREAD_STACKSIZE_MAIN)
 #define IEEE802154_STACKSIZE        (THREAD_STACKSIZE_MAIN)

is required to fix the build failure for the waspmote-pro. (That board is fundamentally incompatible with xtimer. If USEMODULE += xtimer is used, ztimer_xtimer_compat is pulled in. But any #include "xtimer.h" without an USEMODULE += xtimer will break utterly, sadly.)

maribu · 2023-05-23T18:14:44Z

bors cancel

(The compilation issue with the waspmote-pro will cause this to fail again anyway, so let's take this out of the merge train for now.)

bors · 2023-05-23T18:14:46Z

Canceled.

aabadie · 2023-05-24T08:27:51Z

bors merge

bors · 2023-05-24T08:27:53Z

🕐 Waiting for PR status (GitHub check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set.

bors · 2023-05-24T08:59:53Z

GitHub status checks took too long to complete, so bors is giving up. You can adjust bors configuration to have it wait longer if you like.

aabadie · 2023-05-24T09:29:25Z

bors merge

bors · 2023-05-24T09:29:28Z

🕐 Waiting for PR status (GitHub check) to be set, probably by CI. Bors will automatically try to run when all required PR statuses are set.

19636: sys: model ecc, evtimer, pipe and shell_lock in kconfig r=aabadie a=aabadie Co-authored-by: Alexandre Abadie <[email protected]>

aabadie · 2023-05-24T09:36:32Z

bors cancel

bors · 2023-05-24T09:36:34Z

Canceled.

aabadie · 2023-05-24T09:45:50Z

bors merge

bors · 2023-05-24T12:45:29Z

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

aabadie added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label May 20, 2023

aabadie requested review from leandrolanzieri, jia200x, MrKevinWeiss, smlng, MichelRottleuthner, fjmolinas, kaspar030 and bergzand as code owners May 20, 2023 16:37

github-actions bot added Area: build system Area: Build system Area: Kconfig Area: Kconfig integration Area: sys Area: System Area: tests Area: tests and testing framework Area: timers Area: timer subsystems labels May 20, 2023

aabadie force-pushed the pr/sys/more_kconfig branch from 899de84 to da83670 Compare May 20, 2023 16:38

aabadie mentioned this pull request May 20, 2023

[Tracking]: modeling dependencies in Kconfig #16875

Closed

aabadie added the CI: no fast fail don't abort PR build after first error label May 21, 2023

github-actions bot added the Area: network Area: Networking label May 21, 2023

aabadie requested a review from miri64 as a code owner May 21, 2023 06:42

aabadie mentioned this pull request May 21, 2023

tests/net/gnrc_mac_timeout: add automated test #19639

Merged

aabadie force-pushed the pr/sys/more_kconfig branch from da854bb to a667267 Compare May 22, 2023 12:32

maribu reviewed May 22, 2023

View reviewed changes

sys/include/evtimer.h Outdated Show resolved Hide resolved

maribu approved these changes May 22, 2023

View reviewed changes

MrKevinWeiss approved these changes May 23, 2023

View reviewed changes

aabadie force-pushed the pr/sys/more_kconfig branch from a667267 to 0ef40af Compare May 23, 2023 08:02

aabadie added 11 commits May 24, 2023 09:53

sys/ecc: model in Kconfig

7eb50c5

sys/evtimer: remove support for xtimer backend

08fdb23

sys/evtimer: model in Kconfig

8991104

tests/sys/evtimer_*: add Kconfig config

f1e474d

sys/pipe: model in Kconfig

cc78923

tests/sys/pipe: add Kconfig config

41a0dd6

sys/shell_lock: model in Kconfig

5851db7

tests/sys/shell_lock: add Kconfig config

6fa0279

sys/net: add missing timex.h include

e9f040c

tests/net/gnrc_mac_timeout: migrate to ztimer

dda2450

tests/net/gnrc_netif: remove non necessary xtimer include

8b53e74

aabadie force-pushed the pr/sys/more_kconfig branch from 0ef40af to 8b53e74 Compare May 24, 2023 08:15

bors bot added a commit that referenced this pull request May 24, 2023

Merge #19636

8621725

19636: sys: model ecc, evtimer, pipe and shell_lock in kconfig r=aabadie a=aabadie Co-authored-by: Alexandre Abadie <[email protected]>

bors bot merged commit 7d16a1b into RIOT-OS:master May 24, 2023

aabadie deleted the pr/sys/more_kconfig branch May 25, 2023 13:40

benpicco added this to the Release 2023.07 milestone Aug 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sys: model ecc, evtimer, pipe and shell_lock in kconfig #19636

sys: model ecc, evtimer, pipe and shell_lock in kconfig #19636

aabadie commented May 20, 2023

riot-ci commented May 20, 2023 •

edited

Loading

MrKevinWeiss commented May 22, 2023

maribu left a comment

MrKevinWeiss left a comment

MrKevinWeiss commented May 23, 2023

bors bot commented May 23, 2023

bors bot commented May 23, 2023

bors bot commented May 23, 2023

maribu commented May 23, 2023

maribu commented May 23, 2023

bors bot commented May 23, 2023

aabadie commented May 24, 2023

bors bot commented May 24, 2023

bors bot commented May 24, 2023

aabadie commented May 24, 2023

bors bot commented May 24, 2023

aabadie commented May 24, 2023

bors bot commented May 24, 2023

aabadie commented May 24, 2023

bors bot commented May 24, 2023

sys: model ecc, evtimer, pipe and shell_lock in kconfig #19636

sys: model ecc, evtimer, pipe and shell_lock in kconfig #19636

Conversation

aabadie commented May 20, 2023

Contribution description

Testing procedure

Issues/PRs references

riot-ci commented May 20, 2023 • edited Loading

Murdock results

Artifacts

MrKevinWeiss commented May 22, 2023

maribu left a comment

Choose a reason for hiding this comment

MrKevinWeiss left a comment

Choose a reason for hiding this comment

MrKevinWeiss commented May 23, 2023

bors bot commented May 23, 2023

bors bot commented May 23, 2023

bors bot commented May 23, 2023

maribu commented May 23, 2023

maribu commented May 23, 2023

bors bot commented May 23, 2023

aabadie commented May 24, 2023

bors bot commented May 24, 2023

bors bot commented May 24, 2023

aabadie commented May 24, 2023

bors bot commented May 24, 2023

aabadie commented May 24, 2023

bors bot commented May 24, 2023

aabadie commented May 24, 2023

bors bot commented May 24, 2023

riot-ci commented May 20, 2023 •

edited

Loading