Makefile.am: Single Makefile mode and parallel-tests

gtk-doc doesn't work as an included Makefile so continue to
use SUBDIRS with docs/reference/*

Run the tests using TAP. Unfortunately the GTest --tap output
mode doesn't behave well in the face of failures, and doesn't
output a test plan. Use our own tap-driver and tap-compiler
for these reasons.

This also fixes several builddir != srcdir issues and testing hacks
that were sneaking around in the code base.

Move the tests into the same directories as the code that it
is testing.

32 files changed, 115 insertions, 115 deletions

diff --git a/egg/Makefile.am b/egg/Makefile.am
index e826a2c..9006b39 100644
--- a/egg/Makefile.am
+++ b/egg/Makefile.am
@@ -1,17 +1,12 @@
-include $(top_srcdir)/Makefile.decl
+# included in top-level Makefile.am
 
-noinst_LTLIBRARIES = \
+noinst_LTLIBRARIES += \
 	libegg.la \
 	libegg-asn1x.la \
 	libegg-hex.la \
 	libegg-secmem.la \
 	libegg-test.la
 
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	-I$(top_srcdir)/build
-
 libegg_la_CFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(LIBGCRYPT_CFLAGS)
@@ -21,44 +16,38 @@ libegg_la_LIBADD = \
 	$(LIBGCRYPT_LIBS)
 
 libegg_la_SOURCES = \
-	egg-armor.c egg-armor.h \
-	egg-asn1x.c egg-asn1x.h \
-	egg-asn1-defs.c egg-asn1-defs.h \
-	egg-buffer.c egg-buffer.h \
-	egg-dh.c egg-dh.h \
-	egg-dn.c egg-dn.h \
-	egg-error.h \
-	egg-decimal.c egg-decimal.h \
-	egg-hex.c egg-hex.h \
-	egg-hkdf.c egg-hkdf.h \
-	egg-libgcrypt.c egg-libgcrypt.h \
-	egg-oid.c egg-oid.h \
-	egg-padding.c egg-padding.h \
-	egg-openssl.c egg-openssl.h \
-	egg-secure-memory.c egg-secure-memory.h \
-	egg-symkey.c egg-symkey.h \
-	egg-testing.c egg-testing.h \
-	egg-timegm.c egg-timegm.h \
-	pk.asn.h pkix.asn.h \
-	$(NULL)
-
-EXTRA_DIST = \
-	pk.asn \
-	pkix.asn \
+	egg/egg-armor.c egg/egg-armor.h \
+	egg/egg-asn1x.c egg/egg-asn1x.h \
+	egg/egg-asn1-defs.c egg/egg-asn1-defs.h \
+	egg/egg-buffer.c egg/egg-buffer.h \
+	egg/egg-dh.c egg/egg-dh.h \
+	egg/egg-dn.c egg/egg-dn.h \
+	egg/egg-error.h \
+	egg/egg-decimal.c egg/egg-decimal.h \
+	egg/egg-hex.c egg/egg-hex.h \
+	egg/egg-hkdf.c egg/egg-hkdf.h \
+	egg/egg-libgcrypt.c egg/egg-libgcrypt.h \
+	egg/egg-oid.c egg/egg-oid.h \
+	egg/egg-padding.c egg/egg-padding.h \
+	egg/egg-openssl.c egg/egg-openssl.h \
+	egg/egg-secure-memory.c egg/egg-secure-memory.h \
+	egg/egg-symkey.c egg/egg-symkey.h \
+	egg/egg-testing.c egg/egg-testing.h \
+	egg/egg-timegm.c egg/egg-timegm.h \
+	egg/pk.asn.h egg/pkix.asn.h \
 	$(NULL)
 
 # --------------------------------------------------------------------
 # COMMON STUFF COMPILED INTO SMALLER COMPONENTS
 
 libegg_asn1x_la_SOURCES = \
-	egg-asn1x.c egg-asn1x.h \
-	$(BUILT_SOURCES)
+	egg/egg-asn1x.c egg/egg-asn1x.h
 
 libegg_asn1x_la_CFLAGS = \
 	$(GLIB_CFLAGS)
 
 libegg_hex_la_SOURCES = \
-	egg-hex.c egg-hex.h
+	egg/egg-hex.c egg/egg-hex.h
 
 libegg_hex_la_CFLAGS = \
 	$(GLIB_CFLAGS)
@@ -67,10 +56,10 @@ libegg_hex_la_LIBADD = \
 	$(GLIB_LIBS)
 
 libegg_secmem_la_SOURCES = \
-	egg-secure-memory.c egg-secure-memory.h
+	egg/egg-secure-memory.c egg/egg-secure-memory.h
 
 libegg_test_la_SOURCES = \
-	egg-testing.c egg-testing.h
+	egg/egg-testing.c egg/egg-testing.h
 
 libegg_test_la_CFLAGS = \
 	$(GLIB_CFLAGS)
@@ -80,12 +69,81 @@ libegg_test_la_LIBADD = \
 
 # -------------------------------------------------------------------
 
-SUBDIRS = . tests
+egg_LDADD =  \
+	libegg.la \
+	$(LIBGCRYPT_LIBS) \
+	$(GLIB_LIBS)
+
+egg_TESTS = \
+	test-asn1 \
+	test-asn1x \
+	test-dn \
+	test-decimal \
+	test-hex \
+	test-hkdf \
+	test-oid \
+	test-secmem \
+	test-padding \
+	test-symkey \
+	test-armor \
+	test-openssl \
+	test-dh
+
+test_armor_SOURCES = egg/test-armor.c
+test_armor_LDADD = $(egg_LDADD)
+
+test_asn1_SOURCES = egg/test-asn1.c egg/test.asn.h
+test_asn1_LDADD = $(egg_LDADD)
+
+test_asn1x_SOURCES = egg/test-asn1x.c
+test_asn1x_LDADD = $(egg_LDADD)
+
+test_decimal_SOURCES = egg/test-decimal.c
+test_decimal_LDADD = $(egg_LDADD)
+
+test_dh_SOURCES = egg/test-dh.c
+test_dh_LDADD = $(egg_LDADD)
 
-check-memory:
-	make -C tests check-memory
+test_dn_SOURCES = egg/test-dn.c
+test_dn_LDADD = $(egg_LDADD)
+
+test_hex_SOURCES = egg/test-hex.c
+test_hex_LDADD = $(egg_LDADD)
+
+test_hkdf_SOURCES = egg/test-hkdf.c
+test_hkdf_LDADD = $(egg_LDADD)
+
+test_oid_SOURCES = egg/test-oid.c
+test_oid_LDADD = $(egg_LDADD)
+
+test_openssl_SOURCES = egg/test-openssl.c
+test_openssl_LDADD = $(egg_LDADD)
+
+test_padding_SOURCES = egg/test-padding.c
+test_padding_LDADD = $(egg_LDADD)
+
+test_secmem_SOURCES = egg/test-secmem.c
+test_secmem_LDADD = $(egg_LDADD)
+
+test_symkey_SOURCES = egg/test-symkey.c
+test_symkey_LDADD = $(egg_LDADD)
+
+check_PROGRAMS += $(egg_TESTS)
+TESTS += $(egg_TESTS)
+
+ASN_SRCS = \
+	egg/pk.asn \
+	egg/pkix.asn \
+	egg/test.asn \
+	$(NULL)
 
 asn:
-	asn1Parser -o pk.asn.h pk.asn
-	asn1Parser -o pkix.asn.h pkix.asn
-	sed -i 's|#include.*|/* \0 */|' pk.asn.h pkix.asn.h
+	for asn in $(ASN_SRCS); do \
+		asn1Parser -o $(srcdir)/$$asn.h $$asn \
+		sed -i 's|#include.*|/* \0 */|' $$asn.h \
+	done
+
+EXTRA_DIST += \
+	egg/fixtures \
+	$(ASN_SRCS) \
+	$(NULL)
diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c
index 7ea1685..0daf2ef 100644
--- a/egg/egg-asn1x.c
+++ b/egg/egg-asn1x.c
@@ -4513,7 +4513,7 @@ traverse_and_dump (GNode *node, gpointer unused)
 
 	depth = g_node_depth (node);
 	for (i = 0; i < depth - 1; ++i)
