shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-03 05:18:24 +03:00
Code Issues Projects Releases Wiki Activity

Always enable trivial-httpd for tests

Browse Source 
When running tests we always need ostree-trivial-httpd, so enable it
unconditionally

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
This commit is contained in:
Alex Kiernan 2019-09-04 17:29:15 +01:00
parent 985a141002
commit 82699a67db
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -39,6 +39,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS += \
--enable-gtk-doc \ --enable-gtk-doc \
--enable-man \ --enable-man \
--disable-maintainer-mode \ --disable-maintainer-mode \
--enable-trivial-httpd-cmdline \
$(NULL) $(NULL)
GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make

5
ci/build.sh
View File

@ -22,6 +22,11 @@ case "${CONFIGOPTS:-}" in
fi fi
;; ;;
esac esac
# unless libsoup is disabled, enable trivial-httpd for the tests
case "${CONFIGOPTS:-}" in
*--without-soup*) ;;
*) CONFIGOPTS="${CONFIGOPTS:-} --enable-trivial-httpd-cmdline" ;;
esac
# always fail on warnings; https://github.com/ostreedev/ostree/pull/971 # always fail on warnings; https://github.com/ostreedev/ostree/pull/971
# NB: this disables the default set of flags from configure.ac # NB: this disables the default set of flags from configure.ac

1
ci/travis-build.sh
View File

@ -85,6 +85,7 @@ make="make -j${ci_parallel} V=1 VERBOSE=1"
../configure \ ../configure \
--enable-always-build-tests \ --enable-always-build-tests \
--enable-trivial-httpd-cmdline \
${ci_configopts} ${ci_configopts}
"$@" "$@"