Skip to content

N
nghttp2
Commit 2eb7137e authored by Tatsuhiro Tsujikawa's avatar Tatsuhiro Tsujikawa
Browse files
Options

Merge branch 'Lekensteyn-autotools-it'

parents e58db4f8 caa12ec5
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
.travis.yml
View file @ 2eb7137e
...@@ -48,5 +48,5 @@ script: ...@@ -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
configure.ac
View file @ 2eb7137e
...@@ -40,8 +40,6 @@ AC_CANONICAL_TARGET ...@@ -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:
......
integration-tests/Makefile.am
View file @ 2eb7137e
...@@ -39,12 +39,12 @@ EXTRA_DIST = \ ...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment