Integration test and coverage also on Fedora

diff --git a/.travis.fedora.sh b/.travis.fedora.sh
index b27704f5f01c28780966d8dfeb6ba97d66ee008d..5f0d603c089669f132dec6b5d16378ade58ef681 100755 (executable)
--- a/.travis.fedora.sh
+++ b/.travis.fedora.sh
@@ -11,15 +11,26 @@ make package
 # /proc and /sys in the chroot).
 mkdir -p /root/rpmbuild/SOURCES
 cp package/* /root/rpmbuild/SOURCES
-rpmbuild -bb -D "fedora_version 25" -D "jobs `nproc`" package/*.spec
+rpmbuild -bb --with coverage -D "fedora_version 25" -D "jobs `nproc`" package/*.spec
 
 # test the %pre/%post scripts by installing/updating/removing the built packages
 # ignore the dependencies to make the test easier, as a smoke test it's good enough
 rpm -iv --force --nodeps /root/rpmbuild/RPMS/*/*.rpm
+rpm -Uv --force --nodeps /root/rpmbuild/RPMS/*/*.rpm
 
 # smoke test, make sure snapper at least starts
 snapper --version
 
-rpm -Uv --force --nodeps /root/rpmbuild/RPMS/*/*.rpm
+# Run the integration test
+# Running it in the source tree ensures that the coverage report finds it
+pushd /root/rpmbuild/BUILD/snapper-*/testsuite-real
+./setup-and-run-all
+popd
+
+# Coverage report
+pushd /root/rpmbuild/BUILD/snapper-*
+make coverage
+popd
+
 # get the plain package names and remove all packages at once
 rpm -ev --nodeps `rpm -q --qf '%{NAME} ' -p /root/rpmbuild/RPMS/**/*.rpm`

diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 4fb021fd686f099181f578918fbcdaab822cae12..9e021570c8a541400da3ed385f2141b6cdf87a95 100644 (file)
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -1,11 +1,12 @@
-# Build Fedora 27 image
-FROM fedora:27
+# Build Fedora 31 image
+FROM fedora:31
 
 RUN dnf -y install \
   acl \
   autoconf \
   automake \
   boost-devel \
+  btrfs-progs \
   dbus-devel \
   docbook-style-xsl \
   e2fsprogs-devel \
@@ -14,6 +15,7 @@ RUN dnf -y install \
   glibc-langpack-de \
   glibc-langpack-en \
   json-c-devel \
+  lcov \
   libacl-devel \
   libmount-devel \
   libtool \