Fix test options.

This commit is contained in:
Bastian Kleineidam 2012-11-18 20:43:14 +01:00
parent b341a83cde
commit 053d1d1594
1 changed files with 3 additions and 6 deletions

View File

@ -9,17 +9,14 @@ ARCHIVE_WIN32:=$(APPNAME)-$(VERSION).exe
PY_FILES_DIRS := patool setup.py patoolib tests PY_FILES_DIRS := patool setup.py patoolib tests
PY2APPOPTS ?= PY2APPOPTS ?=
ifeq ($(shell uname),Darwin) ifeq ($(shell uname),Darwin)
NUMPROCESSORS:=$(shell sysctl -a | grep machdep.cpu.core_count | cut -d " " -f 2)
CHMODMINUSMINUS:= CHMODMINUSMINUS:=
else else
NUMPROCESSORS:=$(shell grep -c processor /proc/cpuinfo)
CHMODMINUSMINUS:=-- CHMODMINUSMINUS:=--
endif endif
# Pytest options: # Pytest options:
# - use multiple processors # --resultlog: write test results in file
# - write test results in file # -s: do not capture stdout/stderr (some tests fail otherwise)
# - run all tests found in the "tests" subdirectory PYTESTOPTS:=--resultlog=testresults.txt -s
PYTESTOPTS:=-n $(NUMPROCESSORS) --resultlog=testresults.txt
# which test modules to run # which test modules to run
TESTS ?= tests/ TESTS ?= tests/
# set test options # set test options