From d89c22529223fc55c2c4986f2cf7146fcbef0b12 Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Wed, 28 Nov 2012 18:19:41 +0100 Subject: [PATCH] Make test output file configurable. --- Makefile | 3 ++- scripts/mktestscript.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bf78ab0fb..3b2e45e00 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,8 @@ NUMPROCESSORS:=$(shell grep -c processor /proc/cpuinfo) # - use multiple processors # - write test results in file # - run all tests found in the "tests" subdirectory -PYTESTOPTS:=-n $(NUMPROCESSORS) --resultlog=testresults.txt --tb=short +TESTOUTPUT?=testresults.txt +PYTESTOPTS:=-n $(NUMPROCESSORS) --resultlog=$(TESTOUTPUT) --tb=short CHMODMINUSMINUS:=-- # directory or file with tests to run TESTS ?= tests diff --git a/scripts/mktestscript.sh b/scripts/mktestscript.sh index 5c94d89b7..1eee37f0f 100755 --- a/scripts/mktestscript.sh +++ b/scripts/mktestscript.sh @@ -6,6 +6,6 @@ script=test.sh rm -f "$script" echo "#!/bin/sh -e" > "$script" -egrep -v "^\. " testresults.txt | egrep "^F " | cut -b "3-" | awk '{ print "make test TESTS=" $0; }' >> "$script" +egrep -v "^\. " testresults.txt | egrep "^F " | cut -b "3-" | awk '{ print "make test TESTOUTPUT=/dev/null TESTS=" $0; }' >> "$script" chmod 755 "$script"