summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2018-10-09 16:35:22 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2018-11-14 13:30:34 +0000
commite9e088239b178b28a9916407cb6804941095eb26 (patch)
tree62fd7fdaa5ec1108f7f08eb9690b2e02dcf34ab8
parente7633500995376be9d727c902408f03180d56169 (diff)
downloadbuildstream-e9e088239b178b28a9916407cb6804941095eb26.tar.gz
tests/testutils/site.py: Check for bwrap supporting --json-status-fd
-rw-r--r--tests/testutils/site.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/testutils/site.py b/tests/testutils/site.py
index 6801be471..6c286e720 100644
--- a/tests/testutils/site.py
+++ b/tests/testutils/site.py
@@ -4,7 +4,7 @@
import os
import sys
-from buildstream import utils, ProgramNotFoundError
+from buildstream import _site, utils, ProgramNotFoundError
try:
utils.get_host_tool('bzr')
@@ -33,8 +33,10 @@ except (ImportError, ValueError):
try:
utils.get_host_tool('bwrap')
HAVE_BWRAP = True
+ HAVE_BWRAP_JSON_STATUS = _site.get_bwrap_version() >= (0, 3, 2)
except ProgramNotFoundError:
HAVE_BWRAP = False
+ HAVE_BWRAP_JSON_STATUS = False
try:
utils.get_host_tool('lzip')