summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2016-09-25 19:48:43 +0300
committerLars Wirzenius <liw@liw.fi>2016-09-25 19:48:43 +0300
commit13f8989a714563077e96446a76658d52b13ec8af (patch)
treea557132f71670623c656848ed54388e1adb0e71c
parent7a9e116bf7a31ecf410b9fd474abbe8c13dcb0ce (diff)
downloadserver-yarns-13f8989a714563077e96446a76658d52b13ec8af.tar.gz
Make check set variables filename
-rwxr-xr-xcheck7
-rw-r--r--yarnhelper.py2
2 files changed, 7 insertions, 2 deletions
diff --git a/check b/check
index b9fc4ff..f4bb078 100755
--- a/check
+++ b/check
@@ -5,6 +5,11 @@ set -eu
address="$1"
shift
+variables="$(mktemp)"
+trap 'rm $variables' EXIT
+
python -m CoverageTestRunner
-yarn --env "SERVER=$address" --env 'PYTHONPATH=.' \
+yarn --env "SERVER=$address" \
+ --env 'PYTHONPATH=.' \
+ --env "VARIABLES=$variables" \
--shell python2 --shell-arg '' *.yarn "$@"
diff --git a/yarnhelper.py b/yarnhelper.py
index 27ebcd0..c12d08d 100644
--- a/yarnhelper.py
+++ b/yarnhelper.py
@@ -23,7 +23,7 @@ import requests
import yaml
-variables_filename = 'vars.yaml'
+variables_filename = os.environ.get('VARIABLES', 'vars.yaml')
class YarnHelper(object):