Fix test-all-systems (#901)

diff --git a/dockerfiles/alpine-3.14/Dockerfile b/dockerfiles/alpine-3.14/Dockerfile
index 856636f016960b329edff581be8e0a21b7952f3e..7b795124dbcf756c9e6532ba1466e5b07801df8b 100644 (file)
--- 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 28f24b9e12b9c3bf6d416ed4f8781442a0b4057b..2aab3547f7a4256a33413f0360d21a9f291a6071 100644 (file)
--- 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 dc1c9f9d513a7d365ab65ef41947469cfe6f8ae6..9ff79880003ec08f30600ee1c5e00c8353479b5a 100644 (file)
--- 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 784533cfa88a883f511d90facbc5a6c00fa3a91b..9ee7c68a0010de1d5f96225be6ac52d184f221a3 100644 (file)
--- 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 703bdc9307c31bf79d7324ffee04e8e0a391b3ee..8f92ea9aa1afbb75454240e60e9a24483b5206ee 100644 (file)
--- 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 57bfdbeb5b99adca99a956dab90373d28eb76815..322ab92cdd3503914064ad0973d67fa4f5c09510 100644 (file)
--- 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 65c883d584a0fec721e8f94a8aba2685253f738b..c4431a7dcca284f06afc1154e86f2311c9ee2d59 100644 (file)
--- 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 4ab985b528c070c1d5360d6f8a211d613d0da580..9d2a818789c7535d901b374e52cdb1fb281780df 100644 (file)
--- 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 f2be356d057739ce72c750198a230de73ec04b11..78ef79c2ebb7861714a2fce37bf9027a40595b68 100644 (file)
--- 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 3e28cc6bf70464e3220f11c5f3d26f10804d71b2..3ab7d855ecb31d8fa1ea41114453d85f20735065 100755 (executable)
--- 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 e407299602e849f2702f47f4fa3892099cdbd9b5..942465d1770a6a92ebea21bff01d0bc2c51f01bb 100644 (file)
--- 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