From 52fadaf23a2ac338b4385f50d73f74d00ae2cb43 Mon Sep 17 00:00:00 2001 From: smlng <s@mlng.net> Date: Fri, 20 Jan 2017 17:19:35 +0100 Subject: [PATCH] tests: remove redundant board and quiet statements --- tests/conn_ip/Makefile | 4 ---- tests/cpp11_condition_variable/Makefile | 6 ------ tests/cpp11_mutex/Makefile | 6 ------ tests/cpp11_thread/Makefile | 6 ------ tests/emb6/Makefile | 2 -- tests/fault_handler/Makefile | 6 ------ tests/gnrc_ipv6_ext/Makefile | 6 ------ tests/gnrc_sixlowpan/Makefile | 6 ------ tests/gnrc_sock_ip/Makefile | 4 ---- tests/gnrc_sock_udp/Makefile | 4 ---- tests/lwip/Makefile | 2 -- tests/malloc/Makefile | 6 ------ tests/minimal/Makefile | 6 ------ tests/od/Makefile | 6 ------ tests/periph_rtc/Makefile | 2 +- tests/xtimer_periodic_wakeup/Makefile | 1 - tests/xtimer_remove/Makefile | 1 - tests/xtimer_reset/Makefile | 1 - tests/zep/Makefile | 1 - 19 files changed, 1 insertion(+), 75 deletions(-) diff --git a/tests/conn_ip/Makefile b/tests/conn_ip/Makefile index e488478b72..dec3f7463c 100644 --- a/tests/conn_ip/Makefile +++ b/tests/conn_ip/Makefile @@ -1,8 +1,6 @@ APPLICATION = conn_ip include ../Makefile.tests_common -BOARD ?= native - RIOTBASE ?= $(CURDIR)/../.. BOARD_INSUFFICIENT_MEMORY := chronos msb-430 msb-430h nucleo-f334 stm32f0discovery telosb \ @@ -19,8 +17,6 @@ USEMODULE += shell USEMODULE += shell_commands USEMODULE += ps -QUIET ?= 1 - include $(RIOTBASE)/Makefile.include test: diff --git a/tests/cpp11_condition_variable/Makefile b/tests/cpp11_condition_variable/Makefile index 99416ba413..70b6b28f46 100644 --- a/tests/cpp11_condition_variable/Makefile +++ b/tests/cpp11_condition_variable/Makefile @@ -2,9 +2,6 @@ APPLICATION = cpp11_condition_variable include ../Makefile.tests_common -# If no BOARD is found in the environment, use this default: -BOARD ?= native - # ROM is overflowing for these boards when using # gcc-arm-none-eabi-4.9.3.2015q2-1trusty1 from ppa:terry.guo/gcc-arm-embedded # (Travis is using this PPA currently, 2015-06-23) @@ -21,9 +18,6 @@ RIOTBASE ?= $(CURDIR)/../.. # development process: CFLAGS += -DDEVELHELP -# Change this to 0 show compiler invocation lines by default: -QUIET ?= 1 - # If you want to add some extra flags when compile c++ files, add these flags # to CXXEXFLAGS variable CXXEXFLAGS += -std=c++11 diff --git a/tests/cpp11_mutex/Makefile b/tests/cpp11_mutex/Makefile index 99e846f94a..8d8ae183f8 100644 --- a/tests/cpp11_mutex/Makefile +++ b/tests/cpp11_mutex/Makefile @@ -2,9 +2,6 @@ APPLICATION = cpp11_mutex include ../Makefile.tests_common -# If no BOARD is found in the environment, use this default: -BOARD ?= native - # ROM is overflowing for these boards when using # gcc-arm-none-eabi-4.9.3.2015q2-1trusty1 from ppa:terry.guo/gcc-arm-embedded # (Travis is using this PPA currently, 2015-06-23) @@ -21,9 +18,6 @@ RIOTBASE ?= $(CURDIR)/../.. # development process: CFLAGS += -DDEVELHELP -# Change this to 0 show compiler invocation lines by default: -QUIET ?= 1 - # If you want to add some extra flags when compile c++ files, add these flags # to CXXEXFLAGS variable CXXEXFLAGS += -std=c++11 diff --git a/tests/cpp11_thread/Makefile b/tests/cpp11_thread/Makefile index e93b7a3429..42cb9eac5d 100644 --- a/tests/cpp11_thread/Makefile +++ b/tests/cpp11_thread/Makefile @@ -2,9 +2,6 @@ APPLICATION = cpp11_thread include ../Makefile.tests_common -# If no BOARD is found in the environment, use this default: -BOARD ?= native - # ROM is overflowing for these boards when using # gcc-arm-none-eabi-4.9.3.2015q2-1trusty1 from ppa:terry.guo/gcc-arm-embedded # (Travis is using this PPA currently, 2015-06-23) @@ -21,9 +18,6 @@ RIOTBASE ?= $(CURDIR)/../.. # development process: CFLAGS += -DDEVELHELP -# Change this to 0 show compiler invocation lines by default: -QUIET ?= 1 - # If you want to add some extra flags when compile c++ files, add these flags # to CXXEXFLAGS variable CXXEXFLAGS += -std=c++11 diff --git a/tests/emb6/Makefile b/tests/emb6/Makefile index 24c98a5792..d958a2a6e4 100644 --- a/tests/emb6/Makefile +++ b/tests/emb6/Makefile @@ -36,6 +36,4 @@ DRIVER ?= at86rf231 # include the selected driver USEMODULE += $(DRIVER) -QUIET ?= 1 - include $(RIOTBASE)/Makefile.include diff --git a/tests/fault_handler/Makefile b/tests/fault_handler/Makefile index b82d4b873b..24a6601f75 100644 --- a/tests/fault_handler/Makefile +++ b/tests/fault_handler/Makefile @@ -2,15 +2,9 @@ APPLICATION = fault_handler include ../Makefile.tests_common -# If no BOARD is found in the environment, use this default: -BOARD ?= native - # This has to be the absolute path to the RIOT base directory: RIOTBASE ?= $(CURDIR)/../.. -# Change this to 0 show compiler invocation lines by default: -QUIET ?= 1 - CFLAGS += -DDEVELHELP=1 ifeq ($(shell uname),Darwin) diff --git a/tests/gnrc_ipv6_ext/Makefile b/tests/gnrc_ipv6_ext/Makefile index 468aafd3a2..e82d67772e 100644 --- a/tests/gnrc_ipv6_ext/Makefile +++ b/tests/gnrc_ipv6_ext/Makefile @@ -2,9 +2,6 @@ APPLICATION = gnrc_ipv6_ext include ../Makefile.tests_common -# If no BOARD is found in the environment, use this default: -BOARD ?= native - # This has to be the absolute path to the RIOT base directory: RIOTBASE ?= $(CURDIR)/../.. @@ -33,9 +30,6 @@ USEMODULE += ps # development process: CFLAGS += -DDEVELHELP -# Change this to 0 show compiler invocation lines by default: -QUIET ?= 1 - include $(RIOTBASE)/Makefile.include # This requires ENABLE_DEBUG in gnrc_ipv6.c to be 1 diff --git a/tests/gnrc_sixlowpan/Makefile b/tests/gnrc_sixlowpan/Makefile index 8fc177864f..34ccc73913 100644 --- a/tests/gnrc_sixlowpan/Makefile +++ b/tests/gnrc_sixlowpan/Makefile @@ -2,9 +2,6 @@ APPLICATION = gnrc_sixlowpan include ../Makefile.tests_common -# If no BOARD is found in the environment, use this default: -BOARD ?= native - # This has to be the absolute path to the RIOT base directory: RIOTBASE ?= $(CURDIR)/../.. @@ -29,9 +26,6 @@ USEMODULE += gnrc_pktdump # development process: CFLAGS += -DDEVELHELP -# Change this to 0 show compiler invocation lines by default: -QUIET ?= 1 - include $(RIOTBASE)/Makefile.include test: diff --git a/tests/gnrc_sock_ip/Makefile b/tests/gnrc_sock_ip/Makefile index b7c2923cca..14fb094a97 100644 --- a/tests/gnrc_sock_ip/Makefile +++ b/tests/gnrc_sock_ip/Makefile @@ -1,8 +1,6 @@ APPLICATION = gnrc_sock_ip include ../Makefile.tests_common -BOARD ?= native - RIOTBASE ?= $(CURDIR)/../.. USEMODULE += gnrc_sock_ip @@ -13,8 +11,6 @@ CFLAGS += -DDEVELHELP CFLAGS += -DGNRC_PKTBUF_SIZE=200 CFLAGS += -DTEST_SUITES -QUIET ?= 1 - include $(RIOTBASE)/Makefile.include test: diff --git a/tests/gnrc_sock_udp/Makefile b/tests/gnrc_sock_udp/Makefile index 95c9ea24fa..d880fb6f4f 100644 --- a/tests/gnrc_sock_udp/Makefile +++ b/tests/gnrc_sock_udp/Makefile @@ -1,8 +1,6 @@ APPLICATION = gnrc_sock_udp include ../Makefile.tests_common -BOARD ?= native - RIOTBASE ?= $(CURDIR)/../.. BOARD_INSUFFICIENT_MEMORY := nucleo32-f042 @@ -16,8 +14,6 @@ CFLAGS += -DDEVELHELP CFLAGS += -DGNRC_PKTBUF_SIZE=400 CFLAGS += -DTEST_SUITES -QUIET ?= 1 - include $(RIOTBASE)/Makefile.include test: diff --git a/tests/lwip/Makefile b/tests/lwip/Makefile index 54a03dbe7c..38c10c2841 100644 --- a/tests/lwip/Makefile +++ b/tests/lwip/Makefile @@ -44,8 +44,6 @@ endif USEMODULE += $(DRIVER) -QUIET ?= 1 - include $(RIOTBASE)/Makefile.include test: diff --git a/tests/malloc/Makefile b/tests/malloc/Makefile index 764e20bfc7..0fb6291fca 100644 --- a/tests/malloc/Makefile +++ b/tests/malloc/Makefile @@ -2,9 +2,6 @@ APPLICATION = malloc include ../Makefile.tests_common -# If no BOARD is found in the environment, use this default: -BOARD ?= native - # This has to be the absolute path to the RIOT base directory: RIOTBASE ?= $(CURDIR)/../.. @@ -13,7 +10,4 @@ RIOTBASE ?= $(CURDIR)/../.. # development process: CFLAGS += -DDEVELHELP -# Change this to 0 show compiler invocation lines by default: -QUIET ?= 1 - include $(RIOTBASE)/Makefile.include diff --git a/tests/minimal/Makefile b/tests/minimal/Makefile index 97323d58b5..6d1ac3af80 100644 --- a/tests/minimal/Makefile +++ b/tests/minimal/Makefile @@ -2,9 +2,6 @@ APPLICATION = minimal include ../Makefile.tests_common -# If no BOARD is found in the environment, use this default: -BOARD ?= native - # This has to be the absolute path to the RIOT base directory: RIOTBASE ?= $(CURDIR)/../.. @@ -14,7 +11,4 @@ CFLAGS += -DNDEBUG -DLOG_LEVEL=LOG_NONE # DISABLE_MODULE += auto_init -# Change this to 0 show compiler invocation lines by default: -QUIET ?= 1 - include $(RIOTBASE)/Makefile.include diff --git a/tests/od/Makefile b/tests/od/Makefile index 7f2e09fa4b..d18fd28709 100644 --- a/tests/od/Makefile +++ b/tests/od/Makefile @@ -2,9 +2,6 @@ APPLICATION = od include ../Makefile.tests_common -# If no BOARD is found in the environment, use this default: -BOARD ?= native - # This has to be the absolute path to the RIOT base directory: RIOTBASE ?= $(CURDIR)/../.. @@ -15,9 +12,6 @@ USEMODULE += od # development process: CFLAGS += -DDEVELHELP -# Change this to 0 show compiler invocation lines by default: -QUIET ?= 1 - include $(RIOTBASE)/Makefile.include test: diff --git a/tests/periph_rtc/Makefile b/tests/periph_rtc/Makefile index b72b0f6a9e..e7bf23af6a 100644 --- a/tests/periph_rtc/Makefile +++ b/tests/periph_rtc/Makefile @@ -1,4 +1,4 @@ -export APPLICATION = periph_rtc +APPLICATION = periph_rtc include ../Makefile.tests_common FEATURES_REQUIRED = periph_rtc diff --git a/tests/xtimer_periodic_wakeup/Makefile b/tests/xtimer_periodic_wakeup/Makefile index de65332774..fb9c82ba85 100644 --- a/tests/xtimer_periodic_wakeup/Makefile +++ b/tests/xtimer_periodic_wakeup/Makefile @@ -1,7 +1,6 @@ APPLICATION = xtimer_sleep_until include ../Makefile.tests_common -BOARD ?= native RIOTBASE ?= $(CURDIR)/../.. BOARD_INSUFFICIENT_MEMORY := chronos diff --git a/tests/xtimer_remove/Makefile b/tests/xtimer_remove/Makefile index b265257919..8f94eb0290 100644 --- a/tests/xtimer_remove/Makefile +++ b/tests/xtimer_remove/Makefile @@ -1,7 +1,6 @@ APPLICATION = xtimer_remove include ../Makefile.tests_common -BOARD ?= native RIOTBASE ?= $(CURDIR)/../.. USEMODULE += xtimer diff --git a/tests/xtimer_reset/Makefile b/tests/xtimer_reset/Makefile index 1fe16770e9..66c7fbbf76 100644 --- a/tests/xtimer_reset/Makefile +++ b/tests/xtimer_reset/Makefile @@ -1,7 +1,6 @@ APPLICATION = xtimer_reset include ../Makefile.tests_common -BOARD ?= native RIOTBASE ?= $(CURDIR)/../.. USEMODULE += xtimer diff --git a/tests/zep/Makefile b/tests/zep/Makefile index 529ab8487f..2605100773 100644 --- a/tests/zep/Makefile +++ b/tests/zep/Makefile @@ -14,7 +14,6 @@ USEMODULE += gnrc_pktdump USEMODULE += shell USEMODULE += shell_commands - # set optional default values for ZEP parameters if unset ZEP_DST ?= "\"::1\"" ZEP_SRC_PORT ?= GNRC_ZEP_DEFAULT_PORT -- GitLab