From b7cc29a78c3c705374ff25223fe14749ddb076b9 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Tue, 23 Jul 2013 14:53:53 +0200 Subject: Use simple serial automake test harness * Add a testing sanity check to see if we're catching errors * Fix a few other testing issues --- p11-kit/conf.c | 2 +- p11-kit/tests/test-deprecated.c | 1 + p11-kit/tests/test-init.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'p11-kit') diff --git a/p11-kit/conf.c b/p11-kit/conf.c index 2a6dc5c..ef542f2 100644 --- a/p11-kit/conf.c +++ b/p11-kit/conf.c @@ -416,7 +416,7 @@ load_configs_from_directory (const char *directory, { if (stat (path, &st) < 0) { error = errno; - p11_message ("couldn't stat path: %s", path); + p11_message_err (error, "couldn't stat path: %s", path); free (path); break; } diff --git a/p11-kit/tests/test-deprecated.c b/p11-kit/tests/test-deprecated.c index 7ea8260..56f1941 100644 --- a/p11-kit/tests/test-deprecated.c +++ b/p11-kit/tests/test-deprecated.c @@ -250,6 +250,7 @@ mock_C_Initialize__with_fork (CK_VOID_PTR init_args) /* Fork during the initialization */ child = fork (); if (child == 0) { + close (1); nanosleep (&ts, NULL); exit (66); } diff --git a/p11-kit/tests/test-init.c b/p11-kit/tests/test-init.c index ebc0666..c4fcecb 100644 --- a/p11-kit/tests/test-init.c +++ b/p11-kit/tests/test-init.c @@ -73,6 +73,7 @@ mock_C_Initialize__with_fork (CK_VOID_PTR init_args) /* Fork during the initialization */ child = fork (); if (child == 0) { + close (1); nanosleep (&ts, NULL); exit (66); } -- cgit v1.1