tests: sort the Makefile

I'm afraid you'll have to take my word for it that I did nothing except
(manually!) sort this Makefile and correct some erratic formatting.

1 files changed, 131 insertions, 133 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f2a3df7..c4112cb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,98 +46,97 @@ TLSDEFS  := -DTLS_CA_KEY_FILE='"$(CA_KEY)"'      \
             -DTLS_CRL_DIR='"$(CRL_DIR)"'         \
             -DTLS_CA_DIR='"$(CA_DIR)"'
 ############################################################################
-TEST_PROGS = wocky-xmpp-reader-test \
-  wocky-xmpp-readwrite-test \
-  wocky-xmpp-connection-test \
-  wocky-porter-test \
-  wocky-loopback-test \
-  wocky-xmpp-node-test \
-  wocky-node-tree-test \
-  wocky-stanza-test \
-  wocky-roster-test \
+TEST_PROGS = \
   wocky-bare-contact-test \
-  wocky-resource-contact-test \
+  wocky-caps-hash-test \
+  wocky-connector-test \
   wocky-contact-factory-test \
-  wocky-session-test \
-  wocky-pep-service-test \
-  wocky-tls-test \
   wocky-data-form-test \
-  wocky-pubsub-service-test \
-  wocky-pubsub-node-test \
-  wocky-connector-test \
-  wocky-ping-test \
   wocky-jid-validation-test \
+  wocky-loopback-test \
+  wocky-node-tree-test \
+  wocky-pep-service-test \
+  wocky-ping-test \
+  wocky-porter-test \
+  wocky-pubsub-node-test \
+  wocky-pubsub-service-test \
+  wocky-resource-contact-test \
+  wocky-roster-test \
   wocky-sasl-utils-test \
-  wocky-utils-test \
   wocky-scram-sha1-test \
-  wocky-caps-hash-test
+  wocky-session-test \
+  wocky-stanza-test \
+  wocky-tls-test \
+  wocky-utils-test \
+  wocky-xmpp-connection-test \
+  wocky-xmpp-node-test \
+  wocky-xmpp-reader-test \
+  wocky-xmpp-readwrite-test \
+  $(NULL)
 
 noinst_PROGRAMS =
 
-wocky_tls_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_tls_test_SOURCES = \
-  wocky-tls-test.c        \
-  wocky-test-helper.c wocky-test-helper.h \
-  wocky-test-stream.c wocky-test-stream.h
-wocky_tls_test_CFLAGS = $(AM_CFLAGS) $(TLSDEFS)
+if HAVE_LIBSASL2
+  TEST_PROGS += wocky-test-sasl-auth
+  noinst_PROGRAMS += wocky-dummy-xmpp-server
+endif
 
-wocky_xmpp_connection_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_xmpp_connection_test_SOURCES = \
-  wocky-xmpp-connection-test.c \
-  wocky-test-helper.c wocky-test-helper.h \
-  wocky-test-stream.c wocky-test-stream.h
+if HAVE_GIO_PROXY
+  TEST_PROGS += wocky-http-proxy-test
+endif
 
-wocky_xmpp_readwrite_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_xmpp_readwrite_test_SOURCES = \
-  wocky-test-stream.c wocky-test-stream.h \
+wocky_bare_contact_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_bare_contact_test_SOURCES = \
   wocky-test-helper.c wocky-test-helper.h \
-  wocky-xmpp-readwrite-test.c
+  wocky-test-stream.c wocky-test-stream.h \
+  wocky-bare-contact-test.c
 
-wocky_xmpp_reader_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_xmpp_reader_test_SOURCES = \
+wocky_caps_hash_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_caps_hash_test_SOURCES = wocky-caps-hash-test.c \
   wocky-test-helper.c wocky-test-helper.h \
-  wocky-test-stream.c wocky-test-stream.h \
-  wocky-xmpp-reader-test.c
+  wocky-test-stream.c wocky-test-stream.h
 
 wocky_connector_test_DEPENDENCIES = $(CA_DIR) certs $(LIBWOCKY)
-
 wocky_connector_test_SOURCES = \
