Skip to content

Commit

Permalink
Merge pull request #11680 from cladmi/pr/ci/change_testing_policy
Browse files Browse the repository at this point in the history
makefiles/murdock.inc.mk: change policy to run tests by default
  • Loading branch information
kaspar030 authored Aug 21, 2019
2 parents 8e08748 + 8e5422f commit 8f7009e
Show file tree
Hide file tree
Showing 127 changed files with 33 additions and 235 deletions.
7 changes: 4 additions & 3 deletions makefiles/murdock.inc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ test-murdock:
#
# Testing is enabled if all the following conditions are met:
#
# * the board is whitelisted
# * the board is whitelisted (by default all are enabled)
# * the board is not blacklisted (by default none)
# * the board has enough memory and the executable is being linked
# * a test is present
#
# TEST_ON_CI_WHITELIST and TEST_ON_CI_BLACKLIST can be empty, a board list or 'all'
#
Expand All @@ -36,11 +37,11 @@ test-murdock:
#
# Disabling a test in some case must be justified to keep track of the reason.

TEST_ON_CI_WHITELIST ?=
TEST_ON_CI_WHITELIST ?= all
TEST_ON_CI_BLACKLIST ?=
TEST_ON_BOARD_ENABLED ?= $(filter-out $(TEST_ON_CI_BLACKLIST:all=%),$(filter $(TEST_ON_CI_WHITELIST:all=%),$(BOARD)))

TEST_ON_CI_ENABLED ?= $(if $(RIOTNOLINK),,$(TEST_ON_BOARD_ENABLED))
TEST_ON_CI_ENABLED ?= $(if $(RIOTNOLINK),,$(if $(TESTS),$(TEST_ON_BOARD_ENABLED)))

.PHONY: test-on-ci-enabled
test-on-ci-enabled:
Expand Down
2 changes: 0 additions & 2 deletions tests/bench_msg_pingpong/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6

USEMODULE += xtimer

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/bench_mutex_pingpong/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6

USEMODULE += xtimer

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/bench_runtime_coreapis/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ include ../Makefile.tests_common
USEMODULE += core_thread_flags
USEMODULE += benchmark

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/bench_sched_nop/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@ include ../Makefile.tests_common

USEMODULE += xtimer

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/bench_sizeof_coretypes/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,4 @@ ifneq (,$(NO_MSG))
DISABLE_MODULE += core_msg
endif

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/bench_thread_flags_pingpong/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6
USEMODULE += core_thread_flags
USEMODULE += xtimer

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/bench_thread_yield_pingpong/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6

USEMODULE += xtimer

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/bitarithm_timings/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@ include ../Makefile.tests_common

USEMODULE += xtimer

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/bloom_bytes/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,4 @@ USEMODULE += fmt

DISABLE_MODULE += auto_init

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/buttons/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@ include ../Makefile.tests_common
FEATURES_REQUIRED += periph_gpio_irq
USEMODULE += xtimer

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/cb_mux/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@ include ../Makefile.tests_common

USEMODULE += cb_mux

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/cb_mux_bench/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@ include ../Makefile.tests_common
USEMODULE += cb_mux \
xtimer

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/cpp11_condition_variable/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,4 @@ USEMODULE += cpp11-compat
USEMODULE += xtimer
USEMODULE += timex

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/cpp11_mutex/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@ CXXEXFLAGS += -std=c++11
USEMODULE += cpp11-compat
USEMODULE += xtimer

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/cpp11_thread/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,4 @@ USEMODULE += cpp11-compat
USEMODULE += xtimer
USEMODULE += timex

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/devfs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ USEMODULE += devfs
USEMODULE += devfs_random
USEMODULE += devfs_hwrng

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/embunit/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ USEMODULE += embunit

INCLUDES += -I$(RIOTBASE)/tests/unittests/common

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/event_wait_timeout/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ USEMODULE += event
USEMODULE += xtimer
USEMODULE += core_thread_flags

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/events/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ FORCE_ASSERTS = 1
USEMODULE += event_callback
USEMODULE += event_timeout

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/evtimer_msg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-leonardo arduino-nano\

USEMODULE += evtimer

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/evtimer_underflow/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-leonardo arduino-nano\

USEMODULE += evtimer

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/float/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ ifneq (,$(filter native,$(BOARD)))
CFLAGS += -DTEST_ITER=100000000
endif

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/fmt_print/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@ include ../Makefile.tests_common

USEMODULE += fmt

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
4 changes: 3 additions & 1 deletion tests/gnrc_ipv6_ext/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ USEMODULE += shell
USEMODULE += shell_commands
USEMODULE += ps

# TEST_ON_CI_WHITELIST += all
# The test requires some setup and to be run as root
# So it cannot currently be run
TEST_ON_CI_BLACKLIST += all

.PHONY: ethos

Expand Down
2 changes: 0 additions & 2 deletions tests/gnrc_ipv6_fwd_w_sub/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,4 @@ USEMODULE += xtimer
CFLAGS += -DGNRC_PKTBUF_SIZE=512
CFLAGS += -DTEST_SUITES

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/gnrc_ipv6_nib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,4 @@ CFLAGS += -DGNRC_NETTYPE_NDP=GNRC_NETTYPE_TEST
CFLAGS += -DGNRC_PKTBUF_SIZE=512
CFLAGS += -DTEST_SUITES

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/gnrc_ipv6_nib_6ln/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,4 @@ CFLAGS += -DGNRC_NETTYPE_NDP=GNRC_NETTYPE_TEST
CFLAGS += -DGNRC_PKTBUF_SIZE=512
CFLAGS += -DTEST_SUITES

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/gnrc_ndp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,4 @@ CFLAGS += -DGNRC_NETTYPE_NDP=GNRC_NETTYPE_TEST
CFLAGS += -DGNRC_PKTBUF_SIZE=512
CFLAGS += -DTEST_SUITES

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/gnrc_netif/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,4 @@ CFLAGS += -DGNRC_NETIF_GROUPS_NUMOF=8
CFLAGS += -DLOG_LEVEL=LOG_NONE
CFLAGS += -DTEST_SUITES

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
4 changes: 3 additions & 1 deletion tests/gnrc_rpl_srh/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ USEMODULE += shell
USEMODULE += shell_commands
USEMODULE += ps

