aboutsummaryrefslogtreecommitdiff
path: root/tests/docker/dockerfiles/ubuntu2004.docker
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2021-07-09 15:29:38 +0100
committerAlex Bennée <alex.bennee@linaro.org>2021-07-14 14:33:53 +0100
commit888673bbb9f5dc8e35c4747ddd1addba251a9a47 (patch)
tree688a52a1195490e4a63f1bbd809bbe5661dff296 /tests/docker/dockerfiles/ubuntu2004.docker
parent1ae2786c7c91aadbdc15d4106e951bc15b46b585 (diff)
tests/docker: remove FEATURES env var from templates
In preparation for switching to auto-generated dockerfiles, remove the FEATURES env variable. The equivalent functionality can be achieved in most cases by just looking for existance of a binary. The cases which don't correspond to binaries are simply dropped because configure/meson will probe for any requested feature anyway. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Willian Rampazzo <willianr@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20210623142245.307776-6-berrange@redhat.com> Message-Id: <20210709143005.1554-14-alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/dockerfiles/ubuntu2004.docker')
-rw-r--r--tests/docker/dockerfiles/ubuntu2004.docker1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index 78755bc2e3..88b3cfa136 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -70,7 +70,6 @@ ENV PACKAGES flex bison \
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES
RUN dpkg -l $PACKAGES | sort > /packages.txt
-ENV FEATURES clang tsan pyyaml sdl2
# Apply patch https://reviews.llvm.org/D75820
# This is required for TSan in clang-10 to compile with QEMU.