Merge libsoup-2.4 branch to trunk

	* Merge libsoup-2.4 branch to trunk

svn path=/trunk/; revision=1041

1 files changed, 31 insertions, 15 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 99295076..3f9ce551 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,42 +9,48 @@ LIBS = $(top_builddir)/libsoup/libsoup-$(SOUP_API_VERSION).la
 
 noinst_PROGRAMS =	\
 	context-test	\
+	continue-test	\
 	date		\
-	dict		\
 	dns		\
 	get		\
 	getbug		\
 	header-parsing  \
 	ntlm-test	\
-	revserver	\
 	simple-httpd	\
 	simple-proxy	\
 	uri-parsing	\
+	$(CURL_TESTS)	\
 	$(APACHE_TESTS)	\
 	$(SSL_TESTS)	\
 	$(XMLRPC_TESTS)
 
-auth_test_SOURCES = auth-test.c apache-wrapper.c apache-wrapper.h
-context_test_SOURCES = context-test.c
-date_SOURCES = date.c
-dict_SOURCES = dict.c
+TEST_SRCS = test-utils.c test-utils.h
+
+auth_test_SOURCES = auth-test.c $(TEST_SRCS)
+context_test_SOURCES = context-test.c $(TEST_SRCS)
+continue_test_SOURCES = continue-test.c $(TEST_SRCS)
+date_SOURCES = date.c $(TEST_SRCS)
 dns_SOURCES = dns.c
 get_SOURCES = get.c
 getbug_SOURCES = getbug.c
-header_parsing_SOURCES = header-parsing.c
-ntlm_test_SOURCES = ntlm-test.c
-proxy_test_SOURCES = proxy-test.c apache-wrapper.c apache-wrapper.h
-pull_api_SOURCES = pull-api.c apache-wrapper.c apache-wrapper.h
-revserver_SOURCES = revserver.c
+header_parsing_SOURCES = header-parsing.c $(TEST_SRCS)
+ntlm_test_SOURCES = ntlm-test.c $(TEST_SRCS)
+proxy_test_SOURCES = proxy-test.c $(TEST_SRCS)
+pull_api_SOURCES = pull-api.c $(TEST_SRCS)
+query_test_SOURCES = query-test.c $(TEST_SRCS)
+server_auth_test_SOURCES = server-auth-test.c $(TEST_SRCS)
 simple_httpd_SOURCES = simple-httpd.c
 simple_proxy_SOURCES = simple-proxy.c
-ssl_test_SOURCES = ssl-test.c
-uri_parsing_SOURCES = uri-parsing.c
-xmlrpc_test_SOURCES = xmlrpc-test.c apache-wrapper.c apache-wrapper.h
+ssl_test_SOURCES = ssl-test.c $(TEST_SRCS)
+uri_parsing_SOURCES = uri-parsing.c $(TEST_SRCS)
+xmlrpc_test_SOURCES = xmlrpc-test.c $(TEST_SRCS)
 
 if HAVE_APACHE
 APACHE_TESTS = auth-test proxy-test pull-api
 endif
+if HAVE_CURL
+CURL_TESTS = query-test server-auth-test
+endif
 if HAVE_SSL
 SSL_TESTS = ssl-test
 endif
@@ -52,7 +58,17 @@ if HAVE_XMLRPC_EPI_PHP
 XMLRPC_TESTS = xmlrpc-test
 endif
 
-TESTS = context-test date header-parsing uri-parsing ntlm-test $(APACHE_TESTS) $(SSL_TESTS) $(XMLRPC_TESTS)
+TESTS =			\
+	context-test	\
+	continue-test	\
+	date		\
+	header-parsing	\
+	uri-parsing	\
+	ntlm-test	\
+	$(APACHE_TESTS)	\
+	$(CURL_TESTS)	\
+	$(SSL_TESTS)	\
+	$(XMLRPC_TESTS)
 
 EXTRA_DIST =		\
 	libsoup.supp	\