diff options
| -rw-r--r-- | test/diagnostic.c | 1 | ||||
| -rw-r--r-- | test/diagnostic_test_private.h | 26 | ||||
| -rw-r--r-- | test/float.c | 13 | ||||
| -rw-r--r-- | test/float_test_private.h | 37 | ||||
| -rw-r--r-- | test/time.c | 23 | ||||
| -rw-r--r-- | test/time_test_private.h | 47 | ||||
| -rw-r--r-- | test/uuid.c | 6 | ||||
| -rw-r--r-- | test/uuid_test_private.h | 30 |
8 files changed, 39 insertions, 144 deletions
diff --git a/test/diagnostic.c b/test/diagnostic.c index 017682d..7a6670e 100644 --- a/test/diagnostic.c +++ b/test/diagnostic.c @@ -19,7 +19,6 @@ */ #include "test.h" -#include "diagnostic_test_private.h" int diagnostic_test(char *testname) { diff --git a/test/diagnostic_test_private.h b/test/diagnostic_test_private.h deleted file mode 100644 index ad2aa43..0000000 --- a/test/diagnostic_test_private.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * The Rin Library – library "conformance" tests - * - * Copyright (C) 2015 Gediminas Jakutis - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; version 2.1 - * of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef LIBRIN_DIAGNOSTIC_TEST_PRIVATE_INCLUDED -#define LIBRIN_DIAGNOSTIC_TEST_PRIVATE_INCLUDED - -/* NOOP */ - -#endif /* LIBRIN_DIAGNOSTIC_TEST_PRIVATE_INCLUDED */ diff --git a/test/float.c b/test/float.c index 284c82a..b7ee121 100644 --- a/test/float.c +++ b/test/float.c @@ -18,8 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdlib.h> +#include <string.h> +#include <stdint.h> +#include <inttypes.h> #include "test.h" -#include "float_test_private.h" +#include "rin/float.h" + +static int rin_signbitf_test(void); +static int rin_signbitd_test(void); +static int rin_float_to_hexstring_test(void); +static int rin_double_to_hexstring_test(void); +static int rin_compare_float_test(void); +static int rin_compare_double_test(void); int float_test(char *testname) { diff --git a/test/float_test_private.h b/test/float_test_private.h deleted file mode 100644 index 24b7181..0000000 --- a/test/float_test_private.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The Rin Library – library "conformance" tests - * - * Copyright (C) 2015-2017 Gediminas Jakutis - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; version 2.1 - * of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef LIBRIN_FLOAT_TEST_PRIVATE_INCLUDED -#define LIBRIN_FLOAT_TEST_PRIVATE_INCLUDED - -#include <stdlib.h> -#include <string.h> -#include <stdint.h> -#include <inttypes.h> -#include "rin/float.h" - -static int rin_signbitf_test(void); -static int rin_signbitd_test(void); -static int rin_float_to_hexstring_test(void); -static int rin_double_to_hexstring_test(void); -static int rin_compare_float_test(void); -static int rin_compare_double_test(void); - -#endif /* LIBRIN_FLOAT_TEST_PRIVATE_INCLUDED */ diff --git a/test/time.c b/test/time.c index 90f0755..ea373fe 100644 --- a/test/time.c +++ b/test/time.c @@ -19,7 +19,28 @@ */ #include "test.h" -#include "time_test_private.h" +#include "rin/time.h" + +static int rin_time_add_test(void); +static int rin_time_sub_test(void); +static int rin_time_normalize_test(void); +static int rin_time_cmp_test(void); +static int rin_time_cmpless_test(void); +static int rin_time_cmpmore_test(void); +static int rin_time_cmplessequal_test(void); +static int rin_time_cmpmoreequal_test(void); +static int rin_time_cmpequal_test(void); +static int rin_time_cmpnonequal_test(void); +static int rin_timeval_add_test(void); +static int rin_timeval_sub_test(void); +static int rin_timeval_normalize_test(void); +static int rin_timeval_cmp_test(void); +static int rin_timeval_cmpless_test(void); +static int rin_timeval_cmpmore_test(void); +static int rin_timeval_cmplessequal_test(void); +static int rin_timeval_cmpmoreequal_test(void); +static int rin_timeval_cmpequal_test(void); +static int rin_timeval_cmpnonequal_test(void); int time_test(char *testname) { diff --git a/test/time_test_private.h b/test/time_test_private.h deleted file mode 100644 index a3aa237..0000000 --- a/test/time_test_private.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * The Rin Library – library "conformance" tests - * - * Copyright (C) 2017-2019 Gediminas Jakutis - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; version 2.1 - * of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef LIBRIN_TIME_TEST_PRIVATE_INCLUDED -#define LIBRIN_TIME_TEST_PRIVATE_INCLUDED - -#include "rin/time.h" - -static int rin_time_add_test(void); -static int rin_time_sub_test(void); -static int rin_time_normalize_test(void); -static int rin_time_cmp_test(void); -static int rin_time_cmpless_test(void); -static int rin_time_cmpmore_test(void); -static int rin_time_cmplessequal_test(void); -static int rin_time_cmpmoreequal_test(void); -static int rin_time_cmpequal_test(void); -static int rin_time_cmpnonequal_test(void); -static int rin_timeval_add_test(void); -static int rin_timeval_sub_test(void); -static int rin_timeval_normalize_test(void); -static int rin_timeval_cmp_test(void); -static int rin_timeval_cmpless_test(void); -static int rin_timeval_cmpmore_test(void); -static int rin_timeval_cmplessequal_test(void); -static int rin_timeval_cmpmoreequal_test(void); -static int rin_timeval_cmpequal_test(void); -static int rin_timeval_cmpnonequal_test(void); - -#endif /* LIBRIN_TIME_TEST_PRIVATE_INCLUDED */ diff --git a/test/uuid.c b/test/uuid.c index d8fb869..32ead51 100644 --- a/test/uuid.c +++ b/test/uuid.c @@ -18,8 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stddef.h> +#include <stdio.h> #include "test.h" -#include "uuid_test_private.h" +#include "rin/uuid.h" + +static int rin_uuid_format_macro_test(void); int uuid_test(char *testname) { diff --git a/test/uuid_test_private.h b/test/uuid_test_private.h deleted file mode 100644 index 1852bcf..0000000 --- a/test/uuid_test_private.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The Rin Library – library "conformance" tests - * - * Copyright (C) 2015-2017 Gediminas Jakutis - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; version 2.1 - * of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef LIBRIN_UUID_TEST_PRIVATE_INCLUDED -#define LIBRIN_UUID_TEST_PRIVATE_INCLUDED - -#include <stddef.h> -#include <stdio.h> -#include "rin/uuid.h" - -static int rin_uuid_format_macro_test(void); - -#endif /* LIBRIN_UUID_TEST_PRIVATE_INCLUDED */ |