From e0855dedfde67f2be3c4eba6db8833de5f53d871 Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Thu, 16 Jan 2020 11:01:59 +0100 Subject: [PATCH] tests: remove uneeded DISABLE_MODULE+=auto_init --- tests/bloom_bytes/Makefile | 2 +- tests/bloom_bytes/main.c | 6 ------ tests/cpp_ctors/Makefile | 2 -- tests/cpp_ctors/main.c | 3 --- tests/driver_at86rf2xx/Makefile | 2 +- tests/driver_at86rf2xx/main.c | 1 - tests/float/Makefile | 2 -- tests/float/main.c | 4 ---- tests/gnrc_sixlowpan_frag/Makefile | 2 +- tests/gnrc_sixlowpan_frag/main.c | 6 ------ tests/lwip_sock_ip/Makefile | 2 +- tests/lwip_sock_ip/main.c | 4 ---- tests/lwip_sock_ip/stack.c | 1 - tests/lwip_sock_tcp/Makefile | 2 +- tests/lwip_sock_tcp/main.c | 4 ---- tests/lwip_sock_udp/Makefile | 2 +- tests/lwip_sock_udp/main.c | 5 ----- tests/lwip_sock_udp/stack.c | 1 - tests/msg_avail/Makefile | 2 -- tests/msg_avail/main.c | 3 --- tests/mutex_unlock_and_sleep/Makefile | 2 -- tests/mutex_unlock_and_sleep/main.c | 4 ---- tests/netdev_test/Makefile | 2 +- tests/netdev_test/main.c | 4 ---- tests/posix_semaphore/Makefile | 2 -- tests/posix_semaphore/main.c | 5 ----- tests/shell/Makefile | 1 - tests/shell/main.c | 4 ---- tests/socket_zep/Makefile | 2 -- tests/socket_zep/main.c | 4 ---- tests/struct_tm_utility/Makefile | 2 -- tests/thread_basic/Makefile | 2 -- tests/thread_basic/main.c | 4 ---- tests/thread_cooperation/Makefile | 2 -- tests/thread_cooperation/main.c | 4 ---- tests/thread_exit/Makefile | 2 -- tests/thread_exit/main.c | 3 --- tests/thread_flood/Makefile | 2 -- tests/thread_flood/main.c | 4 ---- tests/thread_msg/Makefile | 2 -- tests/thread_msg/main.c | 4 ---- tests/thread_msg_block_race/Makefile | 4 +++- tests/thread_msg_block_race/main.c | 4 ---- tests/thread_msg_block_w_queue/Makefile | 2 -- tests/thread_msg_block_w_queue/main.c | 4 ---- tests/thread_msg_block_wo_queue/Makefile | 2 -- tests/thread_msg_block_wo_queue/main.c | 4 ---- tests/thread_msg_seq/Makefile | 2 -- tests/thread_msg_seq/main.c | 4 ---- tests/thread_race/Makefile | 2 -- tests/thread_race/main.c | 4 ---- tests/thread_zombie/Makefile | 1 - tests/thread_zombie/main.c | 3 --- 53 files changed, 10 insertions(+), 143 deletions(-) diff --git a/tests/bloom_bytes/Makefile b/tests/bloom_bytes/Makefile index b13ed4f8e5b2..a72dd44af175 100644 --- a/tests/bloom_bytes/Makefile +++ b/tests/bloom_bytes/Makefile @@ -7,6 +7,6 @@ USEMODULE += xtimer USEMODULE += fmt -DISABLE_MODULE += auto_init +DISABLE_MODULE += auto_init_random include $(RIOTBASE)/Makefile.include diff --git a/tests/bloom_bytes/main.c b/tests/bloom_bytes/main.c index 0ab9940630aa..95990d72b636 100644 --- a/tests/bloom_bytes/main.c +++ b/tests/bloom_bytes/main.c @@ -22,8 +22,6 @@ #include #include -#include "test_utils/interactive_sync.h" - #include "xtimer.h" #include "fmt.h" @@ -61,12 +59,8 @@ static void buf_fill(uint32_t *buf, int len) int main(void) { - xtimer_init(); - bloom_init(&bloom, BLOOM_BITS, bf, hashes, BLOOM_HASHF); - test_utils_interactive_sync(); - printf("Testing Bloom filter.\n\n"); printf("m: %" PRIu32 " k: %" PRIu32 "\n\n", (uint32_t) bloom.m, (uint32_t) bloom.k); diff --git a/tests/cpp_ctors/Makefile b/tests/cpp_ctors/Makefile index d6193fee040f..529d26727ba1 100644 --- a/tests/cpp_ctors/Makefile +++ b/tests/cpp_ctors/Makefile @@ -4,6 +4,4 @@ USEMODULE += embunit FEATURES_REQUIRED += cpp -DISABLE_MODULE += auto_init - include $(RIOTBASE)/Makefile.include diff --git a/tests/cpp_ctors/main.c b/tests/cpp_ctors/main.c index 184f5a6a15bb..93316164f424 100644 --- a/tests/cpp_ctors/main.c +++ b/tests/cpp_ctors/main.c @@ -9,7 +9,6 @@ #include "embUnit.h" #include "tests-cpp_ctors.h" #include "thread.h" /* For thread_getpid() */ -#include "test_utils/interactive_sync.h" long tests_cpp_ctors_global_value(void); long tests_cpp_ctors_static_value(void); @@ -59,8 +58,6 @@ Test *tests_cpp_ctors_tests(void) int main(void) { - test_utils_interactive_sync(); - TESTS_START(); TESTS_RUN(tests_cpp_ctors_tests()); TESTS_END(); diff --git a/tests/driver_at86rf2xx/Makefile b/tests/driver_at86rf2xx/Makefile index 41e0d01b780d..76daf8471920 100644 --- a/tests/driver_at86rf2xx/Makefile +++ b/tests/driver_at86rf2xx/Makefile @@ -1,6 +1,6 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init +DISABLE_MODULE += auto_init_at86rf2xx USEMODULE += od USEMODULE += shell diff --git a/tests/driver_at86rf2xx/main.c b/tests/driver_at86rf2xx/main.c index 7f1dace64dcc..7edab95bb543 100644 --- a/tests/driver_at86rf2xx/main.c +++ b/tests/driver_at86rf2xx/main.c @@ -88,7 +88,6 @@ void *_recv_thread(void *arg) int main(void) { puts("AT86RF2xx device driver test"); - xtimer_init(); unsigned dev_success = 0; for (unsigned i = 0; i < AT86RF2XX_NUM; i++) { diff --git a/tests/float/Makefile b/tests/float/Makefile index 912674a586e3..86969ac9ac98 100644 --- a/tests/float/Makefile +++ b/tests/float/Makefile @@ -1,7 +1,5 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init - # for native we can go do a couple of more operations in reasonable time... ifneq (,$(filter native,$(BOARD))) CFLAGS += -DTEST_ITER=100000000 diff --git a/tests/float/main.c b/tests/float/main.c index 8216d29cb4be..55cd4d238ff8 100644 --- a/tests/float/main.c +++ b/tests/float/main.c @@ -23,8 +23,6 @@ #include #include -#include "test_utils/interactive_sync.h" - #include "board.h" /* as default we run the test 100k times */ @@ -36,8 +34,6 @@ int main(void) { - test_utils_interactive_sync(); - double x = 1234567.0 / 1024.0; puts("Testing floating point arithmetic...\n"); diff --git a/tests/gnrc_sixlowpan_frag/Makefile b/tests/gnrc_sixlowpan_frag/Makefile index c9272409bed2..9f0bd1b176da 100644 --- a/tests/gnrc_sixlowpan_frag/Makefile +++ b/tests/gnrc_sixlowpan_frag/Makefile @@ -4,7 +4,7 @@ USEMODULE += gnrc_sixlowpan_frag USEMODULE += embunit # GNRC modules should not be initialized unless we want to -DISABLE_MODULE += auto_init +DISABLE_MODULE += auto_init_gnrc_% # we don't need all this packet buffer space so reduce it a little CFLAGS += -DTEST_SUITES -DGNRC_PKTBUF_SIZE=2048 diff --git a/tests/gnrc_sixlowpan_frag/main.c b/tests/gnrc_sixlowpan_frag/main.c index 51f1d69d634d..04dac0dc4dae 100644 --- a/tests/gnrc_sixlowpan_frag/main.c +++ b/tests/gnrc_sixlowpan_frag/main.c @@ -25,8 +25,6 @@ #include "net/gnrc/sixlowpan/frag/rb.h" #include "xtimer.h" -#include "test_utils/interactive_sync.h" - #define TEST_NETIF_HDR_SRC { 0xb3, 0x47, 0x60, 0x49, \ 0x78, 0xfe, 0x95, 0x48 } #define TEST_NETIF_HDR_DST { 0xa4, 0xf2, 0xd2, 0xc9, \ @@ -648,10 +646,6 @@ static void run_unittests(void) int main(void) { - test_utils_interactive_sync(); - - /* no auto-init, so xtimer needs to be initialized manually*/ - xtimer_init(); /* netreg requires queue, but queue size one should be enough for us */ msg_init_queue(&_msg_queue, 1U); run_unittests(); diff --git a/tests/lwip_sock_ip/Makefile b/tests/lwip_sock_ip/Makefile index 97674d2201e1..4a7410dc4646 100644 --- a/tests/lwip_sock_ip/Makefile +++ b/tests/lwip_sock_ip/Makefile @@ -25,7 +25,7 @@ USEMODULE += netdev_eth USEMODULE += netdev_test USEMODULE += ps -DISABLE_MODULE += auto_init +DISABLE_MODULE += auto_init_lwip CFLAGS += -DSO_REUSE CFLAGS += -DLWIP_SO_RCVTIMEO diff --git a/tests/lwip_sock_ip/main.c b/tests/lwip_sock_ip/main.c index 9e1097ab821c..638ca9057b4f 100644 --- a/tests/lwip_sock_ip/main.c +++ b/tests/lwip_sock_ip/main.c @@ -22,8 +22,6 @@ #include #include -#include "test_utils/interactive_sync.h" - #include "net/sock/ip.h" #include "xtimer.h" @@ -1083,8 +1081,6 @@ int main(void) { uint8_t code = 0; - test_utils_interactive_sync(); - #ifdef SO_REUSE code |= 1; #endif diff --git a/tests/lwip_sock_ip/stack.c b/tests/lwip_sock_ip/stack.c index 308131491b54..8adac0d43a0b 100644 --- a/tests/lwip_sock_ip/stack.c +++ b/tests/lwip_sock_ip/stack.c @@ -137,7 +137,6 @@ static int _netdev_send(netdev_t *dev, const iolist_t *iolist) void _net_init(void) { - xtimer_init(); msg_init_queue(_msg_queue, _MSG_QUEUE_SIZE); _check_pid = sched_active_pid; diff --git a/tests/lwip_sock_tcp/Makefile b/tests/lwip_sock_tcp/Makefile index a746d2694d1b..77f741bc0842 100644 --- a/tests/lwip_sock_tcp/Makefile +++ b/tests/lwip_sock_tcp/Makefile @@ -24,7 +24,7 @@ USEMODULE += netdev_eth USEMODULE += netdev_test USEMODULE += ps -DISABLE_MODULE += auto_init +DISABLE_MODULE += auto_init_lwip CFLAGS += -DSO_REUSE CFLAGS += -DLWIP_SO_RCVTIMEO diff --git a/tests/lwip_sock_tcp/main.c b/tests/lwip_sock_tcp/main.c index 88b9352c61fc..5b98ce214283 100644 --- a/tests/lwip_sock_tcp/main.c +++ b/tests/lwip_sock_tcp/main.c @@ -33,8 +33,6 @@ #include "constants.h" #include "stack.h" -#include "test_utils/interactive_sync.h" - #define _TEST_BUFFER_SIZE (128) #define _QUEUE_SIZE (1) @@ -960,8 +958,6 @@ static void test_tcp_write6__success(void) int main(void) { - test_utils_interactive_sync(); - uint8_t code = 0; #ifdef SO_REUSE diff --git a/tests/lwip_sock_udp/Makefile b/tests/lwip_sock_udp/Makefile index 109bc715d9ce..eb256cc9d6bc 100644 --- a/tests/lwip_sock_udp/Makefile +++ b/tests/lwip_sock_udp/Makefile @@ -25,7 +25,7 @@ USEMODULE += netdev_eth USEMODULE += netdev_test USEMODULE += ps -DISABLE_MODULE += auto_init +DISABLE_MODULE += auto_init_lwip CFLAGS += -DSO_REUSE CFLAGS += -DLWIP_SO_RCVTIMEO diff --git a/tests/lwip_sock_udp/main.c b/tests/lwip_sock_udp/main.c index 25aa415dcacd..ed4eec7d18ba 100644 --- a/tests/lwip_sock_udp/main.c +++ b/tests/lwip_sock_udp/main.c @@ -28,8 +28,6 @@ #include "constants.h" #include "stack.h" -#include "test_utils/interactive_sync.h" - #define _TEST_BUFFER_SIZE (128) static uint8_t _test_buffer[_TEST_BUFFER_SIZE]; @@ -1319,8 +1317,6 @@ static void test_sock_udp_send6__no_sock(void) int main(void) { - test_utils_interactive_sync(); - uint8_t code = 0; #ifdef SO_REUSE @@ -1333,7 +1329,6 @@ int main(void) code |= (1 << 6); #endif printf("code 0x%02x\n", code); - xtimer_init(); _net_init(); tear_down(); #ifdef MODULE_LWIP_IPV4 diff --git a/tests/lwip_sock_udp/stack.c b/tests/lwip_sock_udp/stack.c index 0233043badbb..981c43ce0d2d 100644 --- a/tests/lwip_sock_udp/stack.c +++ b/tests/lwip_sock_udp/stack.c @@ -140,7 +140,6 @@ static int _netdev_send(netdev_t *dev, const iolist_t *iolist) void _net_init(void) { - xtimer_init(); msg_init_queue(_msg_queue, _MSG_QUEUE_SIZE); _check_pid = sched_active_pid; diff --git a/tests/msg_avail/Makefile b/tests/msg_avail/Makefile index 18b41ca54b84..24bb48165705 100644 --- a/tests/msg_avail/Makefile +++ b/tests/msg_avail/Makefile @@ -1,5 +1,3 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init - include $(RIOTBASE)/Makefile.include diff --git a/tests/msg_avail/main.c b/tests/msg_avail/main.c index 3a9a2cde7153..9ec6e6f6bb6d 100644 --- a/tests/msg_avail/main.c +++ b/tests/msg_avail/main.c @@ -25,7 +25,6 @@ #include "log.h" #include "msg.h" -#include "test_utils/interactive_sync.h" #define MSG_QUEUE_LENGTH (8) @@ -33,8 +32,6 @@ msg_t msg_queue[MSG_QUEUE_LENGTH]; int main(void) { - test_utils_interactive_sync(); - msg_t msges[MSG_QUEUE_LENGTH]; msg_init_queue(msg_queue, MSG_QUEUE_LENGTH); diff --git a/tests/mutex_unlock_and_sleep/Makefile b/tests/mutex_unlock_and_sleep/Makefile index 7cc33e6164e6..bc648d8a13eb 100644 --- a/tests/mutex_unlock_and_sleep/Makefile +++ b/tests/mutex_unlock_and_sleep/Makefile @@ -1,7 +1,5 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init - # stm32f030f4-demo doesn't have enough RAM to run the test # so we reduce the stack size for every thread ifneq (,$(filter stm32f030f4-demo,$(BOARD))) diff --git a/tests/mutex_unlock_and_sleep/main.c b/tests/mutex_unlock_and_sleep/main.c index 891940a01b67..3ef949f78056 100644 --- a/tests/mutex_unlock_and_sleep/main.c +++ b/tests/mutex_unlock_and_sleep/main.c @@ -22,8 +22,6 @@ #include "thread.h" #include "mutex.h" -#include "test_utils/interactive_sync.h" - static mutex_t mutex = MUTEX_INIT; static volatile int indicator; static kernel_pid_t main_pid; @@ -49,8 +47,6 @@ static void *second_thread(void *arg) int main(void) { - test_utils_interactive_sync(); - uint32_t count = 0; uint32_t kcount = 0; diff --git a/tests/netdev_test/Makefile b/tests/netdev_test/Makefile index ea9ec1cf8892..7cf3152dfa2f 100644 --- a/tests/netdev_test/Makefile +++ b/tests/netdev_test/Makefile @@ -4,7 +4,7 @@ CFLAGS += -DNDEBUG include ../Makefile.tests_common -DISABLE_MODULE = auto_init +DISABLE_MODULE += auto_init_gnrc_% USEMODULE += gnrc USEMODULE += gnrc_neterr diff --git a/tests/netdev_test/main.c b/tests/netdev_test/main.c index 1a17519e799a..2ba913765fd5 100644 --- a/tests/netdev_test/main.c +++ b/tests/netdev_test/main.c @@ -28,8 +28,6 @@ #include "thread.h" #include "utlist.h" -#include "test_utils/interactive_sync.h" - #define _EXP_LENGTH (64) #define _MAC_STACKSIZE (THREAD_STACKSIZE_DEFAULT + THREAD_EXTRA_STACKSIZE_PRINTF) @@ -251,8 +249,6 @@ static int test_set_addr(void) int main(void) { - test_utils_interactive_sync(); - /* initialization */ gnrc_pktbuf_init(); msg_init_queue(_main_msg_queue, _MAIN_MSG_QUEUE_SIZE); diff --git a/tests/posix_semaphore/Makefile b/tests/posix_semaphore/Makefile index bd973dc664b4..921a3c876c15 100644 --- a/tests/posix_semaphore/Makefile +++ b/tests/posix_semaphore/Makefile @@ -3,6 +3,4 @@ include ../Makefile.tests_common USEMODULE += fmt USEMODULE += posix_semaphore -DISABLE_MODULE += auto_init - include $(RIOTBASE)/Makefile.include diff --git a/tests/posix_semaphore/main.c b/tests/posix_semaphore/main.c index 9f5b54fe82be..6ec3232b6b64 100644 --- a/tests/posix_semaphore/main.c +++ b/tests/posix_semaphore/main.c @@ -32,8 +32,6 @@ #include "thread.h" #include "xtimer.h" -#include "test_utils/interactive_sync.h" - #define SEMAPHORE_MSG_QUEUE_SIZE (8) #define SEMAPHORE_TEST_THREADS (5) static char test1_thread_stack[THREAD_STACKSIZE_MAIN]; @@ -294,10 +292,7 @@ void test4(void) int main(void) { - test_utils_interactive_sync(); - msg_init_queue(main_msg_queue, SEMAPHORE_MSG_QUEUE_SIZE); - xtimer_init(); puts("######################### TEST1:"); test1(); puts("######################### TEST2:"); diff --git a/tests/shell/Makefile b/tests/shell/Makefile index 1f24e1e9471e..110f1f28ac6c 100644 --- a/tests/shell/Makefile +++ b/tests/shell/Makefile @@ -9,7 +9,6 @@ USEMODULE += ps # Use a terminal that does not introduce extra characters into the stream. RIOT_TERMINAL ?= socat -DISABLE_MODULE += auto_init DISABLE_MODULE += test_utils_interactive_sync # chronos is missing a getchar implementation diff --git a/tests/shell/main.c b/tests/shell/main.c index 8f2cf7cc342c..b2bdc096a076 100644 --- a/tests/shell/main.c +++ b/tests/shell/main.c @@ -68,10 +68,6 @@ int main(void) printf("test_shell.\n"); -#if MODULE_STDIO_RTT - xtimer_init(); -#endif - /* define buffer to be used by the shell */ char line_buf[SHELL_DEFAULT_BUFSIZE]; diff --git a/tests/socket_zep/Makefile b/tests/socket_zep/Makefile index b4143a45bf82..ce9afc7c5ff8 100644 --- a/tests/socket_zep/Makefile +++ b/tests/socket_zep/Makefile @@ -6,8 +6,6 @@ BOARD_WHITELIST = native # socket_zep is only available on native # ZEP: Unable to connect socket: Cannot assign requested address TEST_ON_CI_BLACKLIST += native -DISABLE_MODULE += auto_init - USEMODULE += od USEMODULE += socket_zep diff --git a/tests/socket_zep/main.c b/tests/socket_zep/main.c index 25d087d2de64..d5e9ee382303 100644 --- a/tests/socket_zep/main.c +++ b/tests/socket_zep/main.c @@ -31,8 +31,6 @@ #include "msg.h" #include "od.h" -#include "test_utils/interactive_sync.h" - #define MSG_QUEUE_SIZE (8) #define MSG_TYPE_ISR (0x3456) #define RECVBUF_SIZE (IEEE802154_FRAME_LEN_MAX) @@ -106,8 +104,6 @@ static void test_recv(void) int main(void) { - test_utils_interactive_sync(); - puts("Socket ZEP device driver test"); msg_init_queue(_msg_queue, MSG_QUEUE_SIZE); _main_pid = sched_active_pid; diff --git a/tests/struct_tm_utility/Makefile b/tests/struct_tm_utility/Makefile index 5b2bf84c2c9e..3a0b8405c271 100644 --- a/tests/struct_tm_utility/Makefile +++ b/tests/struct_tm_utility/Makefile @@ -1,7 +1,5 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init - USEMODULE += shell USEMODULE += shell_commands USEMODULE += timex diff --git a/tests/thread_basic/Makefile b/tests/thread_basic/Makefile index 18b41ca54b84..24bb48165705 100644 --- a/tests/thread_basic/Makefile +++ b/tests/thread_basic/Makefile @@ -1,5 +1,3 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init - include $(RIOTBASE)/Makefile.include diff --git a/tests/thread_basic/main.c b/tests/thread_basic/main.c index 46a59724d092..457668095a7b 100644 --- a/tests/thread_basic/main.c +++ b/tests/thread_basic/main.c @@ -21,8 +21,6 @@ #include #include "thread.h" -#include "test_utils/interactive_sync.h" - char t2_stack[THREAD_STACKSIZE_MAIN]; void *second_thread(void *arg) @@ -34,8 +32,6 @@ void *second_thread(void *arg) int main(void) { - test_utils_interactive_sync(); - (void) thread_create( t2_stack, sizeof(t2_stack), THREAD_PRIORITY_MAIN - 1, diff --git a/tests/thread_cooperation/Makefile b/tests/thread_cooperation/Makefile index 001ee97168b3..e5cde12ccf93 100644 --- a/tests/thread_cooperation/Makefile +++ b/tests/thread_cooperation/Makefile @@ -1,7 +1,5 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init - ifneq (,$(filter nucleo-f042k6,$(BOARD))) PROBLEM ?= 3 endif diff --git a/tests/thread_cooperation/main.c b/tests/thread_cooperation/main.c index 1466bf5e4c5e..ec20e0cf772a 100644 --- a/tests/thread_cooperation/main.c +++ b/tests/thread_cooperation/main.c @@ -25,8 +25,6 @@ #include "thread.h" #include "mutex.h" -#include "test_utils/interactive_sync.h" - #ifndef PROBLEM #define PROBLEM 12 #endif @@ -66,8 +64,6 @@ int main(void) kernel_pid_t ths; uint32_t factorial = 1; - test_utils_interactive_sync(); - printf("[START] compute %d! (factorial).\n", PROBLEM); for (int i = 0; i < PROBLEM; ++i) { diff --git a/tests/thread_exit/Makefile b/tests/thread_exit/Makefile index 18b41ca54b84..24bb48165705 100644 --- a/tests/thread_exit/Makefile +++ b/tests/thread_exit/Makefile @@ -1,5 +1,3 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init - include $(RIOTBASE)/Makefile.include diff --git a/tests/thread_exit/main.c b/tests/thread_exit/main.c index ffe8c838d3b7..ed4b040bfdfc 100644 --- a/tests/thread_exit/main.c +++ b/tests/thread_exit/main.c @@ -22,8 +22,6 @@ #include "thread.h" -#include "test_utils/interactive_sync.h" - char second_thread_stack[THREAD_STACKSIZE_MAIN]; char third_thread_stack[THREAD_STACKSIZE_MAIN]; @@ -80,7 +78,6 @@ void *second_thread(void *arg) int main(void) { - test_utils_interactive_sync(); puts("main: starting"); if ((thread_create( diff --git a/tests/thread_flood/Makefile b/tests/thread_flood/Makefile index 18b41ca54b84..24bb48165705 100644 --- a/tests/thread_flood/Makefile +++ b/tests/thread_flood/Makefile @@ -1,5 +1,3 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init - include $(RIOTBASE)/Makefile.include diff --git a/tests/thread_flood/main.c b/tests/thread_flood/main.c index bb442e58e43b..bfc58d1c5c40 100644 --- a/tests/thread_flood/main.c +++ b/tests/thread_flood/main.c @@ -27,8 +27,6 @@ #include "thread.h" #include "kernel_types.h" -#include "test_utils/interactive_sync.h" - /* One stack for all threads. DON'T TRY THIS AT HOME!! */ static char dummy_stack[THREAD_STACKSIZE_IDLE]; @@ -39,8 +37,6 @@ static void *thread_func(void *arg) int main(void) { - test_utils_interactive_sync(); - kernel_pid_t thr_id = KERNEL_PID_UNDEF; unsigned thr_cnt = 0; diff --git a/tests/thread_msg/Makefile b/tests/thread_msg/Makefile index 18b41ca54b84..24bb48165705 100644 --- a/tests/thread_msg/Makefile +++ b/tests/thread_msg/Makefile @@ -1,5 +1,3 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init - include $(RIOTBASE)/Makefile.include diff --git a/tests/thread_msg/main.c b/tests/thread_msg/main.c index fcbbbf0f63f7..353238746ee8 100644 --- a/tests/thread_msg/main.c +++ b/tests/thread_msg/main.c @@ -24,8 +24,6 @@ #include "thread.h" #include "msg.h" -#include "test_utils/interactive_sync.h" - char t1_stack[THREAD_STACKSIZE_MAIN]; char t2_stack[THREAD_STACKSIZE_MAIN]; char t3_stack[THREAD_STACKSIZE_MAIN]; @@ -87,8 +85,6 @@ void *thread3(void *arg) int main(void) { - test_utils_interactive_sync(); - p_main = sched_active_pid; p1 = thread_create(t1_stack, sizeof(t1_stack), THREAD_PRIORITY_MAIN - 1, THREAD_CREATE_WOUT_YIELD | THREAD_CREATE_STACKTEST, diff --git a/tests/thread_msg_block_race/Makefile b/tests/thread_msg_block_race/Makefile index c09496855842..d2f4d33b0c37 100644 --- a/tests/thread_msg_block_race/Makefile +++ b/tests/thread_msg_block_race/Makefile @@ -2,7 +2,9 @@ DEVELHELP := 1 include ../Makefile.tests_common -DISABLE_MODULE += auto_init +DISABLE_MODULE += auto_init_xtimer +DISABLE_MODULE += auto_init_random + FEATURES_REQUIRED += periph_timer USEMODULE += random diff --git a/tests/thread_msg_block_race/main.c b/tests/thread_msg_block_race/main.c index 041b6514e9fa..39ff14de3d22 100644 --- a/tests/thread_msg_block_race/main.c +++ b/tests/thread_msg_block_race/main.c @@ -27,8 +27,6 @@ #include "thread.h" #include "msg.h" -#include "test_utils/interactive_sync.h" - #define CANARY_TYPE (0x21fd) #define TIMER_FREQ (1000000LU) @@ -81,8 +79,6 @@ static void *_thread(void *arg) int main(void) { - test_utils_interactive_sync(); - kernel_pid_t pid; timer_init(TIMER_DEV(0), TIMER_FREQ, _timer, NULL); diff --git a/tests/thread_msg_block_w_queue/Makefile b/tests/thread_msg_block_w_queue/Makefile index 18b41ca54b84..24bb48165705 100644 --- a/tests/thread_msg_block_w_queue/Makefile +++ b/tests/thread_msg_block_w_queue/Makefile @@ -1,5 +1,3 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init - include $(RIOTBASE)/Makefile.include diff --git a/tests/thread_msg_block_w_queue/main.c b/tests/thread_msg_block_w_queue/main.c index 8e2385a21bf7..cd1245d94a62 100644 --- a/tests/thread_msg_block_w_queue/main.c +++ b/tests/thread_msg_block_w_queue/main.c @@ -25,8 +25,6 @@ #include "thread.h" #include "msg.h" -#include "test_utils/interactive_sync.h" - char t1_stack[THREAD_STACKSIZE_MAIN]; kernel_pid_t p_send = KERNEL_PID_UNDEF, p_recv = KERNEL_PID_UNDEF; @@ -56,8 +54,6 @@ void *sender_thread(void *arg) int main(void) { - test_utils_interactive_sync(); - msg_t msg; p_recv = sched_active_pid; diff --git a/tests/thread_msg_block_wo_queue/Makefile b/tests/thread_msg_block_wo_queue/Makefile index 18b41ca54b84..24bb48165705 100644 --- a/tests/thread_msg_block_wo_queue/Makefile +++ b/tests/thread_msg_block_wo_queue/Makefile @@ -1,5 +1,3 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init - include $(RIOTBASE)/Makefile.include diff --git a/tests/thread_msg_block_wo_queue/main.c b/tests/thread_msg_block_wo_queue/main.c index 4cbb9dd64f59..28631e22c247 100644 --- a/tests/thread_msg_block_wo_queue/main.c +++ b/tests/thread_msg_block_wo_queue/main.c @@ -25,8 +25,6 @@ #include "thread.h" #include "msg.h" -#include "test_utils/interactive_sync.h" - char t1_stack[THREAD_STACKSIZE_MAIN]; kernel_pid_t p_send = KERNEL_PID_UNDEF, p_recv = KERNEL_PID_UNDEF; @@ -56,8 +54,6 @@ void *thread1(void *arg) int main(void) { - test_utils_interactive_sync(); - msg_t msg; p_recv = sched_active_pid; diff --git a/tests/thread_msg_seq/Makefile b/tests/thread_msg_seq/Makefile index 18b41ca54b84..24bb48165705 100644 --- a/tests/thread_msg_seq/Makefile +++ b/tests/thread_msg_seq/Makefile @@ -1,5 +1,3 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init - include $(RIOTBASE)/Makefile.include diff --git a/tests/thread_msg_seq/main.c b/tests/thread_msg_seq/main.c index ae868d48cd06..d8303238154c 100644 --- a/tests/thread_msg_seq/main.c +++ b/tests/thread_msg_seq/main.c @@ -25,8 +25,6 @@ #include "thread.h" #include "msg.h" -#include "test_utils/interactive_sync.h" - char t1_stack[THREAD_STACKSIZE_MAIN]; char t2_stack[THREAD_STACKSIZE_MAIN]; char t3_stack[THREAD_STACKSIZE_MAIN]; @@ -53,8 +51,6 @@ void *sub_thread(void *arg) int main(void) { - test_utils_interactive_sync(); - puts("START"); msg_t msg; diff --git a/tests/thread_race/Makefile b/tests/thread_race/Makefile index 7cc33e6164e6..bc648d8a13eb 100644 --- a/tests/thread_race/Makefile +++ b/tests/thread_race/Makefile @@ -1,7 +1,5 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init - # stm32f030f4-demo doesn't have enough RAM to run the test # so we reduce the stack size for every thread ifneq (,$(filter stm32f030f4-demo,$(BOARD))) diff --git a/tests/thread_race/main.c b/tests/thread_race/main.c index 91809796e665..eb0f3332a058 100644 --- a/tests/thread_race/main.c +++ b/tests/thread_race/main.c @@ -26,8 +26,6 @@ #include "sched.h" #include "thread.h" -#include "test_utils/interactive_sync.h" - char iqr_check_stack[THREAD_STACKSIZE_DEFAULT]; static volatile uint8_t irq_occurred; @@ -67,8 +65,6 @@ static void _spin(void) int main(void) { - test_utils_interactive_sync(); - puts("Context swap race condition test application"); kernel_pid_t pid; diff --git a/tests/thread_zombie/Makefile b/tests/thread_zombie/Makefile index c798269d7336..b92b2878f5c3 100644 --- a/tests/thread_zombie/Makefile +++ b/tests/thread_zombie/Makefile @@ -1,6 +1,5 @@ include ../Makefile.tests_common -DISABLE_MODULE += auto_init # For better testing use ps #USEMODULE += ps diff --git a/tests/thread_zombie/main.c b/tests/thread_zombie/main.c index b92dd88853a7..b2880fa0ffd5 100644 --- a/tests/thread_zombie/main.c +++ b/tests/thread_zombie/main.c @@ -20,7 +20,6 @@ #include #include "thread.h" -#include "test_utils/interactive_sync.h" #ifdef MODULE_PS #include "ps.h" #endif /* MODULE_PS */ @@ -45,8 +44,6 @@ void *second_thread(void *arg) int main(void) { - test_utils_interactive_sync(); - /* save thread count on test start */ int current_thread_count; int start_thread_count = sched_num_threads;