diff --git a/README.rst b/README.rst index 6c5c2104..0950303b 100644 --- a/README.rst +++ b/README.rst @@ -189,7 +189,7 @@ its testing framework. We depends on the following libraries: * https://golang.org/x/net/spdy To run the tests, after installing above packages and their -dependencies, run:: +dependencies, enter ``integration-tests`` directory and run:: $ make it diff --git a/configure.ac b/configure.ac index 187f95e8..7c3f5fd2 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,9 @@ AC_CANONICAL_TARGET AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([subdir-objects]) -AM_EXTRA_RECURSIVE_TARGETS([it]) +# comment out for now since this requires automake 1.13 or higher and +# travis has older one. +# AM_EXTRA_RECURSIVE_TARGETS([it]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/integration-tests/Makefile.am b/integration-tests/Makefile.am index 1ee791fb..85ab3943 100644 --- a/integration-tests/Makefile.am +++ b/integration-tests/Makefile.am @@ -25,5 +25,5 @@ EXTRA_DIST = \ nghttpx_test.go \ server_tester.go -it-local: +it: sh setenv go test -v diff --git a/lib/Makefile.am b/lib/Makefile.am index 3faf7094..35a05954 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -63,5 +63,3 @@ HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \ libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS) libnghttp2_la_LDFLAGS = -no-undefined \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - -it-local: all diff --git a/src/Makefile.am b/src/Makefile.am index edd1ad4b..3c167b8c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -198,5 +198,3 @@ libnghttp2_asio_la_LDFLAGS = \ libnghttp2_asio_la_LIBADD = $(top_builddir)/lib/libnghttp2.la endif # ENABLE_ASIO_LIB - -it-local: all diff --git a/third-party/Makefile.am b/third-party/Makefile.am index 8587b127..7549cd6d 100644 --- a/third-party/Makefile.am +++ b/third-party/Makefile.am @@ -27,5 +27,3 @@ noinst_LTLIBRARIES = libhttp-parser.la libhttp_parser_la_SOURCES = \ http-parser/http_parser.c \ http-parser/http_parser.h - -it-local: all