From e80977c8128b0201a15576c9792a943ba1caaf9b Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Sun, 13 Mar 2016 15:24:27 +0100 Subject: [PATCH] integration-tests: do not use recursive target Older automake (travis, *cough*) do not support the AM_EXTRA_RECURSIVE_TARGETS option, this results in invoking "it-local" directly in the travis script which relies on an implementation detail. Since the "it" target is only used by the integration-tests directory, just avoid the recursive targets. The README.rst suggests to enter the integration-tests directory anyway. --- .travis.yml | 4 ++-- configure.ac | 2 -- integration-tests/Makefile.am | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7239bd90..0191126e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,5 +48,5 @@ script: - make check - cd integration-tests - export GOPATH="$PWD/integration-tests/golang" - - make itprep-local - - make it-local + - make itprep + - make it diff --git a/configure.ac b/configure.ac index cf9e60fd..b8afe63d 100644 --- a/configure.ac +++ b/configure.ac @@ -40,8 +40,6 @@ AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([subdir-objects]) -# AM_EXTRA_RECURSIVE_TARGETS requires automake 1.13 or higher -m4_ifdef([AM_EXTRA_RECURSIVE_TARGETS], [AM_EXTRA_RECURSIVE_TARGETS([it itprep])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl See versioning rule: diff --git a/integration-tests/Makefile.am b/integration-tests/Makefile.am index aab50096..a926c4f2 100644 --- a/integration-tests/Makefile.am +++ b/integration-tests/Makefile.am @@ -39,12 +39,12 @@ EXTRA_DIST = \ req-return.rb \ resp-return.rb -itprep-local: +itprep: go get -d -v golang.org/x/net/http2 go get -d -v github.com/tatsuhiro-t/go-nghttp2 go get -d -v github.com/tatsuhiro-t/spdy go get -d -v golang.org/x/net/websocket -it-local: +it: for i in $(GO_FILES); do [ -e $(builddir)/$$i ] || cp $(srcdir)/$$i $(builddir); done sh setenv go test -v