diff --git a/Makefile.include b/Makefile.include index a42691a386..4e07dd71ee 100644 --- a/Makefile.include +++ b/Makefile.include @@ -198,9 +198,6 @@ include $(RIOTMAKE)/docker.inc.mk include $(RIOTMAKE)/utils/ansi.mk include $(RIOTMAKE)/color.inc.mk -# include concurrency helpers -include $(RIOTMAKE)/info-nproc.inc.mk - # List of boards variables include $(RIOTMAKE)/boards.inc.mk @@ -231,9 +228,7 @@ endif include $(RIOTMAKE)/cargo-settings.inc.mk -GLOBAL_GOALS += buildtest \ - buildtest-indocker \ - info-boards-features-blacklisted \ +GLOBAL_GOALS += info-boards-features-blacklisted \ info-boards-features-conflicting \ info-boards-features-missing \ info-boards-supported \ @@ -243,7 +238,6 @@ GLOBAL_GOALS += buildtest \ ifneq (, $(filter $(GLOBAL_GOALS), $(MAKECMDGOALS))) include $(RIOTMAKE)/info-global.inc.mk - include $(RIOTMAKE)/buildtests.inc.mk else all: link diff --git a/examples/basic/hello-world/README.md b/examples/basic/hello-world/README.md index 2c61aa38e3..c75e204ede 100644 --- a/examples/basic/hello-world/README.md +++ b/examples/basic/hello-world/README.md @@ -9,7 +9,6 @@ This example should foremost give you an overview how to use the Makefile system * First you must give your application a name, which is commonly the same as the name of the directory it resides in. Then you can define a default BOARD for which the application was written. By using e.g. `make BOARD=msba2` you can override the default board. - With `make buildtest` the application gets compiled for all supported boards. * The variable `RIOTBASE` contains an absolute or relative path to the directory where you have checked out RIOT. If your code resides in a subdirectory of RIOT, then you can use `$(CURDIR)` as it's done in here. diff --git a/makefiles/buildtests.inc.mk b/makefiles/buildtests.inc.mk deleted file mode 100644 index 63ebebd061..0000000000 --- a/makefiles/buildtests.inc.mk +++ /dev/null @@ -1,37 +0,0 @@ -.PHONY: buildtest buildtest-indocker - -BUILDTEST_MAKE_REDIRECT ?= >/dev/null 2>&1 - -buildtest: - @ \ - RESULT=true ; \ - for board in $(BOARDS); do \ - if BOARD=$${board} $(MAKE) check-toolchain-supported > /dev/null 2>&1; then \ - $(COLOR_ECHO) -n "Building for $$board ... " ; \ - BOARD=$${board} RIOT_CI_BUILD=1 \ - $(MAKE) clean all -j $(NPROC) $(BUILDTEST_MAKE_REDIRECT); \ - RES=$$? ; \ - if [ $$RES -eq 0 ]; then \ - $(COLOR_ECHO) "$(COLOR_GREEN)success.$(COLOR_RESET)" ; \ - else \ - $(COLOR_ECHO) "$(COLOR_RED)failed!$(COLOR_RESET)" ; \ - RESULT=false ; \ - fi ; \ - BOARD=$${board} $(MAKE) clean-intermediates >/dev/null 2>&1 || true; \ - fi; \ - done ; \ - $${RESULT} - -# Define 'buildtest-indocker' completely executed inside the container. -# It prevents starting one container per compilation which is slower but it -# could hide errors where the host toolchain would be used -ifeq ($(BUILD_IN_DOCKER),1) - buildtest-indocker: ..in-docker-container -else -ifeq ($(INSIDE_DOCKER),1) - buildtest-indocker: buildtest -else - buildtest-indocker: - $(error $@ must be run with `BUILD_IN_DOCKER=1`) -endif # INSIDE_DOCKER -endif # BUILD_IN_DOCKER diff --git a/makefiles/docker.inc.mk b/makefiles/docker.inc.mk index 3995cd577f..b1feb575dd 100644 --- a/makefiles/docker.inc.mk +++ b/makefiles/docker.inc.mk @@ -21,7 +21,6 @@ DOCKER ?= docker # List of Docker-enabled make goals export DOCKER_MAKECMDGOALS_POSSIBLE = \ all \ - buildtest-indocker \ scan-build \ scan-build-analyze \ tests-% \ diff --git a/makefiles/info-global.inc.mk b/makefiles/info-global.inc.mk index ebbf7c2fdc..7ff07d8bec 100644 --- a/makefiles/info-global.inc.mk +++ b/makefiles/info-global.inc.mk @@ -155,6 +155,5 @@ generate-Makefile.ci: @$(RIOTTOOLS)/insufficient_memory/create_makefile.ci.sh -# Reset BOARDSDIR so unchanged for makefiles included after, for now only -# needed for buildtests.inc.mk +# Reset BOARDSDIR so unchanged for makefiles included after BOARDDIR := $(BOARDDIR_GLOBAL) diff --git a/makefiles/info-nproc.inc.mk b/makefiles/info-nproc.inc.mk deleted file mode 100644 index 69fec0585c..0000000000 --- a/makefiles/info-nproc.inc.mk +++ /dev/null @@ -1,33 +0,0 @@ -ifneq (, $(filter buildtest info-concurrency, $(MAKECMDGOALS))) - ifeq (, $(strip $(NPROC))) - # Linux (utility program) - NPROC := $(shell nproc 2>/dev/null) - - ifeq (, $(strip $(NPROC))) - # Linux (generic) - NPROC := $(shell grep -c ^processor /proc/cpuinfo 2>/dev/null) - endif - ifeq (, $(strip $(NPROC))) - # BSD (at least FreeBSD and Mac OSX) - NPROC := $(shell sysctl -n hw.ncpu 2>/dev/null) - endif - ifeq (, $(strip $(NPROC))) - # Fallback - NPROC := 1 - endif - - NPROC := $(shell echo $$(($(NPROC) + 1))) - - ifneq (, $(NPROC_MAX)) - NPROC := $(shell if [ $(NPROC) -gt $(NPROC_MAX) ]; then echo $(NPROC_MAX); else echo $(NPROC); fi) - endif - ifneq (, $(NPROC_MIN)) - NPROC := $(shell if [ $(NPROC) -lt $(NPROC_MIN) ]; then echo $(NPROC_MIN); else echo $(NPROC); fi) - endif - endif -endif - -.PHONY: info-concurrency - -info-concurrency: - @echo "$(NPROC)"