summaryrefslogtreecommitdiff
path: root/src/buildstream
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2020-04-29 09:15:31 +0200
committerJürg Billeter <j@bitron.ch>2020-06-03 13:49:39 +0200
commit93981f2784749639676e155cf7b9cccea03b3f0c (patch)
tree5cbd229424e5f91fc95c69b8c19abcacdebccbe7 /src/buildstream
parentb8fa4ae71dfddc60de0f3007415b4bebdc647672 (diff)
downloadbuildstream-93981f2784749639676e155cf7b9cccea03b3f0c.tar.gz
tests: Drop bwrap-specific tests
Diffstat (limited to 'src/buildstream')
-rw-r--r--src/buildstream/_site.py21
-rw-r--r--src/buildstream/testing/_utils/site.py10
2 files changed, 1 insertions, 30 deletions
diff --git a/src/buildstream/_site.py b/src/buildstream/_site.py
index db0587120..2bdf45b02 100644
--- a/src/buildstream/_site.py
+++ b/src/buildstream/_site.py
@@ -18,8 +18,6 @@
# Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
import os
-import shutil
-import subprocess
#
# Private module declaring some info about where the buildstream
@@ -46,22 +44,3 @@ build_all_template = os.path.join(root, "data", "build-all.sh.in")
# Module building script template
build_module_template = os.path.join(root, "data", "build-module.sh.in")
-
-
-def get_bwrap_version():
- # Get the current bwrap version
- #
- # returns None if no bwrap was found
- # otherwise returns a tuple of 3 int: major, minor, patch
- bwrap_path = shutil.which("bwrap")
-
- if not bwrap_path:
- return None
-
- cmd = [bwrap_path, "--version"]
- try:
- version = str(subprocess.check_output(cmd).split()[1], "utf-8")
- except subprocess.CalledProcessError:
- return None
-
- return tuple(int(x) for x in version.split("."))
diff --git a/src/buildstream/testing/_utils/site.py b/src/buildstream/testing/_utils/site.py
index 9f0e7aa41..70d23a5cc 100644
--- a/src/buildstream/testing/_utils/site.py
+++ b/src/buildstream/testing/_utils/site.py
@@ -7,7 +7,7 @@ import subprocess
import sys
from typing import Optional # pylint: disable=unused-import
-from buildstream import _site, utils, ProgramNotFoundError
+from buildstream import utils, ProgramNotFoundError
from buildstream._platform import Platform
@@ -45,14 +45,6 @@ except ProgramNotFoundError:
BZR_ENV = {}
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")
HAVE_LZIP = True
except ProgramNotFoundError: