summaryrefslogtreecommitdiff
path: root/egg
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2014-03-05 12:58:46 +0100
committerStef Walter <stefw@gnome.org>2014-03-05 13:02:16 +0100
commit533044c5ef208543b00e5f56635dcaae1b93d31b (patch)
tree7679e20322fdbcf0d0f53f722386415b9168ea0b /egg
parent4f0b8a25630d6555cf0d91b849273e0e24a174ad (diff)
downloadgnome-keyring-533044c5ef208543b00e5f56635dcaae1b93d31b.tar.gz
Makefile.am: Use parallel tests for 'make check'
Also build in a 'make check-memory' and related functionality which drives valgrind.
Diffstat (limited to 'egg')
-rw-r--r--egg/Makefile.am5
-rw-r--r--egg/egg-asn1x.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/egg/Makefile.am b/egg/Makefile.am
index 02570375..21d9898b 100644
--- a/egg/Makefile.am
+++ b/egg/Makefile.am
@@ -130,7 +130,7 @@ egg_LIBS = \
$(GTHREAD_LIBS) \
$(GLIB_LIBS)
-TEST_PROGS += \
+egg_TESTS = \
test-asn1 \
test-asn1x \
test-dn \
@@ -187,3 +187,6 @@ test_dh_LDADD = $(egg_LIBS)
test_spawn_SOURCES = egg/test-spawn.c
test_spawn_LDADD = $(egg_LIBS)
+
+check_PROGRAMS += $(egg_TESTS)
+TESTS += $(egg_TESTS)
diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c
index 4ffcdf21..b18ddefe 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),
+ 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);
}