Merge #19564 #19569

19564: tests: move all bench applications to their own tests/bench/ folder r=aabadie a=aabadie 19569: tests/lua_loader: move to tests/pkg/lua_loader r=aabadie a=aabadie Co-authored-by: Alexandre Abadie <alexandre.abadie@inria.fr>
2024-12-29 04:50:03 +01:00 · 2023-05-10 10:51:27 +00:00 · 2023-05-10 10:51:27 +00:00 · 628bfa9e15
commit 628bfa9e15
parent cf7ef55b8d bdd4705733 6e0bad7026
81 changed files with 18 additions and 15 deletions
--- a/makefiles/app_dirs.inc.mk
+++ b/makefiles/app_dirs.inc.mk
@ -14,6 +14,7 @@ APPLICATION_DIRS :=                   \
    bootloaders                       \
    examples                          \
    tests                             \
+    tests/bench                       \
    tests/drivers                     \
    tests/periph                      \
    tests/pkg                         \
--- a/tests/bench/Makefile.bench_common
+++ b/tests/bench/Makefile.bench_common
@ -0,0 +1,2 @@
+RIOTBASE ?= $(CURDIR)/../../..
+include $(CURDIR)/../../Makefile.tests_common
--- a/tests/bench/msg_pingpong/Makefile
+++ b/tests/bench/msg_pingpong/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.bench_common

 USEMODULE += xtimer

--- a/tests/bench/msg_pingpong/Makefile.ci
+++ b/tests/bench/msg_pingpong/Makefile.ci
--- a/tests/bench/msg_pingpong/README.md
+++ b/tests/bench/msg_pingpong/README.md
--- a/tests/bench/msg_pingpong/main.c
+++ b/tests/bench/msg_pingpong/main.c
--- a/tests/bench/msg_pingpong/tests/01-run.py
+++ b/tests/bench/msg_pingpong/tests/01-run.py
--- a/tests/bench/mutex_pingpong/Makefile
+++ b/tests/bench/mutex_pingpong/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.bench_common

 USEMODULE += xtimer

--- a/tests/bench/mutex_pingpong/Makefile.ci
+++ b/tests/bench/mutex_pingpong/Makefile.ci
--- a/tests/bench/mutex_pingpong/README.md
+++ b/tests/bench/mutex_pingpong/README.md
--- a/tests/bench/mutex_pingpong/main.c
+++ b/tests/bench/mutex_pingpong/main.c
--- a/tests/bench/mutex_pingpong/tests/01-run.py
+++ b/tests/bench/mutex_pingpong/tests/01-run.py
--- a/tests/bench/periph_gpio_ll/.gitignore
+++ b/tests/bench/periph_gpio_ll/.gitignore
--- a/tests/bench/periph_gpio_ll/Makefile
+++ b/tests/bench/periph_gpio_ll/Makefile
@ -13,7 +13,7 @@ PORT_OUT ?= 0
 PIN_OUT_0 ?= 0
 PIN_OUT_1 ?= 1

-include ../Makefile.tests_common
+include ../Makefile.bench_common

 FEATURES_REQUIRED += periph_gpio_ll
 FEATURES_REQUIRED += periph_gpio
--- a/tests/bench/periph_gpio_ll/Makefile.ci
+++ b/tests/bench/periph_gpio_ll/Makefile.ci
--- a/tests/bench/periph_gpio_ll/README.md
+++ b/tests/bench/periph_gpio_ll/README.md
--- a/tests/bench/periph_gpio_ll/main.c
+++ b/tests/bench/periph_gpio_ll/main.c
--- a/tests/bench/periph_gpio_ll/tests-with-config/01-run.py
+++ b/tests/bench/periph_gpio_ll/tests-with-config/01-run.py
--- a/tests/bench/runtime_coreapis/Makefile
+++ b/tests/bench/runtime_coreapis/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.bench_common

 # we use thread flags in this benchmark by default, disable on demand
 USEMODULE += core_thread_flags
