diff options
| -rw-r--r-- | tests/Makefile.am | 14 | ||||
| -rw-r--r-- | tests/test-init.c (renamed from tests/test-fork.c) | 34 | ||||
| -rw-r--r-- | tests/test-recursive.c | 98 |
3 files changed, 36 insertions, 110 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 65828bf..ab7d8f8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,15 +17,10 @@ noinst_PROGRAMS = \ uri-test \ pin-test \ print-messages \ - test-fork \ - test-recursive + test-init -test_fork_SOURCES = \ - test-fork.c \ - mock-module.c mock-module.h - -test_recursive_SOURCES = \ - test-recursive.c \ +test_init_SOURCES = \ + test-init.c \ mock-module.c mock-module.h check-am: @@ -34,8 +29,7 @@ check-am: ./conf-test ./uri-test ./pin-test - ./test-fork - ./test-recursive + ./test-init EXTRA_DIST = \ cutest \ diff --git a/tests/test-fork.c b/tests/test-init.c index fcdcbe9..5d96d81 100644 --- a/tests/test-fork.c +++ b/tests/test-init.c @@ -42,15 +42,19 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <time.h> #include <unistd.h> #include "p11-kit/p11-kit.h" #include "mock-module.h" +CK_FUNCTION_LIST module; + static CK_RV mock_C_Initialize__with_fork (CK_VOID_PTR init_args) { + struct timespec ts = { 0, 100 * 1000 * 1000 }; CK_RV rv; pid_t child; pid_t ret; @@ -62,7 +66,7 @@ mock_C_Initialize__with_fork (CK_VOID_PTR init_args) /* Fork during the initialization */ child = fork (); if (child == 0) { - sleep (1); + nanosleep (&ts, NULL); exit (66); } @@ -77,7 +81,6 @@ mock_C_Initialize__with_fork (CK_VOID_PTR init_args) static void test_fork_initialization (CuTest *tc) { - CK_FUNCTION_LIST module; CK_RV rv; /* Build up our own function list */ @@ -91,6 +94,32 @@ test_fork_initialization (CuTest *tc) CuAssertTrue (tc, rv == CKR_OK); } + +static CK_RV +mock_C_Initialize__with_recursive (CK_VOID_PTR init_args) +{ + CK_RV rv; + + rv = mock_C_Initialize (init_args); + assert (rv == CKR_OK); + + /* Recursively initialize, this is broken */ + return p11_kit_initialize_module (&module); +} + +static void +test_recursive_initialization (CuTest *tc) +{ + CK_RV rv; + + /* Build up our own function list */ + memcpy (&module, &mock_module_no_slots, sizeof (CK_FUNCTION_LIST)); + module.C_Initialize = mock_C_Initialize__with_recursive; + + rv = p11_kit_initialize_module (&module); + CuAssertTrue (tc, rv == CKR_FUNCTION_FAILED); +} + int main (void) { @@ -99,6 +128,7 @@ main (void) int ret; SUITE_ADD_TEST (suite, test_fork_initialization); + SUITE_ADD_TEST (suite, test_recursive_initialization); CuSuiteRun (suite); CuSuiteSummary (suite, output); diff --git a/tests/test-recursive.c b/tests/test-recursive.c deleted file mode 100644 index 97e692e..0000000 --- a/tests/test-recursive.c +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2011, Collabora Ltd. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above - * copyright notice, this list of conditions and the - * following disclaimer. - * * Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions and - * the following disclaimer in the documentation and/or - * other materials provided with the distribution. - * * The names of contributors to this software may not be - * used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF - * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * Author: Stef Walter <stefw@collabora.co.uk> - */ - -#include "config.h" -#include "CuTest.h" - -#include <sys/types.h> -#include <sys/wait.h> - -#include <assert.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#include "p11-kit/p11-kit.h" - -#include "mock-module.h" - -CK_FUNCTION_LIST module; - -static CK_RV -mock_C_Initialize__with_recursive (CK_VOID_PTR init_args) -{ - CK_RV rv; - - rv = mock_C_Initialize (init_args); - assert (rv == CKR_OK); - - /* Recursively initialize, this is broken */ - return p11_kit_initialize_module (&module); -} - -static void -test_recursive_initialization (CuTest *tc) -{ - CK_RV rv; - - /* Build up our own function list */ - memcpy (&module, &mock_module_no_slots, sizeof (CK_FUNCTION_LIST)); - module.C_Initialize = mock_C_Initialize__with_recursive; - - rv = p11_kit_initialize_module (&module); - CuAssertTrue (tc, rv == CKR_FUNCTION_FAILED); -} - -int -main (void) -{ - CuString *output = CuStringNew (); - CuSuite* suite = CuSuiteNew (); - int ret; - - SUITE_ADD_TEST (suite, test_recursive_initialization); - - CuSuiteRun (suite); - CuSuiteSummary (suite, output); - CuSuiteDetails (suite, output); - printf ("%s\n", output->buffer); - ret = suite->failCount; - CuSuiteDelete (suite); - CuStringDelete (output); - - return ret; -} - -#include "CuTest.c" |