From 1dfb1897a6dc9bc5f10ba900f565abca06c7a4e7 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 26 Feb 2018 12:46:13 +0000 Subject: Modify how the INTEGRATION_CACHE environment var is interpreted When specifying a location for the integration tests cache directory, we would previously append '/integration-cache' to whatever path we were given. This is regarded as confusing. See: https://gitlab.com/BuildStream/buildstream/issues/267 --- conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conftest.py') diff --git a/conftest.py b/conftest.py index ad42b70eb..ffe8fb3ae 100755 --- a/conftest.py +++ b/conftest.py @@ -40,7 +40,7 @@ def integration_cache(request): # Set the tempdir to the INTEGRATION_CACHE variable, or the # default if that is not set. if 'INTEGRATION_CACHE' in os.environ: - cache_dir = os.path.join(os.environ['INTEGRATION_CACHE'], 'integration-cache') + cache_dir = os.environ['INTEGRATION_CACHE'] else: cache_dir = os.path.abspath('./integration-cache') -- cgit v1.2.1