From 307289c20a5c9c9dab0cff0a5c99a71c349e18f2 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 30 Jan 2013 11:43:43 +1100
Subject: Pass testropts in to setup.py in run_tests.sh

Change-Id: Idba469fbd8c0488a308071de45e16eedcb1d6cc6
---
 run_tests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'run_tests.sh')

diff --git a/run_tests.sh b/run_tests.sh
index 5bb2842b2..3bf996fa2 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -91,7 +91,7 @@ function run_tests {
   # Just run the test suites in current environment
   set +e
   testrargs=`echo "$testrargs" | sed -e's/^\s*\(.*\)\s*$/\1/'`
-  TESTRTESTS="$TESTRTESTS --testr-args='$testrargs'"
+  TESTRTESTS="$TESTRTESTS --testr-args='$testropts $testrargs'"
   echo "Running \`${wrapper} $TESTRTESTS\`"
   bash -c "${wrapper} $TESTRTESTS"
   RESULT=$?
@@ -155,7 +155,7 @@ function run_pep8 {
 }
 
 
-TESTRTESTS="python setup.py testr $testropts"
+TESTRTESTS="python setup.py testr"
 
 if [ $never_venv -eq 0 ]
 then
-- 
cgit