[Libtirpc-devel] [PATCH 4/4] travis: Test also libntirpc

[Petr V. <pv...@su...>]

in some builds in distros which ship it (Debian and Fedora).

Also test builds in Debian stable and oldstable without lib{n,}tirpc
(on stable results as no TI-RPC, oldstable will test glibc TI-RPC).

+ cleanup .travis.yml.

Signed-off-by: Petr Vorel <pv...@su...>
---
 .travis.yml                    | 24 ++++++++++++------------
 travis/debian.cross-compile.sh | 10 ++++++++--
 travis/debian.sh               | 10 ++++++++--
 travis/fedora.sh               | 11 ++++++++---
 4 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d777a94c6..40a7d861a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,11 +12,11 @@ matrix:
 
         # cross compilation builds
         - os: linux
-          env: DISTRO=debian:stable VARIANT=cross-compile ARCH=ppc64el TREE="out"
+          env: DISTRO=debian:stable VARIANT=cross-compile ARCH=ppc64el TREE=out
           compiler: powerpc64le-linux-gnu-gcc
 
         - os: linux
-          env: DISTRO=debian:stable VARIANT=cross-compile ARCH=arm64 TREE="out"
+          env: DISTRO=debian:stable VARIANT=cross-compile ARCH=arm64 TREE=out RPC=libntirpc
           compiler: aarch64-linux-gnu-gcc
 
         # musl (native)
@@ -28,14 +28,14 @@ matrix:
 
         # build with minimal dependencies
         - os: linux
-          env: DISTRO=debian:stable VARIANT=minimal TREE="out"
+          env: DISTRO=debian:stable VARIANT=minimal TREE=out RPC=none
           compiler: clang
 
         # native non-intel
         - os: linux
           arch: ppc64le
           compiler: gcc
-          env: DISTRO=debian:testing
+          env: DISTRO=debian:testing RPC=libntirpc
 
         - os: linux
           arch: s390x
@@ -44,11 +44,11 @@ matrix:
 
         # other builds
         - os: linux
-          env: DISTRO=fedora:latest
+          env: DISTRO=fedora:latest RPC=libntirpc
           compiler: clang
 
         - os: linux
-          env: DISTRO=centos:6 TREE="out"
+          env: DISTRO=centos:6 TREE=out
           compiler: gcc
 
         - os: linux
@@ -56,7 +56,7 @@ matrix:
           compiler: gcc
 
         - os: linux
-          env: DISTRO=debian:oldstable
+          env: DISTRO=debian:oldstable RPC=none
           compiler: clang
 
         - os: linux
@@ -72,15 +72,15 @@ matrix:
           compiler: gcc
 
         - os: linux
-          env: DISTRO=debian:testing
+          env: DISTRO=debian:testing RPC=libntirpc
           compiler: clang
 
         - os: linux
-          env: DISTRO=ubuntu:latest TREE="out"
+          env: DISTRO=ubuntu:latest TREE=out
           compiler: gcc
 
         - os: linux
-          env: DISTRO=ubuntu:xenial
+          env: DISTRO=ubuntu:xenial RPC=libntirpc
           compiler: gcc
 
         - os: linux
@@ -90,7 +90,7 @@ matrix:
 before_install:
     - DIR="/usr/src/ltp"
     - printf "FROM $DISTRO\nRUN mkdir -p $DIR\nWORKDIR $DIR\nCOPY . $DIR\n" > Dockerfile
-    - echo "cat Dockerfile"; cat Dockerfile; echo "=====" # FIXME: debug
+    - echo "cat Dockerfile"; cat Dockerfile; echo "====="
     - docker build -t ltp .
 
 script:
@@ -98,4 +98,4 @@ script:
     - INSTALL="${INSTALL%%/*}"
     - if [ ! "$TREE" ]; then TREE="in"; fi
     - case $VARIANT in cross-compile*) BUILD="cross";; i386) BUILD="32";; *) BUILD="native";; esac
-    - docker run -t ltp /bin/sh -c "cd travis && ./$INSTALL.sh && if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" ./$INSTALL.$VARIANT.sh; fi && ../build.sh -o $TREE -t $BUILD -c $CC"
+    - docker run -t ltp /bin/sh -c "cd travis && RPC=\"$RPC\" ./$INSTALL.sh && if [ \"$VARIANT\" ]; then ARCH=\"$ARCH\" RPC=\"$RPC\" ./$INSTALL.$VARIANT.sh; fi && ../build.sh -o $TREE -t $BUILD -c $CC"
diff --git a/travis/debian.cross-compile.sh b/travis/debian.cross-compile.sh
index 2d2e609be..2f2b7a70c 100755
--- a/travis/debian.cross-compile.sh
+++ b/travis/debian.cross-compile.sh
@@ -2,7 +2,7 @@
 # Copyright (c) 2018-2020 Petr Vorel <pv...@su...>
 set -e
 
-if [ -z "$ARCH" ];
+if [ -z "$ARCH" ]; then
 	echo "missing \$ARCH!"
 	exit 1
 fi
@@ -10,7 +10,13 @@ fi
 dpkg --add-architecture $ARCH
 apt update
 
+EXTRA_PACKAGES="libtirpc-dev:$ARCH"
+case "$RPC" in
+libntirpc) EXTRA_PACKAGES="libntirpc-dev:$ARCH";;
+none) EXTRA_PACKAGES=;;
+esac
+
 apt install -y --no-install-recommends \
 	gcc-${ARCH}-linux-gnu \
 	libc6-dev-${ARCH}-cross \
-	libtirpc-dev:${ARCH}
+	$EXTRA_PACKAGES
diff --git a/travis/debian.sh b/travis/debian.sh
index c8ec9429c..e6ca72ab2 100755
--- a/travis/debian.sh
+++ b/travis/debian.sh
@@ -8,6 +8,12 @@ grep -v oldstable-updates /etc/apt/sources.list > /tmp/sources.list && mv /tmp/s
 
 apt update
 
+EXTRA_PACKAGES="libtirpc-dev"
+case "$RPC" in
+libntirpc) EXTRA_PACKAGES="libntirpc-dev";;
+none) EXTRA_PACKAGES=;;
+esac
+
 apt install -y --no-install-recommends \
 	acl-dev \
 	autoconf \
@@ -33,7 +39,7 @@ apt install -y --no-install-recommends \
 	libselinux1-dev \
 	libsepol1-dev \
 	libssl-dev \
-	libtirpc-dev \
 	linux-libc-dev \
 	lsb-release \
-	pkg-config
+	pkg-config \
+	$EXTRA_PACKAGES
diff --git a/travis/fedora.sh b/travis/fedora.sh
index 768aec762..08feedbd1 100755
--- a/travis/fedora.sh
+++ b/travis/fedora.sh
@@ -2,6 +2,12 @@
 # Copyright (c) 2018-2020 Petr Vorel <pv...@su...>
 set -e
 
+EXTRA_PACKAGES="libtirpc-devel"
+case "$RPC" in
+libntirpc) EXTRA_PACKAGES="libntirpc-devel";;
+none) EXTRA_PACKAGES=;;
+esac
+
 yum -y install \
 	autoconf \
 	automake \
@@ -9,7 +15,6 @@ yum -y install \
 	clang \
 	gcc \
 	findutils \
-	libtirpc \
-	libtirpc-devel \
 	pkg-config \
-	redhat-lsb-core
+	redhat-lsb-core \
+	$EXTRA_PACKAGES
-- 
2.24.1