Skip to content

Commit

Permalink
integration-tests: do not use recursive target
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Lekensteyn committed Mar 13, 2016
1 parent 37b09f6 commit e80977c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit e80977c

Please sign in to comment.