| Brad Bishop | 0a92126 | 2019-09-24 07:40:45 -0400 | [diff] [blame] | 1 | From 44e0647230b22cd136ae2fb252ce90eed4751970 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Wed, 4 Sep 2019 17:29:15 +0100 |
| 4 | Subject: [PATCH 1/2] Always enable trivial-httpd for tests |
| 5 | |
| 6 | When running tests we always need ostree-trivial-httpd, so enable it |
| 7 | unconditionally |
| 8 | |
| 9 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
| 10 | Upstream-Status: Submitted [https://github.com/ostreedev/ostree/pull/1912] |
| 11 | --- |
| 12 | Makefile.am | 1 + |
| 13 | ci/build.sh | 5 +++++ |
| 14 | ci/travis-build.sh | 1 + |
| 15 | 3 files changed, 7 insertions(+) |
| 16 | |
| 17 | diff --git a/Makefile.am b/Makefile.am |
| 18 | index cd04a055045a..673dbf88de55 100644 |
| 19 | --- a/Makefile.am |
| 20 | +++ b/Makefile.am |
| 21 | @@ -39,6 +39,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS += \ |
| 22 | --enable-gtk-doc \ |
| 23 | --enable-man \ |
| 24 | --disable-maintainer-mode \ |
| 25 | + --enable-trivial-httpd-cmdline \ |
| 26 | $(NULL) |
| 27 | |
| 28 | GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make |
| 29 | diff --git a/ci/build.sh b/ci/build.sh |
| 30 | index 0901507498f2..806af050b780 100755 |
| 31 | --- a/ci/build.sh |
| 32 | +++ b/ci/build.sh |
| 33 | @@ -22,6 +22,11 @@ case "${CONFIGOPTS:-}" in |
| 34 | fi |
| 35 | ;; |
| 36 | esac |
| 37 | +# unless libsoup is disabled, enable trivial-httpd for the tests |
| 38 | +case "${CONFIGOPTS:-}" in |
| 39 | + *--without-soup*) ;; |
| 40 | + *) CONFIGOPTS="${CONFIGOPTS:-} --enable-trivial-httpd-cmdline" ;; |
| 41 | +esac |
| 42 | |
| 43 | # always fail on warnings; https://github.com/ostreedev/ostree/pull/971 |
| 44 | # NB: this disables the default set of flags from configure.ac |
| 45 | diff --git a/ci/travis-build.sh b/ci/travis-build.sh |
| 46 | index 3fd969bdced6..7c85313a2d32 100755 |
| 47 | --- a/ci/travis-build.sh |
| 48 | +++ b/ci/travis-build.sh |
| 49 | @@ -85,6 +85,7 @@ make="make -j${ci_parallel} V=1 VERBOSE=1" |
| 50 | |
| 51 | ../configure \ |
| 52 | --enable-always-build-tests \ |
| 53 | + --enable-trivial-httpd-cmdline \ |
| 54 | ${ci_configopts} |
| 55 | "$@" |
| 56 | |
| 57 | -- |
| 58 | 2.17.1 |
| 59 | |