walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

integration: Add recursive it target

This commit is contained in:
Tatsuhiro Tsujikawa 2015-01-20 21:19:52 +09:00
parent 9ab71305d1
commit 6e446934d4
6 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -49,6 +49,7 @@ AC_CANONICAL_TARGET
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([subdir-objects]) AM_INIT_AUTOMAKE([subdir-objects])
AM_EXTRA_RECURSIVE_TARGETS([it])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

4
integration-tests/Makefile.am
View File

@ -25,5 +25,5 @@ EXTRA_DIST = \
nghttpx_test.go \ nghttpx_test.go \
server_tester.go server_tester.go
it: it-local:
sh setenv go test sh setenv go test -v

2
integration-tests/server_tester.go
View File

@ -102,7 +102,7 @@ func newServerTester(args []string, t *testing.T, handler http.HandlerFunc) *ser
conn, err := net.Dial("tcp", fmt.Sprintf("127.0.0.1:%v", serverPort)) conn, err := net.Dial("tcp", fmt.Sprintf("127.0.0.1:%v", serverPort))
if err != nil { if err != nil {
retry += 1 retry += 1
if retry >= 10 { if retry >= 100 {
st.t.Fatalf("Error server is not responding too long; server command-line arguments may be invalid") st.t.Fatalf("Error server is not responding too long; server command-line arguments may be invalid")
} }
time.Sleep(150 * time.Millisecond) time.Sleep(150 * time.Millisecond)

2
lib/Makefile.am
View File

@ -63,3 +63,5 @@ HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS) libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS)
libnghttp2_la_LDFLAGS = -no-undefined \ libnghttp2_la_LDFLAGS = -no-undefined \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
it-local: all

2
src/Makefile.am
View File

@ -198,3 +198,5 @@ libnghttp2_asio_la_LDFLAGS = \
libnghttp2_asio_la_LIBADD = $(top_builddir)/lib/libnghttp2.la libnghttp2_asio_la_LIBADD = $(top_builddir)/lib/libnghttp2.la
endif # ENABLE_ASIO_LIB endif # ENABLE_ASIO_LIB
it-local: all

2
third-party/Makefile.am vendored
View File

@ -27,3 +27,5 @@ noinst_LTLIBRARIES = libhttp-parser.la
libhttp_parser_la_SOURCES = \ libhttp_parser_la_SOURCES = \
http-parser/http_parser.c \ http-parser/http_parser.c \
http-parser/http_parser.h http-parser/http_parser.h
it-local: all