-		g_printerr ("    ");
+		g_print ("    ");
 
 	an = node->data;
 	output = g_string_new ("");
@@ -4521,14 +4521,14 @@ traverse_and_dump (GNode *node, gpointer unused)
 	dump_append_flags (output, anode_def_flags (node));
 	string = g_utf8_casefold (output->str, output->len - 1);
 	g_string_free (output, TRUE);
-	g_printerr ("+ %s: %s [%s]%s\n", anode_def_name (node), anode_def_value (node),
-	            string, an->parsed || an->value ? " *" : "");
+	g_print ("+ %s: %s [%s]%s\n", anode_def_name (node), anode_def_value (node),
+	         string, an->parsed || an->value ? " *" : "");
 	g_free (string);
 
 	/* Print out all the options */
 	for (l = an->opts; l; l = g_list_next (l)) {
 		for (i = 0; i < depth; ++i)
-			g_printerr ("    ");
+			g_print ("    ");
 
 		def = l->data;
 		output = g_string_new ("");
@@ -4536,7 +4536,7 @@ traverse_and_dump (GNode *node, gpointer unused)
 		dump_append_flags (output, def->type);
 		string = g_utf8_casefold (output->str, output->len - 1);
 		g_string_free (output, TRUE);
-		g_printerr ("- %s: %s [%s]\n", def->name, (const gchar*)def->value, string);
+		g_print ("- %s: %s [%s]\n", def->name, (const gchar*)def->value, string);
 		g_free (string);
 	}
 