# TEST_ON_CI_WHITELIST += all
# The test requires some setup and to be run as root
# So it cannot currently be run
TEST_ON_CI_BLACKLIST += all

.PHONY: ethos

Expand Down
2 changes: 0 additions & 2 deletions tests/gnrc_sixlowpan/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,4 @@ USEMODULE += gnrc_udp
# Dumps packets
USEMODULE += gnrc_pktdump

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/gnrc_sixlowpan_frag/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,4 @@ CFLAGS += -DTEST_SUITES -DGNRC_PKTBUF_SIZE=2048
# to be able to include gnrc_sixlowpan_frag-internal `rbuf.h`
INCLUDES += -I$(RIOTBASE)/sys/net/gnrc/network_layer/sixlowpan/frag/

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
4 changes: 3 additions & 1 deletion tests/gnrc_sock_dns/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ ifeq ($(BOARD),$(filter $(BOARD),$(LOW_MEMORY_BOARDS)))
-DNRC_IPV6_NIB_OFFL_NUMOF=1
endif

# TEST_ON_CI_WHITELIST += all
# The test requires some setup and to be run as root
# So it cannot currently be run
TEST_ON_CI_BLACKLIST += all

.PHONY: ethos

Expand Down
2 changes: 0 additions & 2 deletions tests/gnrc_sock_ip/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@ USEMODULE += ps
CFLAGS += -DGNRC_PKTBUF_SIZE=200
CFLAGS += -DTEST_SUITES

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/gnrc_sock_udp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,4 @@ USEMODULE += ps
CFLAGS += -DGNRC_PKTBUF_SIZE=400
CFLAGS += -DTEST_SUITES

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/irq/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@ BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-leonardo arduino-nano \
USEMODULE += auto_init
USEMODULE += xtimer

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/isr_yield_higher/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@ BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-leonardo arduino-nano \

USEMODULE += xtimer

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/l2util/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,4 @@ CHECKED_IFDEF_PATHS = cc110x \
CFLAGS += $(foreach path,$(CHECKED_IFDEF_PATHS),\
-DMODULE_$(shell echo $(path) | tr a-z A-Z))

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
1 change: 0 additions & 1 deletion tests/libc_newlib/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
include ../Makefile.tests_common

TEST_ON_CI_WHITELIST += all
USEMODULE += embunit

include $(RIOTBASE)/Makefile.include
Expand Down
2 changes: 0 additions & 2 deletions tests/libfixmath/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ USEPKG += libfixmath
USEMODULE += libfixmath
USEMODULE += test_utils_interactive_sync

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/log_printfnoformat/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ include ../Makefile.tests_common

USEMODULE += log_printfnoformat

TEST_ON_CI_WHITELIST += all

# Enable debug log level
CFLAGS += -DLOG_LEVEL=4

Expand Down
1 change: 0 additions & 1 deletion tests/lua_loader/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ ifneq ($(BOARD),native)
CFLAGS += -DTHREAD_STACKSIZE_MAIN='(THREAD_STACKSIZE_DEFAULT+2048)'
endif

TEST_ON_CI_WHITELIST += all
# HACK Blacklist native as `murdock` fails on utf-8 characters for native tests
TEST_ON_CI_BLACKLIST += native

Expand Down
3 changes: 3 additions & 0 deletions tests/lwip/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,7 @@ ifneq ($(BOARD),native)
TESTS=
endif

# test fails on murdock and on my machine due to the process exiting directly
TEST_ON_CI_BLACKLIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/lwip_sock_ip/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,4 @@ DISABLE_MODULE += auto_init
CFLAGS += -DSO_REUSE
CFLAGS += -DLWIP_SO_RCVTIMEO

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/msg_avail/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@ include ../Makefile.tests_common

DISABLE_MODULE += auto_init

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/msg_send_receive/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@ include ../Makefile.tests_common
BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-leonardo arduino-nano \
arduino-uno nucleo-f031k6

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/msg_try_receive/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@ include ../Makefile.tests_common

BOARD_INSUFFICIENT_MEMORY := nucleo-f031k6

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
3 changes: 0 additions & 3 deletions tests/mutex_order/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ BOARD_INSUFFICIENT_MEMORY := arduino-duemilanove arduino-leonardo arduino-nano \
nucleo-f030r8 nucleo-l053r8 stm32f0discovery \
stm32l0538-disco

# list of boards to run CI tests on
TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/mutex_unlock_and_sleep/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@ include ../Makefile.tests_common

DISABLE_MODULE += auto_init

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
2 changes: 0 additions & 2 deletions tests/netdev_test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,4 @@ USEMODULE += od

CFLAGS += -DGNRC_PKTBUF_SIZE=200

TEST_ON_CI_WHITELIST += all

include $(RIOTBASE)/Makefile.include
Loading

0 comments on commit 8f7009e

Please sign in to comment.