-   wocky-connector-test.c        \
+   wocky-connector-test.c \
    wocky-test-sasl-auth-server.c \
    wocky-test-sasl-auth-server.h \
    wocky-test-connector-server.c \
    wocky-test-connector-server.h \
    wocky-test-helper.c wocky-test-helper.h \
-  wocky-test-stream.c wocky-test-stream.h \
-   test-resolver.h        	 \
-   test-resolver.c
+   wocky-test-stream.c wocky-test-stream.h \
+   test-resolver.c test-resolver.h
+
 wocky_connector_test_LDADD = $(LDADD) @LIBSASL2_LIBS@
 wocky_connector_test_CFLAGS = $(AM_CFLAGS) @LIBSASL2_CFLAGS@ $(TLSDEFS)
 
-if HAVE_LIBSASL2
-  TEST_PROGS += wocky-test-sasl-auth
-endif
+wocky_contact_factory_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_contact_factory_test_SOURCES = \
+  wocky-test-helper.c wocky-test-helper.h \
+  wocky-test-stream.c wocky-test-stream.h \
+  wocky-contact-factory-test.c
 
-wocky_sasl_utils_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_sasl_utils_test_SOURCES = wocky-sasl-utils-test.c
+wocky_data_form_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_data_form_test_SOURCES = \
+  wocky-test-helper.c wocky-test-helper.h \
+  wocky-test-stream.c wocky-test-stream.h \
+  wocky-data-form-test.c
 
-wocky_test_sasl_auth_DEPENDENCIES = $(LIBWOCKY)
-wocky_test_sasl_auth_SOURCES = \
-   wocky-test-helper.c wocky-test-helper.h \
-   wocky-test-sasl-auth.c \
-   wocky-test-sasl-handler.c \
-   wocky-test-sasl-handler.h \
-   wocky-test-sasl-auth-server.c \
-   wocky-test-sasl-auth-server.h \
-   wocky-test-stream.c \
-   wocky-test-stream.h
+wocky_dummy_xmpp_server_DEPENDENCIES = $(LIBWOCKY)
+wocky_dummy_xmpp_server_SOURCES = wocky-dummy-xmpp-server.c \
+   wocky-test-connector-server.c wocky-test-connector-server.h \
+   wocky-test-sasl-auth-server.c wocky-test-sasl-auth-server.h
+wocky_dummy_xmpp_server_LDADD = $(LDADD) @LIBSASL2_LIBS@
+wocky_dummy_xmpp_server_CFLAGS = $(AM_CFLAGS) @LIBSASL2_CFLAGS@ $(TLSDEFS)
 
-wocky_test_sasl_auth_LDADD = $(LDADD) @LIBSASL2_LIBS@
-wocky_test_sasl_auth_CFLAGS = $(AM_CFLAGS) @LIBSASL2_CFLAGS@
+wocky_http_proxy_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_http_proxy_test_SOURCES = wocky-http-proxy-test.c \
+  wocky-test-helper.c wocky-test-helper.h \
+  wocky-test-stream.c wocky-test-stream.h
 
-wocky_porter_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_porter_test_SOURCES = \
-  wocky-porter-test.c \
+wocky_jid_validation_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_jid_validation_test_SOURCES = \
+  wocky-jid-validation-test.c \
   wocky-test-helper.c wocky-test-helper.h \
   wocky-test-stream.c wocky-test-stream.h
 
@@ -147,123 +146,122 @@ wocky_loopback_test_SOURCES = \
   wocky-test-stream.c wocky-test-stream.h \
   wocky-loopback-test.c
 
-wocky_xmpp_node_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_xmpp_node_test_SOURCES = \
-  wocky-test-helper.c wocky-test-helper.h \
-  wocky-test-stream.c wocky-test-stream.h \
-  wocky-xmpp-node-test.c
-
 wocky_node_tree_test_DEPENDENCIES = $(LIBWOCKY)
 wocky_node_tree_test_SOURCES = \
   wocky-test-helper.c wocky-test-helper.h \
   wocky-test-stream.c wocky-test-stream.h \
   wocky-node-tree-test.c
 
