diff --git a/makefiles/app_dirs.inc.mk b/makefiles/app_dirs.inc.mk index 4179f99f90..bb315e4126 100644 --- 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 \ diff --git a/tests/bench/Makefile.bench_common b/tests/bench/Makefile.bench_common new file mode 100644 index 0000000000..ecfb7b7d01 --- /dev/null +++ b/tests/bench/Makefile.bench_common @@ -0,0 +1,2 @@ +RIOTBASE ?= $(CURDIR)/../../.. +include $(CURDIR)/../../Makefile.tests_common diff --git a/tests/bench_msg_pingpong/Makefile b/tests/bench/msg_pingpong/Makefile similarity index 64% rename from tests/bench_msg_pingpong/Makefile rename to tests/bench/msg_pingpong/Makefile index 8bff23ceea..0dfda6495d 100644 --- 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 diff --git a/tests/bench_msg_pingpong/Makefile.ci b/tests/bench/msg_pingpong/Makefile.ci similarity index 100% rename from tests/bench_msg_pingpong/Makefile.ci rename to tests/bench/msg_pingpong/Makefile.ci diff --git a/tests/bench_msg_pingpong/README.md b/tests/bench/msg_pingpong/README.md similarity index 100% rename from tests/bench_msg_pingpong/README.md rename to tests/bench/msg_pingpong/README.md diff --git a/tests/bench_msg_pingpong/main.c b/tests/bench/msg_pingpong/main.c similarity index 100% rename from tests/bench_msg_pingpong/main.c rename to tests/bench/msg_pingpong/main.c diff --git a/tests/bench_msg_pingpong/tests/01-run.py b/tests/bench/msg_pingpong/tests/01-run.py similarity index 100% rename from tests/bench_msg_pingpong/tests/01-run.py rename to tests/bench/msg_pingpong/tests/01-run.py diff --git a/tests/bench_mutex_pingpong/Makefile b/tests/bench/mutex_pingpong/Makefile similarity index 64% rename from tests/bench_mutex_pingpong/Makefile rename to tests/bench/mutex_pingpong/Makefile index 8bff23ceea..0dfda6495d 100644 --- 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 diff --git a/tests/bench_mutex_pingpong/Makefile.ci b/tests/bench/mutex_pingpong/Makefile.ci similarity index 100% rename from tests/bench_mutex_pingpong/Makefile.ci rename to tests/bench/mutex_pingpong/Makefile.ci diff --git a/tests/bench_mutex_pingpong/README.md b/tests/bench/mutex_pingpong/README.md similarity index 100% rename from tests/bench_mutex_pingpong/README.md rename to tests/bench/mutex_pingpong/README.md diff --git a/tests/bench_mutex_pingpong/main.c b/tests/bench/mutex_pingpong/main.c similarity index 100% rename from tests/bench_mutex_pingpong/main.c rename to tests/bench/mutex_pingpong/main.c diff --git a/tests/bench_mutex_pingpong/tests/01-run.py b/tests/bench/mutex_pingpong/tests/01-run.py similarity index 100% rename from tests/bench_mutex_pingpong/tests/01-run.py rename to tests/bench/mutex_pingpong/tests/01-run.py diff --git a/tests/bench_periph_gpio_ll/.gitignore b/tests/bench/periph_gpio_ll/.gitignore similarity index 100% rename from tests/bench_periph_gpio_ll/.gitignore rename to tests/bench/periph_gpio_ll/.gitignore diff --git a/tests/bench_periph_gpio_ll/Makefile b/tests/bench/periph_gpio_ll/Makefile similarity index 97% rename from tests/bench_periph_gpio_ll/Makefile rename to tests/bench/periph_gpio_ll/Makefile index d37ad224f4..6b22fb729b 100644 --- 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 diff --git a/tests/bench_periph_gpio_ll/Makefile.ci b/tests/bench/periph_gpio_ll/Makefile.ci similarity index 100% rename from tests/bench_periph_gpio_ll/Makefile.ci rename to tests/bench/periph_gpio_ll/Makefile.ci diff --git a/tests/bench_periph_gpio_ll/README.md b/tests/bench/periph_gpio_ll/README.md similarity index 100% rename from tests/bench_periph_gpio_ll/README.md rename to tests/bench/periph_gpio_ll/README.md diff --git a/tests/bench_periph_gpio_ll/main.c b/tests/bench/periph_gpio_ll/main.c similarity index 100% rename from tests/bench_periph_gpio_ll/main.c rename to tests/bench/periph_gpio_ll/main.c diff --git a/tests/bench_periph_gpio_ll/tests-with-config/01-run.py b/tests/bench/periph_gpio_ll/tests-with-config/01-run.py similarity index 100% rename from tests/bench_periph_gpio_ll/tests-with-config/01-run.py rename to tests/bench/periph_gpio_ll/tests-with-config/01-run.py diff --git a/tests/bench_runtime_coreapis/Makefile b/tests/bench/runtime_coreapis/Makefile similarity index 83% rename from tests/bench_runtime_coreapis/Makefile rename to tests/bench/runtime_coreapis/Makefile index 35eaa186b9..08a3bf81f2 100644 --- 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 diff --git a/tests/bench_runtime_coreapis/README.md b/tests/bench/runtime_coreapis/README.md similarity index 100% rename from tests/bench_runtime_coreapis/README.md rename to tests/bench/runtime_coreapis/README.md diff --git a/tests/bench_runtime_coreapis/main.c b/tests/bench/runtime_coreapis/main.c similarity index 100% rename from tests/bench_runtime_coreapis/main.c rename to tests/bench/runtime_coreapis/main.c diff --git a/tests/bench_runtime_coreapis/tests/01-run.py b/tests/bench/runtime_coreapis/tests/01-run.py similarity index 100% rename from tests/bench_runtime_coreapis/tests/01-run.py rename to tests/bench/runtime_coreapis/tests/01-run.py diff --git a/tests/bench_sched_nop/Makefile b/tests/bench/sched_nop/Makefile similarity index 64% rename from tests/bench_sched_nop/Makefile rename to tests/bench/sched_nop/Makefile index 8bff23ceea..0dfda6495d 100644 --- 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 diff --git a/tests/bench_sched_nop/README.md b/tests/bench/sched_nop/README.md similarity index 100% rename from tests/bench_sched_nop/README.md rename to tests/bench/sched_nop/README.md diff --git a/tests/bench_sched_nop/main.c b/tests/bench/sched_nop/main.c similarity index 100% rename from tests/bench_sched_nop/main.c rename to tests/bench/sched_nop/main.c diff --git a/tests/bench_sched_nop/tests/01-run.py b/tests/bench/sched_nop/tests/01-run.py similarity index 100% rename from tests/bench_sched_nop/tests/01-run.py rename to tests/bench/sched_nop/tests/01-run.py diff --git a/tests/bench_sizeof_coretypes/Makefile b/tests/bench/sizeof_coretypes/Makefile similarity index 90% rename from tests/bench_sizeof_coretypes/Makefile rename to tests/bench/sizeof_coretypes/Makefile index f14b5a7ae7..e05244b032 100644 --- 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): # diff --git a/tests/bench_sizeof_coretypes/Makefile.ci b/tests/bench/sizeof_coretypes/Makefile.ci similarity index 100% rename from tests/bench_sizeof_coretypes/Makefile.ci rename to tests/bench/sizeof_coretypes/Makefile.ci diff --git a/tests/bench_sizeof_coretypes/README.md b/tests/bench/sizeof_coretypes/README.md similarity index 100% rename from tests/bench_sizeof_coretypes/README.md rename to tests/bench/sizeof_coretypes/README.md diff --git a/tests/bench_sizeof_coretypes/main.c b/tests/bench/sizeof_coretypes/main.c similarity index 100% rename from tests/bench_sizeof_coretypes/main.c rename to tests/bench/sizeof_coretypes/main.c diff --git a/tests/bench_sizeof_coretypes/tests/01-run.py b/tests/bench/sizeof_coretypes/tests/01-run.py similarity index 100% rename from tests/bench_sizeof_coretypes/tests/01-run.py rename to tests/bench/sizeof_coretypes/tests/01-run.py diff --git a/tests/bench_sys_atomic_utils/Makefile b/tests/bench/sys_atomic_utils/Makefile similarity index 79% rename from tests/bench_sys_atomic_utils/Makefile rename to tests/bench/sys_atomic_utils/Makefile index dc9d10e24a..f72c3c5ec6 100644 --- 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 diff --git a/tests/bench_sys_atomic_utils/Makefile.ci b/tests/bench/sys_atomic_utils/Makefile.ci similarity index 100% rename from tests/bench_sys_atomic_utils/Makefile.ci rename to tests/bench/sys_atomic_utils/Makefile.ci diff --git a/tests/bench_sys_atomic_utils/README.md b/tests/bench/sys_atomic_utils/README.md similarity index 100% rename from tests/bench_sys_atomic_utils/README.md rename to tests/bench/sys_atomic_utils/README.md diff --git a/tests/bench_sys_atomic_utils/app.config.test b/tests/bench/sys_atomic_utils/app.config.test similarity index 100% rename from tests/bench_sys_atomic_utils/app.config.test rename to tests/bench/sys_atomic_utils/app.config.test diff --git a/tests/bench_sys_atomic_utils/main.c b/tests/bench/sys_atomic_utils/main.c similarity index 100% rename from tests/bench_sys_atomic_utils/main.c rename to tests/bench/sys_atomic_utils/main.c diff --git a/tests/bench_sys_base64/Makefile b/tests/bench/sys_base64/Makefile similarity index 74% rename from tests/bench_sys_base64/Makefile rename to tests/bench/sys_base64/Makefile index 98993c7b3c..28a8775ae1 100644 --- 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 diff --git a/tests/bench_sys_base64/Makefile.ci b/tests/bench/sys_base64/Makefile.ci similarity index 100% rename from tests/bench_sys_base64/Makefile.ci rename to tests/bench/sys_base64/Makefile.ci diff --git a/tests/bench_sys_base64/main.c b/tests/bench/sys_base64/main.c similarity index 100% rename from tests/bench_sys_base64/main.c rename to tests/bench/sys_base64/main.c diff --git a/tests/bench_sys_base64/tests/01-run.py b/tests/bench/sys_base64/tests/01-run.py similarity index 100% rename from tests/bench_sys_base64/tests/01-run.py rename to tests/bench/sys_base64/tests/01-run.py diff --git a/tests/bench_thread_flags_pingpong/Makefile b/tests/bench/thread_flags_pingpong/Makefile similarity index 73% rename from tests/bench_thread_flags_pingpong/Makefile rename to tests/bench/thread_flags_pingpong/Makefile index 389a406291..426cbd1e8a 100644 --- 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 diff --git a/tests/bench_thread_flags_pingpong/Makefile.ci b/tests/bench/thread_flags_pingpong/Makefile.ci similarity index 100% rename from tests/bench_thread_flags_pingpong/Makefile.ci rename to tests/bench/thread_flags_pingpong/Makefile.ci diff --git a/tests/bench_thread_flags_pingpong/README.md b/tests/bench/thread_flags_pingpong/README.md similarity index 100% rename from tests/bench_thread_flags_pingpong/README.md rename to tests/bench/thread_flags_pingpong/README.md diff --git a/tests/bench_thread_flags_pingpong/main.c b/tests/bench/thread_flags_pingpong/main.c similarity index 100% rename from tests/bench_thread_flags_pingpong/main.c rename to tests/bench/thread_flags_pingpong/main.c diff --git a/tests/bench_thread_flags_pingpong/tests/01-run.py b/tests/bench/thread_flags_pingpong/tests/01-run.py similarity index 100% rename from tests/bench_thread_flags_pingpong/tests/01-run.py rename to tests/bench/thread_flags_pingpong/tests/01-run.py diff --git a/tests/bench_thread_yield_pingpong/Makefile b/tests/bench/thread_yield_pingpong/Makefile similarity index 64% rename from tests/bench_thread_yield_pingpong/Makefile rename to tests/bench/thread_yield_pingpong/Makefile index 8bff23ceea..0dfda6495d 100644 --- 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 diff --git a/tests/bench_thread_yield_pingpong/Makefile.ci b/tests/bench/thread_yield_pingpong/Makefile.ci similarity index 100% rename from tests/bench_thread_yield_pingpong/Makefile.ci rename to tests/bench/thread_yield_pingpong/Makefile.ci diff --git a/tests/bench_thread_yield_pingpong/README.md b/tests/bench/thread_yield_pingpong/README.md similarity index 100% rename from tests/bench_thread_yield_pingpong/README.md rename to tests/bench/thread_yield_pingpong/README.md diff --git a/tests/bench_thread_yield_pingpong/main.c b/tests/bench/thread_yield_pingpong/main.c similarity index 100% rename from tests/bench_thread_yield_pingpong/main.c rename to tests/bench/thread_yield_pingpong/main.c diff --git a/tests/bench_thread_yield_pingpong/tests/01-run.py b/tests/bench/thread_yield_pingpong/tests/01-run.py similarity index 100% rename from tests/bench_thread_yield_pingpong/tests/01-run.py rename to tests/bench/thread_yield_pingpong/tests/01-run.py diff --git a/tests/bench_timers/Makefile b/tests/bench/timers/Makefile similarity index 97% rename from tests/bench_timers/Makefile rename to tests/bench/timers/Makefile index 11675236f5..4b58f1a797 100644 --- 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 diff --git a/tests/bench_timers/Makefile.ci b/tests/bench/timers/Makefile.ci similarity index 100% rename from tests/bench_timers/Makefile.ci rename to tests/bench/timers/Makefile.ci diff --git a/tests/bench_timers/README.md b/tests/bench/timers/README.md similarity index 100% rename from tests/bench_timers/README.md rename to tests/bench/timers/README.md diff --git a/tests/bench_timers/bench_timers_config.h b/tests/bench/timers/bench_timers_config.h similarity index 100% rename from tests/bench_timers/bench_timers_config.h rename to tests/bench/timers/bench_timers_config.h diff --git a/tests/bench_timers/main.c b/tests/bench/timers/main.c similarity index 100% rename from tests/bench_timers/main.c rename to tests/bench/timers/main.c diff --git a/tests/bench_timers/print_results.c b/tests/bench/timers/print_results.c similarity index 100% rename from tests/bench_timers/print_results.c rename to tests/bench/timers/print_results.c diff --git a/tests/bench_timers/print_results.h b/tests/bench/timers/print_results.h similarity index 100% rename from tests/bench_timers/print_results.h rename to tests/bench/timers/print_results.h diff --git a/tests/bench_timers/spin_random.c b/tests/bench/timers/spin_random.c similarity index 100% rename from tests/bench_timers/spin_random.c rename to tests/bench/timers/spin_random.c diff --git a/tests/bench_timers/spin_random.h b/tests/bench/timers/spin_random.h similarity index 100% rename from tests/bench_timers/spin_random.h rename to tests/bench/timers/spin_random.h diff --git a/tests/bench_xtimer/Makefile b/tests/bench/xtimer/Makefile similarity index 98% rename from tests/bench_xtimer/Makefile rename to tests/bench/xtimer/Makefile index a97237618d..ac985ffc56 100644 --- a/tests/bench_xtimer/Makefile +++ b/tests/bench/xtimer/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.bench_common USEMODULE += xtimer diff --git a/tests/bench_xtimer/Makefile.ci b/tests/bench/xtimer/Makefile.ci similarity index 100% rename from tests/bench_xtimer/Makefile.ci rename to tests/bench/xtimer/Makefile.ci diff --git a/tests/bench_xtimer/README.md b/tests/bench/xtimer/README.md similarity index 100% rename from tests/bench_xtimer/README.md rename to tests/bench/xtimer/README.md diff --git a/tests/bench_xtimer/main.c b/tests/bench/xtimer/main.c similarity index 100% rename from tests/bench_xtimer/main.c rename to tests/bench/xtimer/main.c diff --git a/tests/bench_xtimer/tests/01-run.py b/tests/bench/xtimer/tests/01-run.py similarity index 100% rename from tests/bench_xtimer/tests/01-run.py rename to tests/bench/xtimer/tests/01-run.py diff --git a/tests/bench_xtimer_load/Makefile b/tests/bench/xtimer_load/Makefile similarity index 86% rename from tests/bench_xtimer_load/Makefile rename to tests/bench/xtimer_load/Makefile index eed9837b83..6a7ffe2f2a 100644 --- 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 diff --git a/tests/bench_xtimer_load/Makefile.ci b/tests/bench/xtimer_load/Makefile.ci similarity index 100% rename from tests/bench_xtimer_load/Makefile.ci rename to tests/bench/xtimer_load/Makefile.ci diff --git a/tests/bench_xtimer_load/README.md b/tests/bench/xtimer_load/README.md similarity index 100% rename from tests/bench_xtimer_load/README.md rename to tests/bench/xtimer_load/README.md diff --git a/tests/bench_xtimer_load/main.c b/tests/bench/xtimer_load/main.c similarity index 100% rename from tests/bench_xtimer_load/main.c rename to tests/bench/xtimer_load/main.c diff --git a/tests/bench_xtimer_load/tests/01-run.py b/tests/bench/xtimer_load/tests/01-run.py similarity index 100% rename from tests/bench_xtimer_load/tests/01-run.py rename to tests/bench/xtimer_load/tests/01-run.py diff --git a/tests/bench_ztimer/Makefile b/tests/bench/ztimer/Makefile similarity index 98% rename from tests/bench_ztimer/Makefile rename to tests/bench/ztimer/Makefile index 79fba8c1b0..8fbf5819bf 100644 --- 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 diff --git a/tests/bench_ztimer/Makefile.ci b/tests/bench/ztimer/Makefile.ci similarity index 100% rename from tests/bench_ztimer/Makefile.ci rename to tests/bench/ztimer/Makefile.ci diff --git a/tests/bench_ztimer/README.md b/tests/bench/ztimer/README.md similarity index 100% rename from tests/bench_ztimer/README.md rename to tests/bench/ztimer/README.md diff --git a/tests/bench_ztimer/main.c b/tests/bench/ztimer/main.c similarity index 100% rename from tests/bench_ztimer/main.c rename to tests/bench/ztimer/main.c diff --git a/tests/bench_ztimer/tests/01-run.py b/tests/bench/ztimer/tests/01-run.py similarity index 100% rename from tests/bench_ztimer/tests/01-run.py rename to tests/bench/ztimer/tests/01-run.py diff --git a/tests/lua_loader/Makefile b/tests/pkg/lua_loader/Makefile similarity index 92% rename from tests/lua_loader/Makefile rename to tests/pkg/lua_loader/Makefile index ef7a3aa5d5..8da433edeb 100644 --- a/tests/lua_loader/Makefile +++ b/tests/pkg/lua_loader/Makefile @@ -1,4 +1,4 @@ -include ../Makefile.tests_common +include ../Makefile.pkg_common USEPKG += lua diff --git a/tests/lua_loader/Makefile.ci b/tests/pkg/lua_loader/Makefile.ci similarity index 100% rename from tests/lua_loader/Makefile.ci rename to tests/pkg/lua_loader/Makefile.ci diff --git a/tests/lua_loader/README b/tests/pkg/lua_loader/README similarity index 100% rename from tests/lua_loader/README rename to tests/pkg/lua_loader/README diff --git a/tests/lua_loader/app.config.test b/tests/pkg/lua_loader/app.config.test similarity index 100% rename from tests/lua_loader/app.config.test rename to tests/pkg/lua_loader/app.config.test diff --git a/tests/lua_loader/cmodules.c b/tests/pkg/lua_loader/cmodules.c similarity index 100% rename from tests/lua_loader/cmodules.c rename to tests/pkg/lua_loader/cmodules.c diff --git a/tests/lua_loader/main.c b/tests/pkg/lua_loader/main.c similarity index 100% rename from tests/lua_loader/main.c rename to tests/pkg/lua_loader/main.c diff --git a/tests/lua_loader/tests/01-run.py b/tests/pkg/lua_loader/tests/01-run.py similarity index 100% rename from tests/lua_loader/tests/01-run.py rename to tests/pkg/lua_loader/tests/01-run.py