From 0b71d9b828d0bac0e29a393406d5eb97a627a29c Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 17 Dec 2016 22:18:43 +0900 Subject: [PATCH 1/2] travis: Do `make distcheck` for autotools build --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7462f03a..f225f8e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,8 @@ before_script: - if [ "$CI_BUILD" = "autotools" ]; then ./configure --enable-werror --with-mruby --with-neverbleed LIBSPDYLAY_CFLAGS="-I$SPDYLAY_HOME/lib/includes" LIBSPDYLAY_LIBS="-L$SPDYLAY_HOME/lib/.libs -lspdylay" CPPFLAGS=-fsanitize=address LDFLAGS=-fsanitize=address; fi - if [ "$CI_BUILD" = "cmake" ]; then cmake -DENABLE_WERROR=1 -DWITH_MRUBY=1 -DWITH_NEVERBLEED=1 -DSPDYLAY_INCLUDE_DIR="$SPDYLAY_HOME/lib/includes" -DSPDYLAY_LIBRARY="$SPDYLAY_HOME/lib/.libs/libspdylay.so"; fi script: - - make check + - if [ "$CI_BUILD" = "autotools" ]; then make distcheck; fi + - if [ "$CI_BUILD" = "cmake" ]; then make check; fi # As of April, 23, 2016, golang http2 build fails, probably because # the default go version is too old. # - cd integration-tests From 5029b85b256910e82709bdf8cdc43f27c0b3423c Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 17 Dec 2016 22:27:14 +0900 Subject: [PATCH 2/2] Add -f option to rm rst files not to pause travis build --- doc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index ba6b5104..48817820 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -266,7 +266,7 @@ apiref.rst: \ $(APIDOCS): apiref.rst clean-local: - [ $(srcdir) = $(builddir) ] || for i in $(RST_FILES); do [ -e $(builddir)/$$i ] && rm $(builddir)/$$i; done + [ $(srcdir) = $(builddir) ] || for i in $(RST_FILES); do [ -e $(builddir)/$$i ] && rm -f $(builddir)/$$i; done -rm -f apiref.rst -rm -f $(APIDOCS) -rm -rf $(BUILDDIR)/*