-wocky_stanza_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_stanza_test_SOURCES = \
+wocky_pep_service_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_pep_service_test_SOURCES = \
   wocky-test-helper.c wocky-test-helper.h \
   wocky-test-stream.c wocky-test-stream.h \
-  wocky-stanza-test.c
+  wocky-pep-service-test.c
 
-wocky_roster_test_SOURCES = \
-  wocky-roster-test.c \
+wocky_ping_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_ping_test_SOURCES = \
+  wocky-ping-test.c \
   wocky-test-helper.c wocky-test-helper.h \
   wocky-test-stream.c wocky-test-stream.h
 
-wocky_bare_contact_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_bare_contact_test_SOURCES = \
+wocky_porter_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_porter_test_SOURCES = \
+  wocky-porter-test.c \
   wocky-test-helper.c wocky-test-helper.h \
-  wocky-test-stream.c wocky-test-stream.h \
-  wocky-bare-contact-test.c
+  wocky-test-stream.c wocky-test-stream.h
 
-wocky_resource_contact_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_resource_contact_test_SOURCES = \
+wocky_pubsub_node_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_pubsub_node_test_SOURCES = \
   wocky-test-helper.c wocky-test-helper.h \
   wocky-test-stream.c wocky-test-stream.h \
-  wocky-resource-contact-test.c
+  wocky-pubsub-test-helpers.c wocky-pubsub-test-helpers.h \
+  wocky-pubsub-node-test.c
 
-wocky_contact_factory_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_contact_factory_test_SOURCES = \
+wocky_pubsub_service_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_pubsub_service_test_SOURCES = \
   wocky-test-helper.c wocky-test-helper.h \
   wocky-test-stream.c wocky-test-stream.h \
-  wocky-contact-factory-test.c
+  wocky-pubsub-test-helpers.c wocky-pubsub-test-helpers.h \
+  wocky-pubsub-service-test.c
 
-wocky_session_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_session_test_SOURCES = \
+wocky_resource_contact_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_resource_contact_test_SOURCES = \
   wocky-test-helper.c wocky-test-helper.h \
   wocky-test-stream.c wocky-test-stream.h \
-  wocky-session-test.c
+  wocky-resource-contact-test.c
 
-wocky_pep_service_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_pep_service_test_SOURCES = \
+wocky_roster_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_roster_test_SOURCES = \
+  wocky-roster-test.c \
   wocky-test-helper.c wocky-test-helper.h \
-  wocky-test-stream.c wocky-test-stream.h \
-  wocky-pep-service-test.c
+  wocky-test-stream.c wocky-test-stream.h
 
-wocky_data_form_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_data_form_test_SOURCES = \
+wocky_sasl_utils_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_sasl_utils_test_SOURCES = wocky-sasl-utils-test.c
+
+wocky_scram_sha1_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_scram_sha1_test_SOURCES = wocky-scram-sha1-test.c \
   wocky-test-helper.c wocky-test-helper.h \
-  wocky-test-stream.c wocky-test-stream.h \
-  wocky-data-form-test.c
+  wocky-test-stream.c wocky-test-stream.h
 
-wocky_pubsub_service_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_pubsub_service_test_SOURCES = \
+wocky_session_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_session_test_SOURCES = \
   wocky-test-helper.c wocky-test-helper.h \
   wocky-test-stream.c wocky-test-stream.h \
-  wocky-pubsub-test-helpers.c wocky-pubsub-test-helpers.h \
-  wocky-pubsub-service-test.c
+  wocky-session-test.c
 
-wocky_pubsub_node_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_pubsub_node_test_SOURCES = \
+wocky_stanza_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_stanza_test_SOURCES = \
   wocky-test-helper.c wocky-test-helper.h \
   wocky-test-stream.c wocky-test-stream.h \
-  wocky-pubsub-test-helpers.c wocky-pubsub-test-helpers.h \
-  wocky-pubsub-node-test.c
+  wocky-stanza-test.c
 
