[libsoup] tests: simplify and improve "make check"

[Dan Winship <danw src gnome org>]

commit f8f7454fc4b561cb896e6234e69da0102906089d
Author: Dan Winship <danw gnome org>
Date:   Sat Feb 16 18:26:54 2013 -0500

    tests: simplify and improve "make check"
    
    Remove rules that automake can figure out itself. Run the tests in
    alphabetical order. Run "make kill-httpd" at the end of "make check",
    in case the last httpd-using test crashed.

 tests/Makefile.am |  120 ++++++++++++++---------------------------------------
 1 files changed, 31 insertions(+), 89 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7af3975..6f0c5ae 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,93 +11,59 @@ LIBS =                      \
        $(LIBGNUTLS_LIBS) \
        $(GLIB_LIBS)
 
-noinst_PROGRAMS =      \
+tests =                        \
        cache-test      \
        chunk-test      \
        coding-test     \
        connection-test \
        context-test    \
        continue-test   \
-       cookies-test    \
+       cookies-test    \
        date            \
-       dns             \
-       forms-test      \
-       get             \
-       header-parsing  \
+       header-parsing  \
        misc-test       \
        multipart-test  \
-       ntlm-test-helper \
        ntlm-test       \
        redirect-test   \
        requester-test  \
        resource-test   \
        session-test    \
-       simple-httpd    \
-       simple-proxy    \
-       sniffing-test   \
+       sniffing-test   \
        socket-test     \
        ssl-test        \
        streaming-test  \
        timeout-test    \
        tld-test        \
-       uri-parsing     \
-       $(CURL_TESTS)   \
-       $(APACHE_TESTS) \
-       $(XMLRPC_TESTS)
-
-noinst_DATA = soup-tests.gresource
-
-TEST_SRCS = test-utils.c test-utils.h
-
-auth_test_SOURCES = auth-test.c $(TEST_SRCS)
-cache_test_SOURCES = cache-test.c $(TEST_SRCS)
-chunk_test_SOURCES = chunk-test.c $(TEST_SRCS)
-coding_test_SOURCES = coding-test.c $(TEST_SRCS)
-connection_test_SOURCES = connection-test.c $(TEST_SRCS)
-context_test_SOURCES = context-test.c $(TEST_SRCS)
-continue_test_SOURCES = continue-test.c $(TEST_SRCS)
-cookies_test_SOURCES = cookies-test.c $(TEST_SRCS)
-date_SOURCES = date.c $(TEST_SRCS)
-dns_SOURCES = dns.c
-forms_test_SOURCES = forms-test.c $(TEST_SRCS)
-get_SOURCES = get.c
-if BUILD_LIBSOUP_GNOME
-get_LDADD = $(top_builddir)/libsoup/libsoup-gnome-2.4.la
-endif
-header_parsing_SOURCES = header-parsing.c $(TEST_SRCS)
-multipart_test_SOURCES = multipart-test.c $(TEST_SRCS)
-misc_test_SOURCES = misc-test.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)
-range_test_SOURCES = range-test.c $(TEST_SRCS)
-redirect_test_SOURCES = redirect-test.c $(TEST_SRCS)
-requester_test_SOURCES = requester-test.c $(TEST_SRCS)
-resource_test_SOURCES = resource-test.c $(TEST_SRCS)
-server_auth_test_SOURCES = server-auth-test.c $(TEST_SRCS)
-session_test_SOURCES = session-test.c $(TEST_SRCS)
-simple_httpd_SOURCES = simple-httpd.c
-simple_proxy_SOURCES = simple-proxy.c
-sniffing_test_SOURCES = sniffing-test.c  $(TEST_SRCS)
-socket_test_SOURCES = socket-test.c  $(TEST_SRCS)
-ssl_test_SOURCES = ssl-test.c  $(TEST_SRCS)
-streaming_test_SOURCES = streaming-test.c $(TEST_SRCS)
-timeout_test_SOURCES = timeout-test.c $(TEST_SRCS)
-tld_test_SOURCES = tld-test.c $(TEST_SRCS)
-uri_parsing_SOURCES = uri-parsing.c $(TEST_SRCS)
-xmlrpc_test_SOURCES = xmlrpc-test.c $(TEST_SRCS)
-xmlrpc_server_test_SOURCES = xmlrpc-server-test.c $(TEST_SRCS)
+       uri-parsing
 
 if HAVE_APACHE
-APACHE_TESTS = auth-test proxy-test pull-api range-test
+tests += auth-test proxy-test pull-api range-test
 endif
 if HAVE_CURL
-CURL_TESTS = forms-test server-auth-test
+tests += forms-test server-auth-test
 endif
 if HAVE_XMLRPC_PHP
-XMLRPC_TESTS = xmlrpc-test xmlrpc-server-test
+tests += xmlrpc-test xmlrpc-server-test
 endif
 
+noinst_PROGRAMS =              \
+       $(tests)                \
+       dns                     \
+       get                     \
+       ntlm-test-helper        \
+       simple-httpd            \
+       simple-proxy
+
+noinst_DATA = soup-tests.gresource
+
+noinst_LTLIBRARIES = libtest.la
+
+libtest_la_SOURCES =   \
+       test-utils.c    \
+       test-utils.h
+
+LDADD = libtest.la
+
 if HAVE_APACHE
 if HAVE_APACHE_2_2
 httpd_conf_in = httpd.conf.22.in
@@ -120,33 +86,7 @@ endif
 soup-tests.gresource: soup-tests.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) 
--generate-dependencies $(srcdir)/soup-tests.gresource.xml)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)  $<
 
-TESTS =                        \
-       cache-test      \
-       chunk-test      \
-       coding-test     \
-       connection-test \
-       context-test    \
-       continue-test   \
-       cookies-test    \
-       date            \
-       header-parsing  \
-       misc-test       \
-       multipart-test  \
-       ntlm-test       \
-       redirect-test   \
-       requester-test  \
-       resource-test   \
-       session-test    \
-       sniffing-test   \
-       socket-test     \
-       ssl-test        \
-       streaming-test  \
-       timeout-test    \
-       tld-test        \
-       uri-parsing     \
-       $(APACHE_TESTS) \
-       $(CURL_TESTS)   \
-       $(XMLRPC_TESTS)
+TESTS = $(sort $(tests))
 
 RESOURCES =                    \
        resources/atom.xml      \
@@ -176,12 +116,14 @@ EXTRA_DIST =                       \
 
 DISTCLEANFILES = soup-tests.gresource httpd.conf
 
+check-local: check-TESTS kill-httpd
 if MISSING_REGRESSION_TEST_PACKAGES
-check-local: check-TESTS
        @echo ""
        @echo "NOTE: some tests were not run due to missing packages:" $(MISSING_REGRESSION_TEST_PACKAGES)
        @echo ""
 endif
 
 kill-httpd:
-       $(APACHE_HTTPD) -d `pwd` -f httpd.conf -k stop
+       @if [ -f httpd.pid ]; then \
+               $(APACHE_HTTPD) -d `pwd` -f httpd.conf -k stop; \
+       fi