From bb317c325830ac7c9e1f4b6fef23146ad85bc1be Mon Sep 17 00:00:00 2001 From: Daniel P. Berrangé Date: Wed, 5 Jan 2022 13:49:46 +0000 Subject: tests/docker: auto-generate ubuntu2004.docker with lcitool This commit is best examined using the "-b" option to diff. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Message-Id: <20211215141949.3512719-12-berrange@redhat.com> Message-Id: <20220105135009.1584676-12-alex.bennee@linaro.org> --- tests/lcitool/refresh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'tests/lcitool') diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 1e30674d67..310bad1315 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -65,12 +65,19 @@ ubuntu1804_skipssh = [ "ENV QEMU_CONFIGURE_OPTS --disable-libssh\n" ] +ubuntu2004_tsanhack = [ + "# Apply patch https://reviews.llvm.org/D75820\n", + "# This is required for TSan in clang-10 to compile with QEMU.\n", + "RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h\n" +] + try: generate_dockerfile("centos8", "centos-8") generate_dockerfile("fedora", "fedora-35") generate_dockerfile("ubuntu1804", "ubuntu-1804", trailer="".join(ubuntu1804_skipssh)) - + generate_dockerfile("ubuntu2004", "ubuntu-2004", + trailer="".join(ubuntu2004_tsanhack)) sys.exit(0) except Exception as ex: print(str(ex), file=sys.stderr) -- cgit v1.2.3-55-g7522