diff --git a/egg/egg-timegm.c b/egg/egg-timegm.c
index a075d25..24faa4c 100644
--- a/egg/egg-timegm.c
+++ b/egg/egg-timegm.c
@@ -15,8 +15,6 @@
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
    see <http://www.gnu.org/licenses/>.  */
 
-/* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c.  */
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/egg/egg-timegm.h b/egg/egg-timegm.h
index ad68d23..02bec8f 100644
--- a/egg/egg-timegm.h
+++ b/egg/egg-timegm.h
@@ -16,8 +16,6 @@
    License along with the GNU C Library; see the file COPYING.LIB.  If not,
    see <http://www.gnu.org/licenses/>.  */
 
-/* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c.  */
-
 #ifndef EGG_TIMEGM_H_
 #define EGG_TIMEGM_H_
 
diff --git a/egg/tests/files/dh-params.pem b/egg/fixtures/dh-params.pem
index cc0afd8..cc0afd8 100644
--- a/egg/tests/files/dh-params.pem
+++ b/egg/fixtures/dh-params.pem
diff --git a/egg/tests/files/echo-script.sh b/egg/fixtures/echo-script.sh
index aa0f7a9..aa0f7a9 100644
--- a/egg/tests/files/echo-script.sh
+++ b/egg/fixtures/echo-script.sh
diff --git a/egg/tests/files/pem-rsa-enc.key b/egg/fixtures/pem-rsa-enc.key
index 65439fe..65439fe 100644
--- a/egg/tests/files/pem-rsa-enc.key
+++ b/egg/fixtures/pem-rsa-enc.key
diff --git a/egg/tests/files/test-certificate-1.der b/egg/fixtures/test-certificate-1.der
index 1c08437..1c08437 100644
--- a/egg/tests/files/test-certificate-1.der
+++ b/egg/fixtures/test-certificate-1.der
diff --git a/egg/tests/files/test-personalname-1.der b/egg/fixtures/test-personalname-1.der
index 13ba718..13ba718 100644
--- a/egg/tests/files/test-personalname-1.der
+++ b/egg/fixtures/test-personalname-1.der
diff --git a/egg/tests/files/test-personalname-invalid.der b/egg/fixtures/test-personalname-invalid.der
index 60d5d8c..60d5d8c 100644
--- a/egg/tests/files/test-personalname-invalid.der
+++ b/egg/fixtures/test-personalname-invalid.der
diff --git a/egg/tests/files/test-pkcs12-1.der b/egg/fixtures/test-pkcs12-1.der
index 285d8dd..285d8dd 100644
--- a/egg/tests/files/test-pkcs12-1.der
+++ b/egg/fixtures/test-pkcs12-1.der
diff --git a/egg/tests/files/test-pkcs12-2.der b/egg/fixtures/test-pkcs12-2.der
index eff8c1e..eff8c1e 100644
--- a/egg/tests/files/test-pkcs12-2.der
+++ b/egg/fixtures/test-pkcs12-2.der
diff --git a/egg/tests/files/test-pkcs7-1.der b/egg/fixtures/test-pkcs7-1.der
index d45b9e0..d45b9e0 100755
--- a/egg/tests/files/test-pkcs7-1.der
+++ b/egg/fixtures/test-pkcs7-1.der
diff --git a/egg/tests/files/test-pkcs7-2.der b/egg/fixtures/test-pkcs7-2.der
index d45b9e0..d45b9e0 100755
--- a/egg/tests/files/test-pkcs7-2.der
+++ b/egg/fixtures/test-pkcs7-2.der
diff --git a/egg/tests/files/test-pkcs8-1.der b/egg/fixtures/test-pkcs8-1.der
index 8b61684..8b61684 100644
--- a/egg/tests/files/test-pkcs8-1.der
+++ b/egg/fixtures/test-pkcs8-1.der
diff --git a/egg/tests/files/test-rsakey-1.der b/egg/fixtures/test-rsakey-1.der
index 878fda5..878fda5 100644
--- a/egg/tests/files/test-rsakey-1.der
+++ b/egg/fixtures/test-rsakey-1.der
diff --git a/egg/tests/test-armor.c b/egg/test-armor.c
index eecb285..eecb285 100644
--- a/egg/tests/test-armor.c
+++ b/egg/test-armor.c
diff --git a/egg/tests/test-asn1.c b/egg/test-asn1.c
index 36912f8..883c92b 100644
--- a/egg/tests/test-asn1.c
+++ b/egg/test-asn1.c
@@ -1745,7 +1745,7 @@ setup (Test *test, gconstpointer unused)
 {
 	GBytes *bytes;
 
-	if (!g_file_get_contents (SRCDIR "/files/test-certificate-1.der",
+	if (!g_file_get_contents (SRCDIR "/egg/fixtures/test-certificate-1.der",
 	                          (gchar**)&test->data, &test->n_data, NULL))
 		g_assert_not_reached ();
 
diff --git a/egg/tests/test-asn1x.c b/egg/test-asn1x.c
index f4d8e33..fec410e 100644
--- a/egg/tests/test-asn1x.c
+++ b/egg/test-asn1x.c
@@ -74,11 +74,11 @@ typedef struct {
 } Fixture;
 
 static const Fixture parse_test_fixtures[] = {
-	{ pkix_asn1_tab, SRCDIR "/files/test-certificate-1.der", "Certificate" },
-	{ pkix_asn1_tab, SRCDIR "/files/test-pkcs8-1.der", "pkcs-8-PrivateKeyInfo" },
-	{ pk_asn1_tab, SRCDIR "/files/test-rsakey-1.der", "RSAPrivateKey" },
-	{ pkix_asn1_tab, SRCDIR "/files/test-pkcs7-1.der", "pkcs-7-ContentInfo" },
-	{ pkix_asn1_tab, SRCDIR "/files/test-pkcs7-2.der", "pkcs-7-ContentInfo" },
+	{ pkix_asn1_tab, SRCDIR "/egg/fixtures/test-certificate-1.der", "Certificate" },
+	{ pkix_asn1_tab, SRCDIR "/egg/fixtures/test-pkcs8-1.der", "pkcs-8-PrivateKeyInfo" },
+	{ pk_asn1_tab, SRCDIR "/egg/fixtures/test-rsakey-1.der", "RSAPrivateKey" },
+	{ pkix_asn1_tab, SRCDIR "/egg/fixtures/test-pkcs7-1.der", "pkcs-7-ContentInfo" },
+	{ pkix_asn1_tab, SRCDIR "/egg/fixtures/test-pkcs7-2.der", "pkcs-7-ContentInfo" },
 };
 
 static void
@@ -191,9 +191,9 @@ main (int argc, char **argv)
 		g_free (name);
 	}
 
-	g_test_add ("/asn1x/pkcs12-decode/1", Test, SRCDIR "/files/test-pkcs12-1.der",
+	g_test_add ("/asn1x/pkcs12-decode/1", Test, SRCDIR "/egg/fixtures/test-pkcs12-1.der",
 	            setup, test_pkcs12_decode, teardown);
-	g_test_add ("/asn1x/pkcs5-personal-name/invalid", Test, SRCDIR "/files/test-personalname-invalid.der",
+	g_test_add ("/asn1x/pkcs5-personal-name/invalid", Test, SRCDIR "/egg/fixtures/test-personalname-invalid.der",
 	            setup, test_personal_name_invalid, teardown);
 
 	return g_test_run ();
diff --git a/egg/tests/test-decimal.c b/egg/test-decimal.c
index 051a95e..051a95e 100644
--- a/egg/tests/test-decimal.c
+++ b/egg/test-decimal.c
diff --git a/egg/tests/test-dh.c b/egg/test-dh.c
index c95f479..c95f479 100644
--- a/egg/tests/test-dh.c
+++ b/egg/test-dh.c
diff --git a/egg/tests/test-dn.c b/egg/test-dn.c
index 3cc0561..f209068 100644
--- a/egg/tests/test-dn.c
+++ b/egg/test-dn.c
@@ -46,7 +46,7 @@ setup (Test *test, gconstpointer unused)
 {
 	GBytes *bytes;
 
-	if (!g_file_get_contents (SRCDIR "/files/test-certificate-1.der",
+	if (!g_file_get_contents (SRCDIR "/egg/fixtures/test-certificate-1.der",
 	                          (gchar**)&test->data, &test->n_data, NULL))
 		g_assert_not_reached ();
 
diff --git a/egg/tests/test-hex.c b/egg/test-hex.c
index 6bb8c5b..6bb8c5b 100644
--- a/egg/tests/test-hex.c
+++ b/egg/test-hex.c
diff --git a/egg/tests/test-hkdf.c b/egg/test-hkdf.c
index 14d7fd2..14d7fd2 100644
--- a/egg/tests/test-hkdf.c
+++ b/egg/test-hkdf.c
diff --git a/egg/tests/test-oid.c b/egg/test-oid.c
index 21ae128..21ae128 100644
--- a/egg/tests/test-oid.c
+++ b/egg/test-oid.c
diff --git a/egg/tests/test-openssl.c b/egg/test-openssl.c
index cf3fd4c..b18565f 100644
--- a/egg/tests/test-openssl.c
+++ b/egg/test-openssl.c
@@ -53,7 +53,7 @@ setup (Test *test, gconstpointer unused)
 	gchar *contents;
 	gsize length;
 
-	if (!g_file_get_contents (SRCDIR "/files/pem-rsa-enc.key", &contents, &length, NULL))
+	if (!g_file_get_contents (SRCDIR "/egg/fixtures/pem-rsa-enc.key", &contents, &length, NULL))
 		g_assert_not_reached ();
 
 	test->input = g_bytes_new_take (contents, length);
diff --git a/egg/tests/test-padding.c b/egg/test-padding.c
index d6c0443..d6c0443 100644
--- a/egg/tests/test-padding.c
+++ b/egg/test-padding.c
diff --git a/egg/tests/test-secmem.c b/egg/test-secmem.c
index 8a63983..8a63983 100644
--- a/egg/tests/test-secmem.c
+++ b/egg/test-secmem.c
diff --git a/egg/tests/test-symkey.c b/egg/test-symkey.c
index f363681..f363681 100644
--- a/egg/tests/test-symkey.c
+++ b/egg/test-symkey.c
diff --git a/egg/tests/test.asn b/egg/test.asn
index 05676d7..05676d7 100644
--- a/egg/tests/test.asn
+++ b/egg/test.asn
diff --git a/egg/tests/test.asn.h b/egg/test.asn.h
index f2983e9..f2983e9 100644
--- a/egg/tests/test.asn.h
+++ b/egg/test.asn.h
diff --git a/egg/tests/Makefile.am b/egg/tests/Makefile.am
deleted file mode 100644
index e96a722..0000000
--- a/egg/tests/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-AM_CPPFLAGS = \
-	-I$(top_builddir) \
-	-I$(top_srcdir) \
-	-DSRCDIR="\"@abs_srcdir@\"" \
-	$(GLIB_CFLAGS) \
-	$(LIBGCRYPT_CFLAGS)
-
-LDADD =  \
-	$(top_builddir)/egg/libegg.la \
-	$(LIBGCRYPT_LIBS) \
-	$(GTHREAD_LIBS) \
-	$(GLIB_LIBS)
-
-TEST_PROGS = \
-	test-asn1 \
-	test-asn1x \
-	test-dn \
-	test-decimal \
-	test-hex \
-	test-hkdf \
-	test-oid \
-	test-secmem \
-	test-padding \
-	test-symkey \
-	test-armor \
-	test-openssl \
-	test-dh
-
-test_asn1_SOURCES = \
-	test-asn1.c \
-	test.asn.h \
-	$(NULL)
-
-check_PROGRAMS = $(TEST_PROGS)
-
-test: $(TEST_PROGS)
-	gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(TEST_PROGS)
-
-check-local: test
-
-check-memory: perform-memcheck
-
-all-local: $(check_PROGRAMS)
-
-EXTRA_DIST = \
-	test.asn \
-	files \
-	$(NULL)
-
-asn:
-	asn1Parser -o test.asn.h test.asn
-	sed -i 's|#include.*|/* \0 */|' test.asn.h