diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-20 08:09:31 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-20 08:09:31 +0000 |
commit | bc260c1afe158afcda802da8c2ae73dd4e81960c (patch) | |
tree | 9c2eb8bd8c2d5f4354155bbf154b0b74cfec6d63 | |
parent | f5d96db320aed70f77e29cf9551a76c7cafd649e (diff) | |
download | libmicrohttpd-bc260c1afe158afcda802da8c2ae73dd4e81960c.tar.gz libmicrohttpd-bc260c1afe158afcda802da8c2ae73dd4e81960c.zip |
-help buildbots not build tests if spdy is not enabled
-rw-r--r-- | src/testspdy/Makefile.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/testspdy/Makefile.am b/src/testspdy/Makefile.am index cedf37a1..e5fa1f2d 100644 --- a/src/testspdy/Makefile.am +++ b/src/testspdy/Makefile.am | |||
@@ -21,14 +21,15 @@ if !HAVE_W32 | |||
21 | PERF_GET_CONCURRENT=perf_get_concurrent | 21 | PERF_GET_CONCURRENT=perf_get_concurrent |
22 | endif | 22 | endif |
23 | 23 | ||
24 | 24 | if ENABLE_SPDY | |
25 | if HAVE_OPENSSL | ||
25 | check_PROGRAMS = \ | 26 | check_PROGRAMS = \ |
26 | test_daemon_start_stop \ | 27 | test_daemon_start_stop \ |
27 | test_daemon_start_stop_many \ | 28 | test_daemon_start_stop_many \ |
28 | test_struct_namevalue | 29 | test_struct_namevalue |
29 | 30 | ||
30 | if HAVE_SPDYLAY | 31 | if HAVE_SPDYLAY |
31 | check_PROGRAMS += \ | 32 | check_PROGRAMS += \ |
32 | test_new_connection \ | 33 | test_new_connection \ |
33 | test_request_response \ | 34 | test_request_response \ |
34 | test_notls \ | 35 | test_notls \ |
@@ -37,6 +38,8 @@ if HAVE_SPDYLAY | |||
37 | test_session_timeout | 38 | test_session_timeout |
38 | #test_requests_with_assets | 39 | #test_requests_with_assets |
39 | endif | 40 | endif |
41 | endif | ||
42 | endif | ||
40 | 43 | ||
41 | 44 | ||
42 | TESTS = $(check_PROGRAMS) | 45 | TESTS = $(check_PROGRAMS) |
@@ -109,7 +112,7 @@ test_session_timeout_LDADD = $(SPDY_LDADD) | |||
109 | if HAVE_CURL_BINARY | 112 | if HAVE_CURL_BINARY |
110 | check_PROGRAMS += \ | 113 | check_PROGRAMS += \ |
111 | test_proxies | 114 | test_proxies |
112 | 115 | ||
113 | test_proxies_SOURCES = \ | 116 | test_proxies_SOURCES = \ |
114 | test_proxies.c \ | 117 | test_proxies.c \ |
115 | $(SPDY_SOURCES) | 118 | $(SPDY_SOURCES) |