tests: remove uneeded DISABLE_MODULE+=auto_init

RIOT-OS · Feb 12, 2020 · e0855de · e0855de
1 parent 7bfb855
commit e0855de
Show file tree

Hide file tree

Showing 53 changed files with 10 additions and 143 deletions.
diff --git 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
@@ -22,8 +22,6 @@
 #include <string.h>
 #include <inttypes.h>
 
-#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -23,8 +23,6 @@
 #include <stdio.h>
 #include <math.h>
 
-#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
@@ -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
@@ -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
@@ -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
@@ -22,8 +22,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -25,16 +25,13 @@
 
 #include "log.h"
 #include "msg.h"
-#include "test_utils/interactive_sync.h"
 
 #define MSG_QUEUE_LENGTH                (8)
 
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,3 @@
 include ../Makefile.tests_common
 
-DISABLE_MODULE += auto_init
-
 include $(RIOTBASE)/Makefile.include