improved check to disable only tests requiring spdylay

1 files changed, 9 insertions, 12 deletions

diff --git a/src/testspdy/Makefile.am b/src/testspdy/Makefile.am
index 4042ef95..cbad3389 100644
--- a/src/testspdy/Makefile.am
+++ b/src/testspdy/Makefile.am
@@ -21,20 +21,19 @@ if !HAVE_W32
 PERF_GET_CONCURRENT=perf_get_concurrent
 endif
 
-if HAVE_SPDYLAY
-check_PROGRAMS = \ test_daemon_start_stop \
+if HAVE_SPDYLAY  
+  SPDYLAY_CHECKS = test_new_connection  test_request_response test_notls 
+endif 
+
+check_PROGRAMS = \
+        test_daemon_start_stop \
   test_daemon_start_stop_many \
   test_struct_namevalue \
-  test_new_connection \
-  test_request_response \
-  test_notls \
   test_request_response_with_callback \
+  $(SPDYLAY_CHECKS)
   #test_requests_with_assets \
   test_misc \
   test_session_timeout
-else
-check_PROGRAMS =
-endif
 
 TESTS = $(check_PROGRAMS)
 
@@ -64,6 +63,7 @@ test_struct_namevalue_SOURCES = \
  $(SPDY_SOURCES) 
 test_struct_namevalue_LDADD = $(SPDY_LDADD)
 
+if HAVE_SPDYLAY
 test_new_connection_SOURCES = \
  test_new_connection.c  \
  $(SPDY_SOURCES) 
@@ -81,6 +81,7 @@ test_notls_SOURCES = \
  $(SPDY_SOURCES) 
 test_notls_LDADD = $(SPDY_LDADD) \
  -lspdylay
+endif
 
 test_request_response_with_callback_SOURCES = \
  test_request_response_with_callback.c  \
@@ -102,9 +103,7 @@ test_session_timeout_SOURCES = \
  $(SPDY_SOURCES) 
 test_session_timeout_LDADD = $(SPDY_LDADD)
 
-if HAVE_SPDYLAY
 if HAVE_CURL_BINARY
-
 check_PROGRAMS +=  \
   test_proxies
   
@@ -112,6 +111,4 @@ test_proxies_SOURCES = \
  test_proxies.c \
  $(SPDY_SOURCES) 
 test_proxies_LDADD = $(SPDY_LDADD)
-
-endif
 endif