[testing] Preprocess test files before searching for tests.

 * Allows tests to be commented out or ifdefed.
 * Faster building of tests.
 * Other cleanup of tests.

13 files changed, 105 insertions, 103 deletions

diff --git a/egg/tests/Makefile.am b/egg/tests/Makefile.am
index 2e7e6928..013f0ef3 100644
--- a/egg/tests/Makefile.am
+++ b/egg/tests/Makefile.am
@@ -1,6 +1,9 @@
 asn1-def-test.c: test.asn
 	$(ASN1PARSER) -o asn1-def-test.c $(srcdir)/test.asn
 
+TESTING_SOURCES = \
+	asn1-def-test.c
+
 # Test files should be listed in order they need to run
 TESTING_FILES = \
 	test-asn1.c \
@@ -14,8 +17,7 @@ TESTING_FILES = \
 	unit-test-symkey.c \
 	unit-test-openssl.c \
 	unit-test-dh.c \
-	unit-test-spawn.c \
-	asn1-def-test.c
+	unit-test-spawn.c
 
 UNIT_PROMPT = 
 
diff --git a/egg/tests/test-asn1.c b/egg/tests/test-asn1.c
index 460b76c7..8e2ac79f 100644
--- a/egg/tests/test-asn1.c
+++ b/egg/tests/test-asn1.c
@@ -55,7 +55,7 @@ const gchar ENUM_THREE[] =           "\x0A\x01\x03";
 
 #define XL(x) G_N_ELEMENTS (x) - 1
 
-DEFINE_TEST(asn1_boolean)
+TESTING_TEST(asn1_boolean)
 {
 	GNode *asn;
 	gboolean value;
@@ -92,7 +92,7 @@ DEFINE_TEST(asn1_boolean)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_integer)
+TESTING_TEST(asn1_integer)
 {
 	GNode *asn;
 	gulong value;
@@ -120,7 +120,7 @@ DEFINE_TEST(asn1_integer)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_octet_string)
+TESTING_TEST(asn1_octet_string)
 {
 	GNode *asn;
 	gchar *value;
@@ -148,7 +148,7 @@ DEFINE_TEST(asn1_octet_string)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_generalized_time)
+TESTING_TEST(asn1_generalized_time)
 {
 	GNode *asn;
 	glong value;
@@ -175,7 +175,7 @@ DEFINE_TEST(asn1_generalized_time)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_implicit)
+TESTING_TEST(asn1_implicit)
 {
 	GNode *asn;
 	gchar *value;
@@ -193,7 +193,7 @@ DEFINE_TEST(asn1_implicit)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_explicit)
+TESTING_TEST(asn1_explicit)
 {
 	GNode *asn;
 	gchar *value;
@@ -211,7 +211,7 @@ DEFINE_TEST(asn1_explicit)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_bit_string_decode)
+TESTING_TEST(asn1_bit_string_decode)
 {
 	GNode *asn;
 	guchar *bits;
@@ -235,7 +235,7 @@ DEFINE_TEST(asn1_bit_string_decode)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_bit_string_decode_bad)
+TESTING_TEST(asn1_bit_string_decode_bad)
 {
 	GNode *asn;
 
@@ -249,7 +249,7 @@ DEFINE_TEST(asn1_bit_string_decode_bad)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_bit_string_decode_ulong)
+TESTING_TEST(asn1_bit_string_decode_ulong)
 {
 	GNode *asn;
 	gulong bits;
@@ -271,7 +271,7 @@ DEFINE_TEST(asn1_bit_string_decode_ulong)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_bit_string_encode_decode)
+TESTING_TEST(asn1_bit_string_encode_decode)
 {
 	GNode *asn;
 	guchar bits[] = { 0x5d, 0x6e, 0x83 };
@@ -305,7 +305,7 @@ DEFINE_TEST(asn1_bit_string_encode_decode)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_bit_string_encode_decode_ulong)
+TESTING_TEST(asn1_bit_string_encode_decode_ulong)
 {
 	GNode *asn;
 	gulong check, bits = 0x0101b977;
@@ -335,7 +335,7 @@ DEFINE_TEST(asn1_bit_string_encode_decode_ulong)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_bit_string_encode_decode_zero)
+TESTING_TEST(asn1_bit_string_encode_decode_zero)
 {
 	GNode *asn;
 	gpointer data;
@@ -357,7 +357,7 @@ DEFINE_TEST(asn1_bit_string_encode_decode_zero)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_have)
+TESTING_TEST(asn1_have)
 {
 	GNode *asn;
 	guchar *data;
@@ -391,7 +391,7 @@ test_is_freed (gpointer unused)
 	is_freed = TRUE;
 }
 
