ci: Add an "all options disabled" context
authorColin Walters <walters@verbum.org>
Tue, 19 Sep 2017 19:19:05 +0000 (15:19 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Thu, 21 Sep 2017 20:57:25 +0000 (20:57 +0000)
We keep occasionally regressing this so let's start covering it now. I'm
intentionally not running the tests since that would likely entail a lot more
conditionalizing pain.

Closes: #1194
Approved by: jlebon

.papr.yml
ci/build.sh

index 56ff4dae57e197b1c8b3075aac4f115e536ad1cf..4ae345e6ffc76a33f962fd5177fd5aaec038fb37 100644 (file)
--- a/.papr.yml
+++ b/.papr.yml
@@ -74,6 +74,20 @@ tests:
 
 ---
 
+inherit: true
+
+context: f26-minimal
+env:
+  CONFIGOPTS: '--without-curl --without-soup --disable-gtk-doc --disable-man
+   --disable-rust --without-libarchive --without-selinux --without-smack
+   --without-openssl --without-avahi --without-libmount --disable-rofiles-fuse
+   --disable-experimental-api'
+
+tests:
+  - ci/build.sh
+
+---
+
 inherit: true
 required: true
 
index 33ef9503058aba670778676837f60d8671281891..572ae1970b359e2d4b497d12053b0ab71b1fd8a5 100755 (executable)
@@ -21,15 +21,19 @@ pkg_install_if_os fedora gjs gnome-desktop-testing parallel coccinelle clang
 # always fail on warnings; https://github.com/ostreedev/ostree/pull/971
 export CFLAGS="-Werror ${CFLAGS:-}"
 
-DETECTED_CONFIGOPTS=
-if test -x /usr/bin/gnome-desktop-testing-runner; then
-    DETECTED_CONFIGOPTS="${DETECTED_CONFIGOPTS} --enable-installed-tests=exclusive"
-fi
 # Default libcurl on by default in fedora unless libsoup is enabled
 if sh -c '. /etc/os-release; test "${ID}" = fedora'; then
     case "${CONFIGOPTS:-}" in
-        *--with-soup*) ;;
+        *--with-soup*|*--without-curl*) ;;
         *) CONFIGOPTS="${CONFIGOPTS:-} --with-curl"
     esac
 fi
-build --enable-gtk-doc ${DETECTED_CONFIGOPTS} ${CONFIGOPTS:-}
+case "${CONFIGOPTS:-}" in
+    *--with-curl*|--with-soup*)
+        if test -x /usr/bin/gnome-desktop-testing-runner; then
+            CONFIGOPTS="${CONFIGOPTS} --enable-installed-tests=exclusive"
+        fi
+        ;;
+esac
+
+build --enable-gtk-doc ${CONFIGOPTS:-}