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.
This commit is contained in:
Peter Wu 2016-03-13 15:24:27 +01:00
parent 37b09f6785
commit e80977c812
3 changed files with 4 additions and 6 deletions

View File

@ -48,5 +48,5 @@ script:
- make check - make check
- cd integration-tests - cd integration-tests
- export GOPATH="$PWD/integration-tests/golang" - export GOPATH="$PWD/integration-tests/golang"
- make itprep-local - make itprep
- make it-local - make it

View File

@ -40,8 +40,6 @@ AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([subdir-objects]) 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])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
dnl See versioning rule: dnl See versioning rule:

View File

@ -39,12 +39,12 @@ EXTRA_DIST = \
req-return.rb \ req-return.rb \
resp-return.rb resp-return.rb
itprep-local: itprep:
go get -d -v golang.org/x/net/http2 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/go-nghttp2
go get -d -v github.com/tatsuhiro-t/spdy go get -d -v github.com/tatsuhiro-t/spdy
go get -d -v golang.org/x/net/websocket 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 for i in $(GO_FILES); do [ -e $(builddir)/$$i ] || cp $(srcdir)/$$i $(builddir); done
sh setenv go test -v sh setenv go test -v