From 1bff1c367b5b24a461c7cec0f20ae4f498c1ce6c Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Sun, 21 Mar 2010 20:11:49 +0100 Subject: [PATCH] Test for nose achievements plugin before using it. --- Makefile | 5 +++++ setup.cfg | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c9a91d5c..9a0b346e 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,11 @@ PY_FILES_DIRS:=linkcheck tests *.py linkchecker cgi-bin config doc TESTS ?= tests/ # set test options, eg. to "--nologcapture" TESTOPTS= +# test for nose achievements plugin and use it if available +NOSE_ACHIEVEMENTS:=$(shell nosetests --plugins | grep achievements) +ifeq ($(strip $(NOSE_ACHIEVEMENTS)),Plugin achievements) +TESTOPTS += --with-achievements +endif PAGER ?= less # build dir for debian package BUILDDIR:=$(HOME)/packages/official diff --git a/setup.cfg b/setup.cfg index b5352883..73f9a196 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,6 +11,3 @@ provides = linkchecker group = Web/Utilities install_script = install-rpm.sh python = python - -[nosetests] -;with-achievements=1