--- a/tests/bench/runtime_coreapis/README.md
+++ b/tests/bench/runtime_coreapis/README.md
--- a/tests/bench/runtime_coreapis/main.c
+++ b/tests/bench/runtime_coreapis/main.c
--- a/tests/bench/runtime_coreapis/tests/01-run.py
+++ b/tests/bench/runtime_coreapis/tests/01-run.py
--- a/tests/bench/sched_nop/Makefile
+++ b/tests/bench/sched_nop/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.bench_common

 USEMODULE += xtimer

--- a/tests/bench/sched_nop/README.md
+++ b/tests/bench/sched_nop/README.md
--- a/tests/bench/sched_nop/main.c
+++ b/tests/bench/sched_nop/main.c
--- a/tests/bench/sched_nop/tests/01-run.py
+++ b/tests/bench/sched_nop/tests/01-run.py
--- a/tests/bench/sizeof_coretypes/Makefile
+++ b/tests/bench/sizeof_coretypes/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.bench_common

 # Modules that will have an impact on the size of the TCB (thread_t):
 #
--- a/tests/bench/sizeof_coretypes/Makefile.ci
+++ b/tests/bench/sizeof_coretypes/Makefile.ci
--- a/tests/bench/sizeof_coretypes/README.md
+++ b/tests/bench/sizeof_coretypes/README.md
--- a/tests/bench/sizeof_coretypes/main.c
+++ b/tests/bench/sizeof_coretypes/main.c
--- a/tests/bench/sizeof_coretypes/tests/01-run.py
+++ b/tests/bench/sizeof_coretypes/tests/01-run.py
--- a/tests/bench/sys_atomic_utils/Makefile
+++ b/tests/bench/sys_atomic_utils/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.bench_common

 USEMODULE += xtimer
 USEMODULE += atomic_utils
--- a/tests/bench/sys_atomic_utils/Makefile.ci
+++ b/tests/bench/sys_atomic_utils/Makefile.ci
--- a/tests/bench/sys_atomic_utils/README.md
+++ b/tests/bench/sys_atomic_utils/README.md
--- a/tests/bench/sys_atomic_utils/app.config.test
+++ b/tests/bench/sys_atomic_utils/app.config.test
--- a/tests/bench/sys_atomic_utils/main.c
+++ b/tests/bench/sys_atomic_utils/main.c
--- a/tests/bench/sys_base64/Makefile
+++ b/tests/bench/sys_base64/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.bench_common

 USEMODULE += base64
 USEMODULE += fmt
--- a/tests/bench/sys_base64/Makefile.ci
+++ b/tests/bench/sys_base64/Makefile.ci
--- a/tests/bench/sys_base64/main.c
+++ b/tests/bench/sys_base64/main.c
--- a/tests/bench/sys_base64/tests/01-run.py
+++ b/tests/bench/sys_base64/tests/01-run.py
--- a/tests/bench/thread_flags_pingpong/Makefile
+++ b/tests/bench/thread_flags_pingpong/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.bench_common

 USEMODULE += core_thread_flags
 USEMODULE += xtimer
--- a/tests/bench/thread_flags_pingpong/Makefile.ci
+++ b/tests/bench/thread_flags_pingpong/Makefile.ci
--- a/tests/bench/thread_flags_pingpong/README.md
+++ b/tests/bench/thread_flags_pingpong/README.md
--- a/tests/bench/thread_flags_pingpong/main.c
+++ b/tests/bench/thread_flags_pingpong/main.c
--- a/tests/bench/thread_flags_pingpong/tests/01-run.py
+++ b/tests/bench/thread_flags_pingpong/tests/01-run.py
--- a/tests/bench/thread_yield_pingpong/Makefile
+++ b/tests/bench/thread_yield_pingpong/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.bench_common

 USEMODULE += xtimer

