From: Gregor Jasny <gregor.jasny@logmein.com>
Date: Sat, 17 Jul 2021 12:05:37 +0000 (+0200)
Subject: Fix test-all-systems (#901)
X-Git-Tag: v4.4~126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba84fb0588c71d4b2506c008c3b89b5540e58bcd;p=thirdparty%2Fccache.git

Fix test-all-systems (#901)
---

diff --git a/dockerfiles/alpine-3.14/Dockerfile b/dockerfiles/alpine-3.14/Dockerfile
index 856636f01..7b795124d 100644
--- a/dockerfiles/alpine-3.14/Dockerfile
+++ b/dockerfiles/alpine-3.14/Dockerfile
@@ -8,9 +8,12 @@ RUN apk add --no-cache \
         elfutils \
         g++ \
         gcc \
+        hiredis-dev \
         libc-dev \
         make \
         perl \
+        python3 \
+        redis \
         zstd-dev
 
 # Redirect all compilers to ccache.
diff --git a/dockerfiles/alpine-3.8/Dockerfile b/dockerfiles/alpine-3.8/Dockerfile
index 28f24b9e1..2aab3547f 100644
--- a/dockerfiles/alpine-3.8/Dockerfile
+++ b/dockerfiles/alpine-3.8/Dockerfile
@@ -8,9 +8,12 @@ RUN apk add --no-cache \
         elfutils \
         g++ \
         gcc \
+        hiredis-dev \
         libc-dev \
         make \
         perl \
+        python3 \
+        redis \
         zstd-dev
 
 # Redirect all compilers to ccache.
diff --git a/dockerfiles/centos-7/Dockerfile b/dockerfiles/centos-7/Dockerfile
index dc1c9f9d5..9ff798800 100644
--- a/dockerfiles/centos-7/Dockerfile
+++ b/dockerfiles/centos-7/Dockerfile
@@ -15,6 +15,7 @@ RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n
         gcc-c++ \
         libzstd-devel \
         make \
+        python3 \
 # Remove superfluous dependencies brought in by asciidoc:
  && rpm -e --nodeps graphviz \
  && yum autoremove -y \
diff --git a/dockerfiles/centos-8/Dockerfile b/dockerfiles/centos-8/Dockerfile
index 784533cfa..9ee7c68a0 100644
--- a/dockerfiles/centos-8/Dockerfile
+++ b/dockerfiles/centos-8/Dockerfile
@@ -14,6 +14,9 @@ RUN dnf install -y epel-release \
         elfutils \
         gcc \
         gcc-c++ \
+        hiredis-devel \
         libzstd-devel \
         make \
+        python3 \
+        redis \
  && dnf clean all
diff --git a/dockerfiles/debian-10/Dockerfile b/dockerfiles/debian-10/Dockerfile
index 703bdc930..8f92ea9aa 100644
--- a/dockerfiles/debian-10/Dockerfile
+++ b/dockerfiles/debian-10/Dockerfile
@@ -9,7 +9,11 @@ RUN apt-get update \
         cmake \
         elfutils \
         gcc-multilib \
+        libhiredis-dev \
         libzstd-dev \
+        python3 \
+        redis-server \
+        redis-tools \
         xsltproc \
  && rm -rf /var/lib/apt/lists/*
 
diff --git a/dockerfiles/debian-11/Dockerfile b/dockerfiles/debian-11/Dockerfile
index 57bfdbeb5..322ab92cd 100644
--- a/dockerfiles/debian-11/Dockerfile
+++ b/dockerfiles/debian-11/Dockerfile
@@ -9,7 +9,11 @@ RUN apt-get update \
         cmake \
         elfutils \
         gcc-multilib \
+        libhiredis-dev \
         libzstd-dev \
+        python3 \
+        redis-server \
+        redis-tools \
         xsltproc \
  && rm -rf /var/lib/apt/lists/*
 
diff --git a/dockerfiles/fedora-32/Dockerfile b/dockerfiles/fedora-32/Dockerfile
index 65c883d58..c4431a7dc 100644
--- a/dockerfiles/fedora-32/Dockerfile
+++ b/dockerfiles/fedora-32/Dockerfile
@@ -11,6 +11,9 @@ RUN dnf install -y \
         findutils \
         gcc \
         gcc-c++ \
+        hiredis-devel \
         libzstd-devel \
         make \
+        python3 \
+        redis \
  && dnf clean all
diff --git a/dockerfiles/ubuntu-18.04/Dockerfile b/dockerfiles/ubuntu-18.04/Dockerfile
index 4ab985b52..9d2a81878 100644
--- a/dockerfiles/ubuntu-18.04/Dockerfile
+++ b/dockerfiles/ubuntu-18.04/Dockerfile
@@ -12,7 +12,11 @@ RUN apt-get update \
         docbook-xsl \
         elfutils \
         gcc-multilib \
+        libhiredis-dev \
         libzstd-dev \
+        python3 \
+        redis-server \
+        redis-tools \
         xsltproc \
  && rm -rf /var/lib/apt/lists/*
 
diff --git a/dockerfiles/ubuntu-20.04/Dockerfile b/dockerfiles/ubuntu-20.04/Dockerfile
index f2be356d0..78ef79c2e 100644
--- a/dockerfiles/ubuntu-20.04/Dockerfile
+++ b/dockerfiles/ubuntu-20.04/Dockerfile
@@ -13,7 +13,11 @@ RUN apt-get update \
         docbook-xsl \
         elfutils \
         gcc-multilib \
+        libhiredis-dev \
         libzstd-dev \
+        python3 \
+        redis-server \
+        redis-tools \
         xsltproc \
  && rm -rf /var/lib/apt/lists/*
 
diff --git a/misc/test-all-systems b/misc/test-all-systems
index 3e28cc6bf..3ab7d855e 100755
--- a/misc/test-all-systems
+++ b/misc/test-all-systems
@@ -32,8 +32,8 @@ build ubuntu-18.04 clang clang++ clang
 build ubuntu-20.04 gcc   g++     gcc
 build ubuntu-20.04 clang clang++ clang
 
-build centos-7     gcc   g++     gcc     -DWARNINGS_AS_ERRORS=false
-build centos-7     gcc   g++     clang   -DWARNINGS_AS_ERRORS=false
+build centos-7     gcc   g++     gcc     -DWARNINGS_AS_ERRORS=false -DREDIS_STORAGE_BACKEND=OFF
+build centos-7     gcc   g++     clang   -DWARNINGS_AS_ERRORS=false -DREDIS_STORAGE_BACKEND=OFF
 
 build centos-8     gcc   g++     gcc
 build centos-8     clang clang++ clang
diff --git a/src/Util.cpp b/src/Util.cpp
index e40729960..942465d17 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -45,6 +45,7 @@ extern "C" {
 #include <fcntl.h>
 
 #include <algorithm>
+#include <climits>
 #include <fstream>
 
 #ifndef HAVE_DIRENT_H