-wocky_ping_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_ping_test_SOURCES = \
-  wocky-ping-test.c \
-  wocky-test-helper.c wocky-test-helper.h \
-  wocky-test-stream.c wocky-test-stream.h
+wocky_test_sasl_auth_DEPENDENCIES = $(LIBWOCKY)
+wocky_test_sasl_auth_SOURCES = \
+   wocky-test-helper.c wocky-test-helper.h \
+   wocky-test-sasl-auth.c \
+   wocky-test-sasl-handler.c \
+   wocky-test-sasl-handler.h \
+   wocky-test-sasl-auth-server.c \
+   wocky-test-sasl-auth-server.h \
+   wocky-test-stream.c \
+   wocky-test-stream.h
+wocky_test_sasl_auth_LDADD = $(LDADD) @LIBSASL2_LIBS@
+wocky_test_sasl_auth_CFLAGS = $(AM_CFLAGS) @LIBSASL2_CFLAGS@
 
-wocky_jid_validation_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_jid_validation_test_SOURCES = \
-  wocky-jid-validation-test.c \
+wocky_tls_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_tls_test_SOURCES = \
+  wocky-tls-test.c        \
   wocky-test-helper.c wocky-test-helper.h \
   wocky-test-stream.c wocky-test-stream.h
+wocky_tls_test_CFLAGS = $(AM_CFLAGS) $(TLSDEFS)
 
 wocky_utils_test_DEPENDENCIES = $(LIBWOCKY)
 wocky_utils_test_SOURCES = wocky-utils-test.c
 
-wocky_scram_sha1_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_scram_sha1_test_SOURCES = wocky-scram-sha1-test.c \
+wocky_xmpp_connection_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_xmpp_connection_test_SOURCES = \
+  wocky-xmpp-connection-test.c \
   wocky-test-helper.c wocky-test-helper.h \
   wocky-test-stream.c wocky-test-stream.h
 
-wocky_http_proxy_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_http_proxy_test_SOURCES = wocky-http-proxy-test.c \
+wocky_xmpp_node_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_xmpp_node_test_SOURCES = \
   wocky-test-helper.c wocky-test-helper.h \
-  wocky-test-stream.c wocky-test-stream.h
-
-if HAVE_LIBSASL2
-  wocky_dummy_xmpp_server_DEPENDENCIES = $(LIBWOCKY)
-  wocky_dummy_xmpp_server_SOURCES = wocky-dummy-xmpp-server.c \
-     wocky-test-connector-server.c wocky-test-connector-server.h \
-     wocky-test-sasl-auth-server.c wocky-test-sasl-auth-server.h
-  wocky_dummy_xmpp_server_LDADD = $(LDADD) @LIBSASL2_LIBS@
-  wocky_dummy_xmpp_server_CFLAGS = $(AM_CFLAGS) @LIBSASL2_CFLAGS@ $(TLSDEFS)
-
-  noinst_PROGRAMS += wocky-dummy-xmpp-server
-endif
+  wocky-test-stream.c wocky-test-stream.h \
+  wocky-xmpp-node-test.c
 
-wocky_caps_hash_test_DEPENDENCIES = $(LIBWOCKY)
-wocky_caps_hash_test_SOURCES = wocky-caps-hash-test.c \
+wocky_xmpp_reader_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_xmpp_reader_test_SOURCES = \
   wocky-test-helper.c wocky-test-helper.h \
-  wocky-test-stream.c wocky-test-stream.h
+  wocky-test-stream.c wocky-test-stream.h \
+  wocky-xmpp-reader-test.c
 
-if HAVE_GIO_PROXY
-  TEST_PROGS += wocky-http-proxy-test
-endif
+wocky_xmpp_readwrite_test_DEPENDENCIES = $(LIBWOCKY)
+wocky_xmpp_readwrite_test_SOURCES = \
+  wocky-test-stream.c wocky-test-stream.h \
+  wocky-test-helper.c wocky-test-helper.h \
+  wocky-xmpp-readwrite-test.c
 
 AM_CFLAGS = $(ERROR_CFLAGS) $(GCOV_CFLAGS) @GLIB_CFLAGS@ \
   @LIBXML2_CFLAGS@ @TLS_CFLAGS@ @WOCKY_CFLAGS@