diff options
Diffstat (limited to 'tests/proxy-test.c')
| -rw-r--r-- | tests/proxy-test.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/tests/proxy-test.c b/tests/proxy-test.c index ceb2ff37..423a5598 100644 --- a/tests/proxy-test.c +++ b/tests/proxy-test.c @@ -2,8 +2,6 @@ #include "test-utils.h" -#ifdef HAVE_APACHE - typedef struct { const char *explanation; const char *url; @@ -231,6 +229,8 @@ do_async_proxy_test (gconstpointer data) { SoupProxyTest *test = (SoupProxyTest *)data; + SOUP_TEST_SKIP_IF_NO_APACHE; + do_proxy_test (test, FALSE); } @@ -239,6 +239,8 @@ do_sync_proxy_test (gconstpointer data) { SoupProxyTest *test = (SoupProxyTest *)data; + SOUP_TEST_SKIP_IF_NO_APACHE; + do_proxy_test (test, TRUE); } @@ -260,6 +262,8 @@ do_proxy_fragment_test (gconstpointer data) SoupURI *proxy_uri, *req_uri; SoupMessage *msg; + SOUP_TEST_SKIP_IF_NO_APACHE; + debug_printf (1, "\nTesting request with fragment via proxy\n"); proxy_uri = soup_uri_new (proxies[SIMPLE_PROXY]); @@ -286,8 +290,8 @@ do_proxy_redirect_test (void) SoupURI *proxy_uri, *req_uri, *new_uri; SoupMessage *msg; - if (!tls_available) - return; + SOUP_TEST_SKIP_IF_NO_APACHE; + SOUP_TEST_SKIP_IF_NO_TLS; debug_printf (1, "\nTesting redirection through proxy\n"); @@ -358,13 +362,3 @@ main (int argc, char **argv) test_cleanup (); return ret; } - -#else /* HAVE_APACHE */ - -int -main (int argc, char **argv) -{ - return 77; /* SKIP */ -} - -#endif |