From 6e446934d4b98580c1dcb59116313ee6c789a7dd Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Tue, 20 Jan 2015 21:19:52 +0900
Subject: [PATCH] integration: Add recursive it target

---
 configure.ac                       | 1 +
 integration-tests/Makefile.am      | 4 ++--
 integration-tests/server_tester.go | 2 +-
 lib/Makefile.am                    | 2 ++
 src/Makefile.am                    | 2 ++
 third-party/Makefile.am            | 2 ++
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5b1e6231..187f95e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,7 @@ AC_CANONICAL_TARGET
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([subdir-objects])
+AM_EXTRA_RECURSIVE_TARGETS([it])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
diff --git a/integration-tests/Makefile.am b/integration-tests/Makefile.am
index e4f44406..1ee791fb 100644
--- a/integration-tests/Makefile.am
+++ b/integration-tests/Makefile.am
@@ -25,5 +25,5 @@ EXTRA_DIST = \
 	nghttpx_test.go \
 	server_tester.go
 
-it:
-	sh setenv go test
+it-local:
+	sh setenv go test -v
diff --git a/integration-tests/server_tester.go b/integration-tests/server_tester.go
index 0ee251cf..e4197e2d 100644
--- a/integration-tests/server_tester.go
+++ b/integration-tests/server_tester.go
@@ -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))
 		if err != nil {
 			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")
 			}
 			time.Sleep(150 * time.Millisecond)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 35a05954..3faf7094 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -63,3 +63,5 @@ HFILES = nghttp2_pq.h nghttp2_int.h nghttp2_map.h nghttp2_queue.h \
 libnghttp2_la_SOURCES = $(HFILES) $(OBJECTS)
 libnghttp2_la_LDFLAGS = -no-undefined \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
+it-local: all
diff --git a/src/Makefile.am b/src/Makefile.am
index 3c167b8c..edd1ad4b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -198,3 +198,5 @@ libnghttp2_asio_la_LDFLAGS = \
 libnghttp2_asio_la_LIBADD = $(top_builddir)/lib/libnghttp2.la
 
 endif # ENABLE_ASIO_LIB
+
+it-local: all
diff --git a/third-party/Makefile.am b/third-party/Makefile.am
index 7549cd6d..8587b127 100644
--- a/third-party/Makefile.am
+++ b/third-party/Makefile.am
@@ -27,3 +27,5 @@ noinst_LTLIBRARIES = libhttp-parser.la
 libhttp_parser_la_SOURCES = \
 	http-parser/http_parser.c \
 	http-parser/http_parser.h
+
+it-local: all