Skip to content

Commit

Permalink
makefiles/buildtest: always execute 'buildtest' loop on host machine
Browse files Browse the repository at this point in the history
This remove executing buildtest `for` loop in docker.

When building completely in docker, 'buildtest' would hide issues when
the host toolchain would be used when doing `make all` directly.
It has the consequence that it now starts a container for each
compilation which is slower.

The previous behavior can be reproduced by using

    BUILD_IN_DOCKER=1 make buildtest-indocker

A side effect is also that now `BUILDTEST_MAKE_REDIRECT` would work when
doing `buildtest` with docker.
  • Loading branch information
cladmi committed Aug 14, 2019
1 parent a048001 commit 7d10da8
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
4 changes: 0 additions & 4 deletions makefiles/buildtests.inc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

BUILDTEST_MAKE_REDIRECT ?= >/dev/null 2>&1

ifeq ($(BUILD_IN_DOCKER),1)
buildtest: ..in-docker-container
else
buildtest:
@ \
RESULT=true ; \
Expand All @@ -24,7 +21,6 @@ buildtest:
fi; \
done ; \
$${RESULT}
endif # BUILD_IN_DOCKER

# Define 'buildtest-indocker' completely executed inside the container.
# It prevents starting one container per compilation wich is slower but it
Expand Down
1 change: 0 additions & 1 deletion makefiles/docker.inc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ export DOCKER_FLAGS ?= --rm
# List of Docker-enabled make goals
export DOCKER_MAKECMDGOALS_POSSIBLE = \
all \
buildtest \
buildtest-indocker \
scan-build \
scan-build-analyze \
Expand Down

0 comments on commit 7d10da8

Please sign in to comment.