summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2019-03-20 08:02:48 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2019-03-20 08:02:48 +0000
commit1b7f59f8639500f995dbc76470848768656695a7 (patch)
tree225dfea6bff3808c1edf395ea28b5e64b2fbf58b
parent5bf767fd70bc9ec47af456e8c17b812f03fb21b3 (diff)
parente8d4e2de83b4f2b9a289dbf8ae419c62afa7a021 (diff)
downloadbuildstream-1b7f59f8639500f995dbc76470848768656695a7.tar.gz
Merge branch 'tristan/fix-xdg-env-in-tests' into 'master'
Fix xdg env in tests Closes #966 See merge request BuildStream/buildstream!1244
-rw-r--r--setup.cfg3
-rw-r--r--tox.ini4
2 files changed, 7 insertions, 0 deletions
diff --git a/setup.cfg b/setup.cfg
index ca623aa4b..efdca7091 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,6 +16,9 @@ norecursedirs = tests/integration/project integration-cache tmp __pycache__ .egg
python_files = tests/*/*.py
env =
D:BST_TEST_SUITE=True
+ D:XDG_CACHE_HOME=./tmp/cache
+ D:XDG_CONFIG_HOME=./tmp/config
+ D:XDG_DATA_HOME=./tmp/share
[pycodestyle]
max-line-length = 119
diff --git a/tox.ini b/tox.ini
index 4f61cccf7..7fc1e85cf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,6 +44,10 @@ passenv =
#
setenv =
py{35,36,37}: COVERAGE_FILE = {envtmpdir}/.coverage
+ py{35,36,37}: XDG_CACHE_HOME = {envtmpdir}/cache
+ py{35,36,37}: XDG_CONFIG_HOME = {envtmpdir}/config
+ py{35,36,37}: XDG_DATA_HOME = {envtmpdir}/share
+
whitelist_externals =
py{35,36,37}:
mv