--- a/tests/bench/thread_yield_pingpong/Makefile.ci
+++ b/tests/bench/thread_yield_pingpong/Makefile.ci
--- a/tests/bench/thread_yield_pingpong/README.md
+++ b/tests/bench/thread_yield_pingpong/README.md
--- a/tests/bench/thread_yield_pingpong/main.c
+++ b/tests/bench/thread_yield_pingpong/main.c
--- a/tests/bench/thread_yield_pingpong/tests/01-run.py
+++ b/tests/bench/thread_yield_pingpong/tests/01-run.py
--- a/tests/bench/timers/Makefile
+++ b/tests/bench/timers/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.bench_common

 # These boards only have a single timer in their periph_conf.h, needs special
 # CFLAGS configuration to build properly
--- a/tests/bench/timers/Makefile.ci
+++ b/tests/bench/timers/Makefile.ci
--- a/tests/bench/timers/README.md
+++ b/tests/bench/timers/README.md
--- a/tests/bench/timers/bench_timers_config.h
+++ b/tests/bench/timers/bench_timers_config.h
--- a/tests/bench/timers/main.c
+++ b/tests/bench/timers/main.c
--- a/tests/bench/timers/print_results.c
+++ b/tests/bench/timers/print_results.c
--- a/tests/bench/timers/print_results.h
+++ b/tests/bench/timers/print_results.h
--- a/tests/bench/timers/spin_random.c
+++ b/tests/bench/timers/spin_random.c
--- a/tests/bench/timers/spin_random.h
+++ b/tests/bench/timers/spin_random.h
--- a/tests/bench/xtimer/Makefile
+++ b/tests/bench/xtimer/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.bench_common

 USEMODULE += xtimer

--- a/tests/bench/xtimer/Makefile.ci
+++ b/tests/bench/xtimer/Makefile.ci
--- a/tests/bench/xtimer/README.md
+++ b/tests/bench/xtimer/README.md
--- a/tests/bench/xtimer/main.c
+++ b/tests/bench/xtimer/main.c
--- a/tests/bench/xtimer/tests/01-run.py
+++ b/tests/bench/xtimer/tests/01-run.py
--- a/tests/bench/xtimer_load/Makefile
+++ b/tests/bench/xtimer_load/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.bench_common

 USEMODULE += xtimer

--- a/tests/bench/xtimer_load/Makefile.ci
+++ b/tests/bench/xtimer_load/Makefile.ci
--- a/tests/bench/xtimer_load/README.md
+++ b/tests/bench/xtimer_load/README.md
--- a/tests/bench/xtimer_load/main.c
+++ b/tests/bench/xtimer_load/main.c
--- a/tests/bench/xtimer_load/tests/01-run.py
+++ b/tests/bench/xtimer_load/tests/01-run.py
--- a/tests/bench/ztimer/Makefile
+++ b/tests/bench/ztimer/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.bench_common

 USEMODULE += ztimer_usec ztimer_msec

--- a/tests/bench/ztimer/Makefile.ci
+++ b/tests/bench/ztimer/Makefile.ci
--- a/tests/bench/ztimer/README.md
+++ b/tests/bench/ztimer/README.md
--- a/tests/bench/ztimer/main.c
+++ b/tests/bench/ztimer/main.c
--- a/tests/bench/ztimer/tests/01-run.py
+++ b/tests/bench/ztimer/tests/01-run.py
--- a/tests/pkg/lua_loader/Makefile
+++ b/tests/pkg/lua_loader/Makefile
@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common

 USEPKG += lua

--- a/tests/pkg/lua_loader/Makefile.ci
+++ b/tests/pkg/lua_loader/Makefile.ci
--- a/tests/pkg/lua_loader/README
+++ b/tests/pkg/lua_loader/README
--- a/tests/pkg/lua_loader/app.config.test
+++ b/tests/pkg/lua_loader/app.config.test
--- a/tests/pkg/lua_loader/cmodules.c
+++ b/tests/pkg/lua_loader/cmodules.c
--- a/tests/pkg/lua_loader/main.c
+++ b/tests/pkg/lua_loader/main.c
--- a/tests/pkg/lua_loader/tests/01-run.py
+++ b/tests/pkg/lua_loader/tests/01-run.py