-DEFINE_TEST(asn1_any_set_raw)
+TESTING_TEST(asn1_any_set_raw)
 {
 	GNode *asn, *node;
 	guchar *data;
@@ -428,7 +428,7 @@ DEFINE_TEST(asn1_any_set_raw)
 	g_assert (is_freed);
 }
 
-DEFINE_TEST(asn1_any_set_raw_explicit)
+TESTING_TEST(asn1_any_set_raw_explicit)
 {
 	GNode *asn, *node;
 	guchar *data;
@@ -465,7 +465,7 @@ DEFINE_TEST(asn1_any_set_raw_explicit)
 	g_assert (is_freed);
 }
 
-DEFINE_TEST(asn1_choice_not_chosen)
+TESTING_TEST(asn1_choice_not_chosen)
 {
 	GNode *asn, *node;
 	guchar *data;
@@ -531,19 +531,19 @@ perform_asn1_any_choice_set_raw (const gchar *choice, const gchar *encoding, gsi
 	g_assert (is_freed);
 }
 
-DEFINE_TEST(asn1_any_choice_set_raw_short_tag)
+TESTING_TEST(asn1_any_choice_set_raw_short_tag)
 {
 	const gchar ENCODING[] = "\xBE\x0C\x04\x0A""farnsworth";
 	perform_asn1_any_choice_set_raw ("choiceShortTag", ENCODING, XL (ENCODING));
 }
 
-DEFINE_TEST(asn1_any_choice_set_raw_long_tag)
+TESTING_TEST(asn1_any_choice_set_raw_long_tag)
 {
 	const gchar ENCODING[] = "\xBF\x1F\x0C\x04\x0A""farnsworth";
 	perform_asn1_any_choice_set_raw ("choiceLongTag", ENCODING, XL (ENCODING));
 }
 
-DEFINE_TEST(asn1_append)
+TESTING_TEST(asn1_append)
 {
 	GNode *asn;
 	GNode *child;
@@ -576,7 +576,7 @@ DEFINE_TEST(asn1_append)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_append_and_clear)
+TESTING_TEST(asn1_append_and_clear)
 {
 	GNode *asn;
 	gpointer data;
@@ -606,7 +606,7 @@ DEFINE_TEST(asn1_append_and_clear)
 	g_free (data);
 }
 
-DEFINE_TEST(asn1_setof)
+TESTING_TEST(asn1_setof)
 {
 	GNode *asn;
 	gpointer data;
@@ -642,7 +642,7 @@ DEFINE_TEST(asn1_setof)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(asn1_setof_empty)
+TESTING_TEST(asn1_setof_empty)
 {
 	GNode *asn;
 	gpointer data;
@@ -667,7 +667,7 @@ DEFINE_TEST(asn1_setof_empty)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST (asn1_enumerated)
+TESTING_TEST (asn1_enumerated)
 {
 	GNode *asn;
 	gpointer data;
diff --git a/egg/tests/test-dn.c b/egg/tests/test-dn.c
index aa0a61c6..0ac7a959 100644
--- a/egg/tests/test-dn.c
+++ b/egg/tests/test-dn.c
@@ -42,7 +42,7 @@ static GNode* asn1_cert = NULL;
 static guchar *data_cert = NULL;
 static gsize n_data_cert = 0;
 
-DEFINE_SETUP(dn_cert)
+TESTING_SETUP(dn_cert)
 {
 	data_cert = testing_data_read ("test-certificate-1.der", &n_data_cert);
 
@@ -53,14 +53,14 @@ DEFINE_SETUP(dn_cert)
 		g_assert_not_reached ();
 }
 
-DEFINE_TEARDOWN(dn_cert)
+TESTING_TEARDOWN(dn_cert)
 {
 	egg_asn1x_destroy (asn1_cert);
 	g_free (data_cert);
 	data_cert = NULL;
 }
 
-DEFINE_TEST(read_dn)
+TESTING_TEST(read_dn)
 {
 	gchar *dn;
 
@@ -71,7 +71,7 @@ DEFINE_TEST(read_dn)
 	g_free (dn);
 }
 
-DEFINE_TEST(dn_value)
+TESTING_TEST(dn_value)
 {
 	const guchar value[] = { 0x13, 0x1a, 0x54, 0x68, 0x61, 0x77, 0x74, 0x65, 0x20, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x61, 0x6c, 0x20, 0x50, 0x72, 0x65, 0x6d, 0x69, 0x75, 0x6d, 0x20, 0x43, 0x41 };
 	gsize n_value = 28;
@@ -118,7 +118,7 @@ concatenate_dn (guint index, GQuark oid, const guchar *value, gsize n_value, gpo
 	g_free (text);
 }
 
-DEFINE_TEST(parse_dn)
+TESTING_TEST(parse_dn)
 {
 	GString *dn = g_string_new ("");
 	last_index = 1;
@@ -130,7 +130,7 @@ DEFINE_TEST(parse_dn)
 	g_string_free (dn, TRUE);
 }
 
-DEFINE_TEST(read_dn_part)
+TESTING_TEST(read_dn_part)
 {
 	GNode *node;
 	gchar *value;
diff --git a/egg/tests/test-padding.c b/egg/tests/test-padding.c
index a42729ed..3a11f467 100644
--- a/egg/tests/test-padding.c
+++ b/egg/tests/test-padding.c
@@ -55,21 +55,21 @@ test_padding (EggPadding padding, gsize block, gconstpointer input,
 	g_assert_cmpsize (n_output, ==, n_result);
 }
 
-DEFINE_TEST(zero_padding)
+TESTING_TEST(zero_padding)
 {
 	guchar padded[] = { 0x00, 0x00, 0x00, 0x00, 'T', 'E', 'S', 'T' };
 	gchar raw[] = "TEST";
 	test_padding (egg_padding_zero_pad, 8, raw, 4, padded, 8);
 }
 
-DEFINE_TEST(zero_padding_no_data)
+TESTING_TEST(zero_padding_no_data)
 {
 	guchar padded[] = { };
 	gchar raw[] = "";
 	test_padding (egg_padding_zero_pad, 8, raw, 0, padded, 0);
 }
 
-DEFINE_TEST(pkcs1_one_padding)
+TESTING_TEST(pkcs1_one_padding)
 {
 	guchar padded[] = { 0x00, 0x01, 0xFF, 0x00, 'T', 'E', 'S', 'T' };
 	gchar raw[] = "TEST";
@@ -77,7 +77,7 @@ DEFINE_TEST(pkcs1_one_padding)
 	test_padding (egg_padding_pkcs1_unpad_01, 8, padded, 8, raw, 4);
 }
 
-DEFINE_TEST(pkcs1_one_padding_no_data)
+TESTING_TEST(pkcs1_one_padding_no_data)
 {
 	guchar padded[] = { 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00 };
 	gchar raw[] = "";
@@ -85,7 +85,7 @@ DEFINE_TEST(pkcs1_one_padding_no_data)
 	test_padding (egg_padding_pkcs1_unpad_01, 8, padded, 8, raw, 0);
 }
 
-DEFINE_TEST(pkcs1_two_padding)
+TESTING_TEST(pkcs1_two_padding)
 {
 	guchar padded[] = { 0x00, 0x02, 0x77, 0x66, 0x55, 0x00, 'T', 'E', };
 	gchar raw[] = "TE";
@@ -111,31 +111,31 @@ DEFINE_TEST(pkcs1_two_padding)
 	g_assert (result[7] == 'E');
 }
 
-DEFINE_TEST(pkcs1_padding_invalid_prefix)
+TESTING_TEST(pkcs1_padding_invalid_prefix)
 {
 	guchar padded[] = { 0x01, 0x04, 0x04, 0x04 };
 	test_padding (egg_padding_pkcs1_unpad_01, 4, padded, 4, NULL, 0);
 }
 
-DEFINE_TEST(pkcs1_padding_invalid_type)
+TESTING_TEST(pkcs1_padding_invalid_type)
 {
 	guchar padded[] = { 0x00, 0x03, 0xFF, 0x00, 'T', 'E', 'S', 'T' };
 	test_padding (egg_padding_pkcs1_unpad_01, 8, padded, 8, NULL, 0);
 }
 
-DEFINE_TEST(pkcs1_padding_invalid_no_zero)
+TESTING_TEST(pkcs1_padding_invalid_no_zero)
 {
 	guchar padded[] = { 0x00, 0x01, 0xFF, 0xFF, 'T', 'E', 'S', 'T' };
 	test_padding (egg_padding_pkcs1_unpad_01, 8, padded, 8, NULL, 0);
 }
 
-DEFINE_TEST(pkcs1_padding_invalid_length)
+TESTING_TEST(pkcs1_padding_invalid_length)
 {
 	guchar padded[] = { 0x00, 0x01, 0xFF, 0xFF, 'T', 'E', 'S' };
 	test_padding (egg_padding_pkcs1_unpad_01, 8, padded, 7, NULL, 0);
 }
 
-DEFINE_TEST(pkcs7_padding)
+TESTING_TEST(pkcs7_padding)
 {
 	guchar padded[] = { 'T', 'E', 'S', 'T', 0x04, 0x04, 0x04, 0x04 };
 	gchar raw[] = "TEST";
@@ -144,7 +144,7 @@ DEFINE_TEST(pkcs7_padding)
 	test_padding (egg_padding_pkcs7_unpad, 8, padded, 8, raw, 4);
 }
 
-DEFINE_TEST(pkcs7_padding_equal_block)
+TESTING_TEST(pkcs7_padding_equal_block)
 {
 	guchar padded[] = { 'T', 'E', 'S', 'T', 'T', 'E', 'S', 'T', 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08 };
 	gchar raw[] = "TESTTEST";
@@ -153,7 +153,7 @@ DEFINE_TEST(pkcs7_padding_equal_block)
 	test_padding (egg_padding_pkcs7_unpad, 8, padded, 16, raw, 8);
 }
 
-DEFINE_TEST(pkcs7_padding_zero)
+TESTING_TEST(pkcs7_padding_zero)
 {
 	guchar padded[] = { 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08 };
 	gchar raw[] = "";
@@ -162,20 +162,20 @@ DEFINE_TEST(pkcs7_padding_zero)
 	test_padding (egg_padding_pkcs7_unpad, 8, padded, 8, raw, 0);
 }
 
-DEFINE_TEST(pkcs7_padding_invalid_zero)
+TESTING_TEST(pkcs7_padding_invalid_zero)
 {
 	guchar padded[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 	test_padding (egg_padding_pkcs7_unpad, 8, padded, 8, NULL, 0);
 }
 
-DEFINE_TEST(pkcs7_padding_invalid_too_long)
+TESTING_TEST(pkcs7_padding_invalid_too_long)
 {
 	guchar padded[] = { 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08 };
 	test_padding (egg_padding_pkcs7_unpad, 4, padded, 8, NULL, 0);
 	test_padding (egg_padding_pkcs7_unpad, 4, padded, 4, NULL, 0);
 }
 
-DEFINE_TEST(pkcs7_padding_invalid_different)
+TESTING_TEST(pkcs7_padding_invalid_different)
 {
 	guchar padded[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 };
 	test_padding (egg_padding_pkcs7_unpad, 8, padded, 8, NULL, 0);
diff --git a/egg/tests/unit-test-asn1.c b/egg/tests/unit-test-asn1.c
index c4171d4c..a2845062 100644
--- a/egg/tests/unit-test-asn1.c
+++ b/egg/tests/unit-test-asn1.c
@@ -43,7 +43,7 @@ static GNode *asn1_cert = NULL;
 static guchar *data_cert = NULL;
 static gsize n_data_cert = 0;
 
-DEFINE_SETUP(asn1_tree)
+TESTING_SETUP(asn1_tree)
 {
 	data_cert = testing_data_read ("test-certificate-1.der", &n_data_cert);
 
@@ -54,19 +54,19 @@ DEFINE_SETUP(asn1_tree)
 		egg_asn1x_assert_not_reached (asn1_cert);
 }
 
-DEFINE_TEARDOWN(asn1_tree)
+TESTING_TEARDOWN(asn1_tree)
 {
 	egg_asn1x_destroy (asn1_cert);
 	g_free (data_cert);
 	data_cert = NULL;
 }
 
-DEFINE_TEST(node_name)
+TESTING_TEST(node_name)
 {
 	g_assert_cmpstr (egg_asn1x_name (asn1_cert), ==, "Certificate");
 }
 
-DEFINE_TEST(asn1_integers)
+TESTING_TEST(asn1_integers)
 {
 	GNode *asn;
 	guchar *data;
@@ -112,7 +112,7 @@ DEFINE_TEST(asn1_integers)
 	g_free (data);
 }
 
-DEFINE_TEST(boolean)
+TESTING_TEST(boolean)
 {
 	GNode *asn = NULL;
 	gboolean value, ret;
@@ -153,7 +153,7 @@ DEFINE_TEST(boolean)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(write_value)
+TESTING_TEST(write_value)
 {
 	GNode *asn = NULL;
 	guchar *data;
@@ -180,7 +180,7 @@ DEFINE_TEST(write_value)
 	egg_asn1x_destroy (asn);
 }
 
-DEFINE_TEST(element_length_content)
+TESTING_TEST(element_length_content)
 {
 	GNode *asn = NULL;
 	gchar *buffer;
@@ -223,7 +223,7 @@ DEFINE_TEST(element_length_content)
 	g_free (buffer);
 }
 
-DEFINE_TEST(read_element)
+TESTING_TEST(read_element)
 {
 	GNode *asn = NULL;
 	guchar *buffer;
@@ -254,7 +254,7 @@ DEFINE_TEST(read_element)
 	g_free (buffer);
 }
 
-DEFINE_TEST(oid)
+TESTING_TEST(oid)
 {
 	GNode *asn = NULL;
 	GQuark oid, check;
@@ -334,7 +334,7 @@ static const TimeTestData utc_time_test_data[] = {
 	{ NULL, 0 }
 };
 
-DEFINE_TEST(general_time)
+TESTING_TEST(general_time)
 {
 	time_t when;
 	const TimeTestData *data;
@@ -352,7 +352,7 @@ DEFINE_TEST(general_time)
 	}
 }
 
-DEFINE_TEST(utc_time)
+TESTING_TEST(utc_time)
 {
 	time_t when;
 	const TimeTestData *data;
@@ -370,7 +370,7 @@ DEFINE_TEST(utc_time)
 	}
 }
 
-DEFINE_TEST(read_time)
+TESTING_TEST(read_time)
 {
 	glong time;
 
@@ -378,7 +378,7 @@ DEFINE_TEST(read_time)
 	g_assert_cmpint (time, ==, 820454400);
 }
 
-DEFINE_TEST(read_date)
+TESTING_TEST(read_date)
 {
 	GDate date;
 	if (!egg_asn1x_get_time_as_date (egg_asn1x_node (asn1_cert, "tbsCertificate", "validity", "notAfter", NULL), &date))
@@ -388,7 +388,7 @@ DEFINE_TEST(read_date)
 	g_assert_cmpint (date.year, ==, 2020);
 }
 
-DEFINE_TEST(create_by_oid)
+TESTING_TEST(create_by_oid)
 {
 	/* id-at-initials = X520initials */
 	GNode *node = egg_asn1x_create (pkix_asn1_tab, "2.5.4.43");
@@ -397,13 +397,13 @@ DEFINE_TEST(create_by_oid)
 	egg_asn1x_destroy (node);
 }
 
-DEFINE_TEST(create_by_oid_invalid)
+TESTING_TEST(create_by_oid_invalid)
 {
 	GNode *node = egg_asn1x_create (pkix_asn1_tab, "23.23.23.23");
 	g_assert (node == NULL);
 }
 
-DEFINE_TEST(create_by_bad_order)
+TESTING_TEST(create_by_bad_order)
 {
 	/*
 	 * In pkix.asn the definition for parts of this oid
@@ -417,7 +417,7 @@ DEFINE_TEST(create_by_bad_order)
 	egg_asn1x_destroy (node);
 }
 
-DEFINE_TEST(count)
+TESTING_TEST(count)
 {
 	GNode *node;
 
diff --git a/egg/tests/unit-test-cleanup.c b/egg/tests/unit-test-cleanup.c
index 680b22f9..45216ce2 100644
--- a/egg/tests/unit-test-cleanup.c
+++ b/egg/tests/unit-test-cleanup.c
@@ -43,7 +43,7 @@ cleanup_callback (gpointer user_data)
 	param->value = NULL;
 }
 
-DEFINE_TEST(cleanup)
+TESTING_TEST(cleanup)
 {
 	CleanupParam param;
 	
@@ -76,7 +76,7 @@ order_callback (gpointer user_data)
 	--order_value;
 }
 
-DEFINE_TEST(order)
+TESTING_TEST(order)
 {
 	OrderParam param[8];
 	int i;
@@ -116,7 +116,7 @@ reregister_callback (gpointer user_data)
 	egg_cleanup_register (second_callback, NULL);
 } 
 
-DEFINE_TEST(reregister)
+TESTING_TEST(reregister)
 {
 	cleaned_up = FALSE;
 	
@@ -140,7 +140,7 @@ remove_callback (gpointer user_data)
 	test_cleaned_up = TRUE;	
 }
 
-DEFINE_TEST(remove)
+TESTING_TEST(remove)
 {
 	egg_cleanup_register (remove_callback, NULL);
 	egg_cleanup_register (remove_callback, DATA);
diff --git a/egg/tests/unit-test-dh.c b/egg/tests/unit-test-dh.c
index e08d4e87..583ffb58 100644
--- a/egg/tests/unit-test-dh.c
+++ b/egg/tests/unit-test-dh.c
@@ -32,7 +32,7 @@
 
 #include <gcrypt.h>
 
-DEFINE_TEST(dh_perform)
+TESTING_TEST(dh_perform)
 {
 	gcry_mpi_t p, g;
 	gcry_mpi_t x1, X1;
@@ -69,7 +69,7 @@ DEFINE_TEST(dh_perform)
 	egg_secure_free (k2);
 }
 
-DEFINE_TEST(dh_short_pair)
+TESTING_TEST(dh_short_pair)
 {
 	gcry_mpi_t p, g;
 	gcry_mpi_t x1, X1;
@@ -126,43 +126,43 @@ test_dh_default (const gchar *name, guint bits)
 	gcry_mpi_release (g);
 }
 
-DEFINE_TEST(dh_default_768)
+TESTING_TEST(dh_default_768)
 {
 	test_dh_default ("ietf-ike-grp-modp-768", 768);
 }
 
-DEFINE_TEST(dh_default_1024)
+TESTING_TEST(dh_default_1024)
 {
 	test_dh_default ("ietf-ike-grp-modp-1024", 1024);
 }
 
-DEFINE_TEST(dh_default_1536)
+TESTING_TEST(dh_default_1536)
 {
 	test_dh_default ("ietf-ike-grp-modp-1536", 1536);
 }
 
 
-DEFINE_TEST(dh_default_2048)
+TESTING_TEST(dh_default_2048)
 {
 	test_dh_default ("ietf-ike-grp-modp-2048", 2048);
 }
 
-DEFINE_TEST(dh_default_3072)
+TESTING_TEST(dh_default_3072)
 {
 	test_dh_default ("ietf-ike-grp-modp-3072", 3072);
 }
 
-DEFINE_TEST(dh_default_4096)
+TESTING_TEST(dh_default_4096)
 {
 	test_dh_default ("ietf-ike-grp-modp-4096", 4096);
 }
 
-DEFINE_TEST(dh_default_8192)
+TESTING_TEST(dh_default_8192)
 {
 	test_dh_default ("ietf-ike-grp-modp-8192", 8192);
 }
 
-DEFINE_TEST(dh_default_bad)
+TESTING_TEST(dh_default_bad)
 {
 	gboolean ret;
 	gcry_mpi_t p, g;
diff --git a/egg/tests/unit-test-hex.c b/egg/tests/unit-test-hex.c
index 23e39442..fd32f473 100644
--- a/egg/tests/unit-test-hex.c
+++ b/egg/tests/unit-test-hex.c
@@ -33,7 +33,7 @@ static const guchar TEST_DATA[] = { 0x05, 0xD6, 0x95, 0x96, 0x10, 0x12, 0xAE, 0x
 static const gchar *TEST_HEX = "05D695961012AE35";
 static const gchar *TEST_HEX_DELIM = "05 D6 95 96 10 12 AE 35";
 
-DEFINE_TEST(hex_encode)
+TESTING_TEST(hex_encode)
 {
 	gchar *hex;
 	
@@ -42,7 +42,7 @@ DEFINE_TEST(hex_encode)
 	g_assert_cmpstr (hex, ==, TEST_HEX);
 }
 
-DEFINE_TEST(hex_encode_spaces)
+TESTING_TEST(hex_encode_spaces)
 {
 	gchar *hex;
 	
@@ -57,7 +57,7 @@ DEFINE_TEST(hex_encode_spaces)
 	g_assert_cmpstr (hex, ==, TEST_HEX_DELIM);
 }
 
-DEFINE_TEST(hex_decode)
+TESTING_TEST(hex_decode)
 {
 	guchar *data;
 	gsize n_data;
@@ -82,7 +82,7 @@ DEFINE_TEST(hex_decode)
 	g_free (data);
 }
 
-DEFINE_TEST(hex_decode_fail)
+TESTING_TEST(hex_decode_fail)
 {
 	guchar *data;
 	gsize n_data;
diff --git a/egg/tests/unit-test-oid.c b/egg/tests/unit-test-oid.c
index 7d9c4e23..4630c7e8 100644
--- a/egg/tests/unit-test-oid.c
+++ b/egg/tests/unit-test-oid.c
@@ -29,7 +29,7 @@
 
 #include <glib.h>
 
-DEFINE_TEST(oid_tests)
+TESTING_TEST(oid_tests)
 {
 	GQuark oid;
 	
diff --git a/egg/tests/unit-test-openssl.c b/egg/tests/unit-test-openssl.c
index 29f44748..7b8153b2 100644
--- a/egg/tests/unit-test-openssl.c
+++ b/egg/tests/unit-test-openssl.c
@@ -70,7 +70,7 @@ parse_reference (GQuark type, const guchar *data, gsize n_data,
 	g_assert ("invalid amount of data returned from openssl decrypt" && n_refdata == n_data);
 }
 
-DEFINE_TEST(parse_reference)
+TESTING_TEST(parse_reference)
 {
 	guchar *input;
 	gsize n_input;
@@ -84,7 +84,7 @@ DEFINE_TEST(parse_reference)
 	g_assert ("parse_reference() wasn't called" && refdata != NULL);
 }
 
-DEFINE_TEST(write_reference)
+TESTING_TEST(write_reference)
 {
 	const gchar *dekinfo;
 	guchar *encrypted;
@@ -107,7 +107,7 @@ DEFINE_TEST(write_reference)
 static const guchar *TEST_DATA = (guchar*)"ABCDEFGHIJKLMNOPQRSTUVWXYZ123";
 const gsize TEST_DATA_L = 29;
 	
-DEFINE_TEST(openssl_roundtrip)
+TESTING_TEST(openssl_roundtrip)
 {
 	const gchar *dekinfo;
 	gboolean res;
diff --git a/egg/tests/unit-test-secmem.c b/egg/tests/unit-test-secmem.c
index 7afd649a..84b68beb 100644
--- a/egg/tests/unit-test-secmem.c
+++ b/egg/tests/unit-test-secmem.c
@@ -58,7 +58,7 @@ find_non_zero (gpointer mem, gsize len)
 	return G_MAXSIZE;
 }
 
-DEFINE_TEST(secmem_alloc_free)
+TESTING_TEST(secmem_alloc_free)
 {
 	gpointer p;
 	gboolean ret;
@@ -75,7 +75,7 @@ DEFINE_TEST(secmem_alloc_free)
 	egg_secure_free_full (p, 0);
 }
 
-DEFINE_TEST(secmem_realloc_across)
+TESTING_TEST(secmem_realloc_across)
 {
 	gpointer p, p2;
 	
@@ -90,7 +90,7 @@ DEFINE_TEST(secmem_realloc_across)
 	g_assert_cmpint (G_MAXSIZE, ==, find_non_zero (p2, 16200));
 }
 
-DEFINE_TEST(secmem_alloc_two)
+TESTING_TEST(secmem_alloc_two)
 {
 	gpointer p, p2;
 	gboolean ret;
@@ -114,7 +114,7 @@ DEFINE_TEST(secmem_alloc_two)
 	egg_secure_free_full (p, 0);
 }
 
-DEFINE_TEST(secmem_realloc)
+TESTING_TEST(secmem_realloc)
 {
 	gchar *str = "a test string to see if realloc works properly";
 	gpointer p, p2;
@@ -138,7 +138,7 @@ DEFINE_TEST(secmem_realloc)
 	g_assert (p == NULL);
 }
 
-DEFINE_TEST(secmem_multialloc)
+TESTING_TEST(secmem_multialloc)
 {
 	GPtrArray *memory;
 	gpointer data;
@@ -205,7 +205,7 @@ DEFINE_TEST(secmem_multialloc)
 	egg_secure_warnings = 1;
 }
 
-DEFINE_TEST(secmem_clear)
+TESTING_TEST(secmem_clear)
 {
 	gpointer p;
 
@@ -220,7 +220,7 @@ DEFINE_TEST(secmem_clear)
 	egg_secure_free_full (p, 0);
 }
 
-DEFINE_TEST(secmem_strclear)
+TESTING_TEST(secmem_strclear)
 {
 	gchar *str;
 
diff --git a/egg/tests/unit-test-spawn.c b/egg/tests/unit-test-spawn.c
index 29c4d7c5..e34ff3ae 100644
--- a/egg/tests/unit-test-spawn.c
+++ b/egg/tests/unit-test-spawn.c
@@ -160,7 +160,7 @@ static EggSpawnCallbacks null_callbacks = {
 	child_setup,
 };
 
-DEFINE_TEST(test_spawn_sync)
+TESTING_TEST(test_spawn_sync)
 {
 	GError *error = NULL;
 	gboolean ret;
@@ -187,7 +187,7 @@ DEFINE_TEST(test_spawn_sync)
 	g_assert_cmpstr (data.error, ==, "1\n2\n3\n4\n5\n");
 }
 
-DEFINE_TEST(test_spawn_sync_error)
+TESTING_TEST(test_spawn_sync_error)
 {
 	GError *error = NULL;
 	gboolean ret;
@@ -202,7 +202,7 @@ DEFINE_TEST(test_spawn_sync_error)
 }
 
 
-DEFINE_TEST(test_spawn_async)
+TESTING_TEST(test_spawn_async)
 {
 	GError *error = NULL;
 	EchoData data;
@@ -232,7 +232,7 @@ DEFINE_TEST(test_spawn_async)
 	g_assert_cmpstr (data.error, ==, "1\n2\n3\n4\n5\n");
 }
 
-DEFINE_TEST(test_spawn_async_none)
+TESTING_TEST(test_spawn_async_none)
 {
 	GError *error = NULL;
 	EchoData data;
@@ -259,7 +259,7 @@ DEFINE_TEST(test_spawn_async_none)
 	g_assert (!data.output);
 }
 
-DEFINE_TEST(test_spawn_async_error)
+TESTING_TEST(test_spawn_async_error)
 {
 	GError *error = NULL;
 	guint ret;
diff --git a/egg/tests/unit-test-symkey.c b/egg/tests/unit-test-symkey.c
index 89313f5f..c3cf7226 100644
--- a/egg/tests/unit-test-symkey.c
+++ b/egg/tests/unit-test-symkey.c
@@ -33,12 +33,12 @@
 
 #include <gcrypt.h>
 
-DEFINE_SETUP(crypto_setup)
+TESTING_SETUP(crypto_setup)
 {
 	egg_libgcrypt_initialize ();
 }
 
-DEFINE_TEARDOWN(crypto_setup)
+TESTING_TEARDOWN(crypto_setup)
 {
 
 }
@@ -122,7 +122,7 @@ static const struct {
 
 #define N_GENERATION_TESTS (sizeof (all_generation_tests) / sizeof (all_generation_tests[0]))
 
-DEFINE_TEST(generate_key_simple)
+TESTING_TEST(generate_key_simple)
 {
 	int i;
 	gboolean ret;
@@ -148,7 +148,7 @@ DEFINE_TEST(generate_key_simple)
 	}
 }
 
-DEFINE_TEST(generate_key_pkcs12)
+TESTING_TEST(generate_key_pkcs12)
 {
 	int i;
 	gboolean ret;
@@ -174,7 +174,7 @@ DEFINE_TEST(generate_key_pkcs12)
 	}
 }
 
-DEFINE_TEST(generate_key_pbkdf2)
+TESTING_TEST(generate_key_pbkdf2)
 {
 	int i;
 	gboolean ret;
@@ -200,7 +200,7 @@ DEFINE_TEST(generate_key_pbkdf2)
 	}
 }
 
-DEFINE_TEST(generate_key_pbe)
+TESTING_TEST(generate_key_pbe)
 {
 	int i;
 	gboolean ret;