On 1/14/21 2:02 PM, Daniel P. Berrangé wrote:
> This commit is best examined using the "-b" option to diff.
>
> Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
> ---
> tests/docker/dockerfiles/refresh | 6 +
> tests/docker/dockerfiles/ubuntu2004.docker | 237 +++++++++++----------
> 2 files changed, 136 insertions(+), 107 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/refresh
> b/tests/docker/dockerfiles/refresh
> index ab1d00fcf8..658a57c28c 100755
> --- a/tests/docker/dockerfiles/refresh
> +++ b/tests/docker/dockerfiles/refresh
> @@ -57,5 +57,11 @@ try:
>
> generate_image("ubuntu1804.docker", "ubuntu-1804",
> trailer="".join(skipssh))
> +
> + 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"]
> + generate_image("ubuntu2004.docker", "ubuntu-2004",
> + trailer="".join(tsanhack))
...
> # Apply patch https://reviews.llvm.org/D75820
> # This is required for TSan in clang-10 to compile with QEMU.
> RUN sed -i 's/^const/static const/g'
> /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
