From 263742c92a37efd5cda288ab7ec6ac358956b636 Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <bastian.kleineidam@web.de>
Date: Wed, 27 Feb 2013 19:39:09 +0100
Subject: [PATCH] Do not store local testresults on Travis run.

---
 .travis.yml | 2 +-
 Makefile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2d17063..4c86bff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,6 @@ before_install:
 install:
   - pip install -r requirements.txt --use-mirrors
 # command to run tests
-script: make test
+script: make test PYTESTOPTS=-s
 #notifications:
 #  email: false
diff --git a/Makefile b/Makefile
index 4cabf57..f872b58 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ endif
 # Pytest options:
 # --resultlog: write test results in file
 # -s: do not capture stdout/stderr (some tests fail otherwise)
-PYTESTOPTS:=--resultlog=testresults.txt -s --durations=0
+PYTESTOPTS?=--resultlog=testresults.txt -s --durations=0
 # which test modules to run
 TESTS ?= tests/
 # set test options