diff --git a/.travis.yml b/.travis.yml index 521a3826..973695a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -78,11 +78,11 @@ script: fi - | if [ "$CI_BUILD" = "cmake" ]; then + make make check + # Integration tests for nghttpx; autotools build erases build + # for packaging test. + cd integration-tests + export GO111MODULE=on + make it fi - # As of April, 23, 2016, golang http2 build fails, probably because - # the default go version is too old. - # - cd integration-tests - # - export GOPATH="$PWD/integration-tests/golang" - # - make itprep - # - make it diff --git a/README.rst b/README.rst index aab76fd4..87f6ce4f 100644 --- a/README.rst +++ b/README.rst @@ -323,12 +323,7 @@ its testing framework. We depend on the following libraries: * golang.org/x/net/websocket * https://github.com/tatsuhiro-t/go-nghttp2 -To download the above packages, after settings ``GOPATH``, run the -following command under ``integration-tests`` directory: - -.. code-block:: text - - $ make itprep +Go modules will download these dependencies automatically. To run the tests, run the following command under ``integration-tests`` directory: diff --git a/integration-tests/Makefile.am b/integration-tests/Makefile.am index 1c5fe9d6..0bd0337a 100644 --- a/integration-tests/Makefile.am +++ b/integration-tests/Makefile.am @@ -39,11 +39,6 @@ EXTRA_DIST = \ req-return.rb \ resp-return.rb -itprep: - go get -d -v golang.org/x/net/http2 - go get -d -v github.com/tatsuhiro-t/go-nghttp2 - go get -d -v golang.org/x/net/websocket - it: for i in $(GO_FILES); do [ -e $(builddir)/$$i ] || cp $(srcdir)/$$i $(builddir); done sh setenv go test -v