From a40c89b1ea50e0f50230f694126ab06cf516ddbe Mon Sep 17 00:00:00 2001
From: Brenden Matthews <brenden@brndn.io>
Date: Sun, 28 Feb 2021 11:05:13 -0600
Subject: [PATCH] Make sure all tools are installed for build.

---
 tests/dockerfiles/Dockerfile.fedora-31-clang-8 | 15 +++++++--------
 .../dockerfiles/Dockerfile.fedora-32-clang-10  | 15 +++++++--------
 tests/dockerfiles/Dockerfile.fedora-33-base    |  1 -
 .../dockerfiles/Dockerfile.fedora-33-clang-11  | 18 ++++++++++--------
 tests/dockerfiles/Dockerfile.ubuntu-clang-11   | 12 +++++++-----
 5 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/tests/dockerfiles/Dockerfile.fedora-31-clang-8 b/tests/dockerfiles/Dockerfile.fedora-31-clang-8
index 1799d0fa..21bca82b 100644
--- a/tests/dockerfiles/Dockerfile.fedora-31-clang-8
+++ b/tests/dockerfiles/Dockerfile.fedora-31-clang-8
@@ -2,11 +2,10 @@ ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky
 FROM ${IMAGE}/builder/fedora-31-base:latest
 
 RUN dnf -y -q install \
-    llvm \
-    clang \
-    libcxx-devel \
-    libcxxabi-devel \
-    npm \
-    && dnf clean all \
-    && npm install -g lcov-summary \
-    && npm cache clean --force
+  llvm \
+  clang \
+  libcxx-devel \
+  libcxxabi-devel \
+  npm \
+  && dnf clean all \
+  && npm cache clean --force
diff --git a/tests/dockerfiles/Dockerfile.fedora-32-clang-10 b/tests/dockerfiles/Dockerfile.fedora-32-clang-10
index e36e0c80..0b9be74a 100644
--- a/tests/dockerfiles/Dockerfile.fedora-32-clang-10
+++ b/tests/dockerfiles/Dockerfile.fedora-32-clang-10
@@ -2,11 +2,10 @@ ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky
 FROM ${IMAGE}/builder/fedora-32-base:latest
 
 RUN dnf -y -q install \
-    llvm \
-    clang \
-    libcxx-devel \
-    libcxxabi-devel \
-    npm \
-    && dnf clean all \
-    && npm install -g lcov-summary \
-    && npm cache clean --force
+  llvm \
+  clang \
+  libcxx-devel \
+  libcxxabi-devel \
+  npm \
+  && dnf clean all \
+  && npm cache clean --force
diff --git a/tests/dockerfiles/Dockerfile.fedora-33-base b/tests/dockerfiles/Dockerfile.fedora-33-base
index 65459aaf..723c9d4b 100644
--- a/tests/dockerfiles/Dockerfile.fedora-33-base
+++ b/tests/dockerfiles/Dockerfile.fedora-33-base
@@ -10,7 +10,6 @@ RUN dnf update -y -q \
   freetype-devel \
   git \
   imlib2-devel \
-  lcov \
   libcurl-devel \
   libical-devel \
   libircclient-devel \
diff --git a/tests/dockerfiles/Dockerfile.fedora-33-clang-11 b/tests/dockerfiles/Dockerfile.fedora-33-clang-11
index ed8ed980..cde727b1 100644
--- a/tests/dockerfiles/Dockerfile.fedora-33-clang-11
+++ b/tests/dockerfiles/Dockerfile.fedora-33-clang-11
@@ -2,11 +2,13 @@ ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky
 FROM ${IMAGE}/builder/fedora-33-base:latest
 
 RUN dnf -y -q install \
-    llvm \
-    clang \
-    libcxx-devel \
-    libcxxabi-devel \
-    npm \
-    && dnf clean all \
-    && npm install -g lcov-summary \
-    && npm cache clean --force
+  clang \
+  gcovr \
+  lcov \
+  libcxx-devel \
+  libcxxabi-devel \
+  llvm \
+  npm \
+  && dnf clean all \
+  && npm install -g lcov-summary \
+  && npm cache clean --force
diff --git a/tests/dockerfiles/Dockerfile.ubuntu-clang-11 b/tests/dockerfiles/Dockerfile.ubuntu-clang-11
index 09ebca72..ce26f07b 100644
--- a/tests/dockerfiles/Dockerfile.ubuntu-clang-11
+++ b/tests/dockerfiles/Dockerfile.ubuntu-clang-11
@@ -7,13 +7,15 @@ RUN wget -q https://apt.llvm.org/llvm-snapshot.gpg.key \
   && DEBIAN_FRONTEND=noninteractive \
   apt-get install -qy --no-install-recommends \
   clang-11 \
-  lldb-11 \
-  lld-11 \
-  libc++-11-dev \
-  libc++abi-11-dev \
-  clang-tools-11 \
   clang-format-11 \
   clang-tidy-11 \
+  clang-tools-11 \
+  lcov \
+  gcovr \
+  libc++-11-dev \
+  libc++abi-11-dev \
+  lld-11 \
+  lldb-11 \
   nodejs \
   npm \
   && apt-get clean \