1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 14:33:52 +01:00

Merge pull request #1593 from Kijewski/nproc-max

tests: limit concurrency level
This commit is contained in:
René Kijewski 2014-08-21 20:37:57 +02:00
commit 4450d5a8e2
2 changed files with 15 additions and 1 deletions

View File

@ -1,5 +1,8 @@
language: c
env:
- NPROC_MAX=8
before_install:
- sudo apt-get install emdebian-archive-keyring
- echo 'deb http://www.emdebian.org/debian wheezy main' | sudo tee /etc/apt/sources.list.d/emdebian.list > /dev/null
@ -27,6 +30,7 @@ install:
- git log -1 --pretty=format:%H riot/master
script:
- make -s -C ./examples/default info-concurrency
- git rebase riot/master || git rebase --abort
- ./dist/tools/compile_test/compile_test.py

View File

@ -1,4 +1,4 @@
ifneq (, $(filter buildtest, $(MAKECMDGOALS)))
ifneq (, $(filter buildtest info-concurrency, $(MAKECMDGOALS)))
ifeq (, $(strip $(NPROC)))
# Linux (utility program)
NPROC := $(shell nproc 2>/dev/null)
@ -17,6 +17,13 @@ ifneq (, $(filter buildtest, $(MAKECMDGOALS)))
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
@ -190,3 +197,6 @@ info-build:
info-boards-supported:
@echo "$(BOARDS)"
info-concurrency:
@echo "$(NPROC)"