From 416b034fe138d515931b747dc60722845e2103f8 Mon Sep 17 00:00:00 2001 From: Snaipe Date: Mon, 7 Sep 2015 01:15:31 +0200 Subject: [PATCH] Made the interface C++11-compatible --- CMakeLists.txt | 2 +- include/criterion/abort.h | 4 + include/criterion/assert.h | 169 +++++++++--------- include/criterion/common.h | 28 ++- include/criterion/criterion.h | 51 ++++-- .../criterion/designated-initializer-compat.h | 124 +++++++++++++ include/criterion/event.h | 13 +- include/criterion/hooks.h | 26 ++- include/criterion/logging.h | 13 +- include/criterion/options.h | 4 + include/criterion/ordered-set.h | 12 +- include/criterion/theories.h | 4 + include/criterion/types.h | 21 ++- samples/CMakeLists.txt | 8 + samples/asserts.c | 2 - samples/report.c | 6 +- src/report.c | 22 +-- 17 files changed, 364 insertions(+), 145 deletions(-) create mode 100644 include/criterion/designated-initializer-compat.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 4298976..d222268 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.8) -project(Criterion C) +project(Criterion C CXX) set(MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/.cmake/Modules") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${MODULE_DIR}) diff --git a/include/criterion/abort.h b/include/criterion/abort.h index 1df05c0..598b27e 100644 --- a/include/criterion/abort.h +++ b/include/criterion/abort.h @@ -26,6 +26,10 @@ # include "common.h" +CR_BEGIN_C_API + CR_API NORETURN void criterion_abort_test(void); +CR_END_C_API + #endif /* !CRITERION_ABORT_H_ */ diff --git a/include/criterion/assert.h b/include/criterion/assert.h index 6d796b2..23b4256 100644 --- a/include/criterion/assert.h +++ b/include/criterion/assert.h @@ -24,9 +24,17 @@ #ifndef CRITERION_ASSERT_H_ # define CRITERION_ASSERT_H_ -# include -# include -# include +# ifdef __cplusplus +# include +# include +using std::strcmp; +using std::memcmp; +# else +# include +# include +# include +# endif +# include "designated-initializer-compat.h" # include "types.h" # include "stats.h" # include "hooks.h" @@ -40,47 +48,50 @@ enum criterion_assert_kind { struct criterion_assert_args { const char *msg; - const char *default_msg; int sentinel_; + +#ifdef __cplusplus + constexpr criterion_assert_args(const char *msg) : msg(msg), sentinel_(0) {} + constexpr criterion_assert_args(const char *msg, int sentinel_) : msg(msg), sentinel_(sentinel_) {} +#endif }; -# define cr_assert_impl(Kind, Condition, ...) \ - do { \ - struct criterion_assert_args args = { \ - __VA_ARGS__ \ - }; \ - int passed = !!(Condition); \ - struct criterion_assert_stats stat = { \ - .kind = (Kind), \ - .condition = #Condition, \ - .message = args.msg ? args.msg \ - : (args.default_msg ? args.default_msg : ""), \ - .passed = passed, \ - .file = __FILE__, \ - .line = __LINE__, \ - }; \ - send_event(ASSERT, &stat, sizeof (stat)); \ - if (!passed && (Kind) == FATAL) \ - criterion_abort_test(); \ +# define CR_GET_CONDITION(Condition, ...) Condition +# define CR_GET_CONDITION_STR(Condition, ...) #Condition +# define CR_VA_SKIP(_, ...) __VA_ARGS__ + +# define cr_assert_impl(Kind, ...) \ + do { \ + struct criterion_assert_args args = { \ + CR_EXPAND(CR_VA_SKIP(__VA_ARGS__)) \ + }; \ + int passed = !!(CR_EXPAND(CR_GET_CONDITION(__VA_ARGS__))); \ + struct criterion_assert_stats stat; \ + stat.kind = (Kind); \ + stat.condition = CR_EXPAND(CR_GET_CONDITION_STR(__VA_ARGS__)); \ + stat.message = args.msg ? args.msg : ""; \ + stat.passed = passed; \ + stat.file = __FILE__; \ + stat.line = __LINE__; \ + send_event(ASSERT, &stat, sizeof (stat)); \ + if (!passed && (Kind) == FATAL) \ + criterion_abort_test(); \ } while (0) // Common asserts -# define cr_abort_test(Message) \ - cr_assert(0, \ - .default_msg = "The conditions for this test were not met.", \ - .msg = (Message) \ - ) +# define cr_abort_test(Message) \ + cr_assert(0, (Message)) -# define cr_assert(...) CR_EXPAND(cr_assert_(__VA_ARGS__, .sentinel_ = 0)) +# define cr_assert(...) CR_EXPAND(cr_assert_(__VA_ARGS__, 0)) -# define cr_expect(...) CR_EXPAND(cr_expect_(__VA_ARGS__, .sentinel_ = 0)) +# define cr_expect(...) CR_EXPAND(cr_expect_(__VA_ARGS__, 0)) # define cr_assert_(Condition, ...) CR_EXPAND(cr_assert_impl(FATAL, Condition, __VA_ARGS__)) # define cr_expect_(Condition, ...) CR_EXPAND(cr_assert_impl(NORMAL, Condition, __VA_ARGS__)) -# define cr_assert_not(...) CR_EXPAND(cr_assert_not_(__VA_ARGS__, .sentinel_ = 0)) -# define cr_expect_not(...) CR_EXPAND(cr_expect_not_(__VA_ARGS__, .sentinel_ = 0)) +# define cr_assert_not(...) CR_EXPAND(cr_assert_not_(__VA_ARGS__, 0)) +# define cr_expect_not(...) CR_EXPAND(cr_expect_not_(__VA_ARGS__, 0)) # define cr_assert_not_(Condition, ...) \ CR_EXPAND(cr_assert_impl(FATAL, !(Condition), __VA_ARGS__)) @@ -94,46 +105,46 @@ struct criterion_assert_args { # define cr_expect_op_(Op, Actual, Expected, ...) \ CR_EXPAND(cr_assert_impl(NORMAL, (Actual) Op (Expected), __VA_ARGS__)) -# define cr_assert_eq(...) CR_EXPAND(cr_assert_op_(==, __VA_ARGS__, .sentinel_ = 0)) -# define cr_expect_eq(...) CR_EXPAND(cr_expect_op_(==, __VA_ARGS__, .sentinel_ = 0)) +# define cr_assert_eq(...) CR_EXPAND(cr_assert_op_(==, __VA_ARGS__, 0)) +# define cr_expect_eq(...) CR_EXPAND(cr_expect_op_(==, __VA_ARGS__, 0)) -# define cr_assert_neq(...) CR_EXPAND(cr_assert_op_(!=, __VA_ARGS__, .sentinel_ = 0)) -# define cr_expect_neq(...) CR_EXPAND(cr_expect_op_(!=, __VA_ARGS__, .sentinel_ = 0)) +# define cr_assert_neq(...) CR_EXPAND(cr_assert_op_(!=, __VA_ARGS__, 0)) +# define cr_expect_neq(...) CR_EXPAND(cr_expect_op_(!=, __VA_ARGS__, 0)) -# define cr_assert_lt(...) CR_EXPAND(cr_assert_op_(<, __VA_ARGS__, .sentinel_ = 0)) -# define cr_expect_lt(...) CR_EXPAND(cr_expect_op_(<, __VA_ARGS__, .sentinel_ = 0)) +# define cr_assert_lt(...) CR_EXPAND(cr_assert_op_(<, __VA_ARGS__, 0)) +# define cr_expect_lt(...) CR_EXPAND(cr_expect_op_(<, __VA_ARGS__, 0)) -# define cr_assert_gt(...) CR_EXPAND(cr_assert_op_(>, __VA_ARGS__, .sentinel_ = 0)) -# define cr_expect_gt(...) CR_EXPAND(cr_expect_op_(>, __VA_ARGS__, .sentinel_ = 0)) +# define cr_assert_gt(...) CR_EXPAND(cr_assert_op_(>, __VA_ARGS__, 0)) +# define cr_expect_gt(...) CR_EXPAND(cr_expect_op_(>, __VA_ARGS__, 0)) -# define cr_assert_leq(...) CR_EXPAND(cr_assert_op_(<=, __VA_ARGS__, .sentinel_ = 0)) -# define cr_expect_leq(...) CR_EXPAND(cr_expect_op_(<=, __VA_ARGS__, .sentinel_ = 0)) +# define cr_assert_leq(...) CR_EXPAND(cr_assert_op_(<=, __VA_ARGS__, 0)) +# define cr_expect_leq(...) CR_EXPAND(cr_expect_op_(<=, __VA_ARGS__, 0)) -# define cr_assert_geq(...) CR_EXPAND(cr_assert_op_(>=, __VA_ARGS__, .sentinel_ = 0)) -# define cr_expect_geq(...) CR_EXPAND(cr_expect_op_(>=, __VA_ARGS__, .sentinel_ = 0)) +# define cr_assert_geq(...) CR_EXPAND(cr_assert_op_(>=, __VA_ARGS__, 0)) +# define cr_expect_geq(...) CR_EXPAND(cr_expect_op_(>=, __VA_ARGS__, 0)) # define cr_assert_null_(Value, ...) \ CR_EXPAND(cr_assert_impl(FATAL, (Value) == NULL, __VA_ARGS__)) # define cr_expect_null_(Value, ...) \ CR_EXPAND(cr_assert_impl(NORMAL, (Value) == NULL, __VA_ARGS__)) -# define cr_assert_null(...) CR_EXPAND(cr_assert_null_(__VA_ARGS__, .sentinel_ = 0)) -# define cr_expect_null(...) CR_EXPAND(cr_expect_null_(__VA_ARGS__, .sentinel_ = 0)) +# define cr_assert_null(...) CR_EXPAND(cr_assert_null_(__VA_ARGS__, 0)) +# define cr_expect_null(...) CR_EXPAND(cr_expect_null_(__VA_ARGS__, 0)) # define cr_assert_not_null_(Value, ...) \ CR_EXPAND(cr_assert_impl(FATAL, (Value) != NULL, __VA_ARGS__)) # define cr_expect_not_null_(Value, ...) \ CR_EXPAND(cr_assert_impl(NORMAL, (Value) != NULL, __VA_ARGS__)) -# define cr_assert_not_null(...) CR_EXPAND(cr_assert_not_null_(__VA_ARGS__, .sentinel_ = 0)) -# define cr_expect_not_null(...) CR_EXPAND(cr_expect_not_null_(__VA_ARGS__, .sentinel_ = 0)) +# define cr_assert_not_null(...) CR_EXPAND(cr_assert_not_null_(__VA_ARGS__, 0)) +# define cr_expect_not_null(...) CR_EXPAND(cr_expect_not_null_(__VA_ARGS__, 0)) // Floating-point asserts # define cr_assert_float_eq(...) \ - CR_EXPAND(cr_assert_float_eq_(__VA_ARGS__, .sentinel_ = 0)) + CR_EXPAND(cr_assert_float_eq_(__VA_ARGS__, 0)) # define cr_expect_float_eq(...) \ - CR_EXPAND(cr_expect_float_eq_(__VA_ARGS__, .sentinel_ = 0)) + CR_EXPAND(cr_expect_float_eq_(__VA_ARGS__, 0)) # define cr_assert_float_eq_(Actual, Expected, Epsilon, ...) \ CR_EXPAND(cr_assert_impl(FATAL, (Expected) - (Actual) <= (Epsilon) \ @@ -145,9 +156,9 @@ struct criterion_assert_args { __VA_ARGS__)) # define cr_assert_float_neq(...) \ - CR_EXPAND(cr_assert_float_neq_(__VA_ARGS__, .sentinel_ = 0)) + CR_EXPAND(cr_assert_float_neq_(__VA_ARGS__, 0)) # define cr_expect_float_neq(...) \ - CR_EXPAND(cr_expect_float_neq_(__VA_ARGS__, .sentinel_ = 0)) + CR_EXPAND(cr_expect_float_neq_(__VA_ARGS__, 0)) # define cr_assert_float_neq_(Actual, Expected, Epsilon, ...) \ CR_EXPAND(cr_assert_impl(FATAL, (Expected) - (Actual) > (Epsilon) \ @@ -166,55 +177,51 @@ struct criterion_assert_args { CR_EXPAND(cr_assert_impl(NORMAL, strcmp((Actual), (Expected)) Op 0, __VA_ARGS__)) # define cr_assert_strings_eq(...) \ - CR_EXPAND(cr_assert_strings_(==, __VA_ARGS__, .sentinel_ = 0)) + CR_EXPAND(cr_assert_strings_(==, __VA_ARGS__, 0)) # define cr_expect_strings_eq(...) \ - CR_EXPAND(cr_expect_strings_(==, __VA_ARGS__, .sentinel_ = 0)) + CR_EXPAND(cr_expect_strings_(==, __VA_ARGS__, 0)) # define cr_assert_strings_neq(...) \ - CR_EXPAND(cr_assert_strings_(!=, __VA_ARGS__, .sentinel_ = 0)) + CR_EXPAND(cr_assert_strings_(!=, __VA_ARGS__, 0)) # define cr_expect_strings_neq(...) \ - CR_EXPAND(cr_expect_strings_(!=, __VA_ARGS__, .sentinel_ = 0)) + CR_EXPAND(cr_expect_strings_(!=, __VA_ARGS__, 0)) -# define cr_assert_strings_gt(...) CR_EXPAND(cr_assert_strings_(>, __VA_ARGS__, .sentinel_ = 0)) -# define cr_expect_strings_gt(...) CR_EXPAND(cr_expect_strings_(>, __VA_ARGS__, .sentinel_ = 0)) +# define cr_assert_strings_gt(...) CR_EXPAND(cr_assert_strings_(>, __VA_ARGS__, 0)) +# define cr_expect_strings_gt(...) CR_EXPAND(cr_expect_strings_(>, __VA_ARGS__, 0)) -# define cr_assert_strings_lt(...) CR_EXPAND(cr_assert_strings_(<, __VA_ARGS__, .sentinel_ = 0)) -# define cr_expect_strings_lt(...) CR_EXPAND(cr_expect_strings_(<, __VA_ARGS__, .sentinel_ = 0)) +# define cr_assert_strings_lt(...) CR_EXPAND(cr_assert_strings_(<, __VA_ARGS__, 0)) +# define cr_expect_strings_lt(...) CR_EXPAND(cr_expect_strings_(<, __VA_ARGS__, 0)) -# define cr_assert_strings_leq(...) CR_EXPAND(cr_assert_strings_(<=, __VA_ARGS__, .sentinel_ = 0)) -# define cr_expect_strings_leq(...) CR_EXPAND(cr_expect_strings_(<=, __VA_ARGS__, .sentinel_ = 0)) +# define cr_assert_strings_leq(...) CR_EXPAND(cr_assert_strings_(<=, __VA_ARGS__, 0)) +# define cr_expect_strings_leq(...) CR_EXPAND(cr_expect_strings_(<=, __VA_ARGS__, 0)) -# define cr_assert_strings_geq(...) CR_EXPAND(cr_assert_strings_(>=, __VA_ARGS__, .sentinel_ = 0)) -# define cr_expect_strings_geq(...) CR_EXPAND(cr_expect_strings_(>=, __VA_ARGS__, .sentinel_ = 0)) +# define cr_assert_strings_geq(...) CR_EXPAND(cr_assert_strings_(>=, __VA_ARGS__, 0)) +# define cr_expect_strings_geq(...) CR_EXPAND(cr_expect_strings_(>=, __VA_ARGS__, 0)) // Array asserts # define cr_assert_arrays_eq(...) \ - CR_EXPAND(cr_assert_arrays_eq_(__VA_ARGS__, .sentinel_ = 0)) + CR_EXPAND(cr_assert_arrays_eq_(__VA_ARGS__, 0)) # define cr_expect_arrays_eq(...) \ - CR_EXPAND(cr_expect_arrays_eq_(__VA_ARGS__, .sentinel_ = 0)) + CR_EXPAND(cr_expect_arrays_eq_(__VA_ARGS__, 0)) # define cr_assert_arrays_neq(...) \ - CR_EXPAND(cr_assert_arrays_neq_(__VA_ARGS__, .sentinel_ = 0)) + CR_EXPAND(cr_assert_arrays_neq_(__VA_ARGS__, 0)) # define cr_expect_arrays_neq(...) \ - CR_EXPAND(cr_expect_arrays_neq_(__VA_ARGS__, .sentinel_ = 0)) + CR_EXPAND(cr_expect_arrays_neq_(__VA_ARGS__, 0)) -# define cr_assert_arrays_eq_(A, B, Size, ...) \ +# define cr_assert_arrays_eq_(A, B, Size, ...) \ CR_EXPAND(cr_assert_impl(FATAL, !memcmp((A), (B), (Size)), \ - .default_msg = "Arrays are not equal.", \ __VA_ARGS__)) -# define cr_expect_arrays_eq_(A, B, Size, ...) \ +# define cr_expect_arrays_eq_(A, B, Size, ...) \ CR_EXPAND(cr_assert_impl(NORMAL, !memcmp((A), (B), (Size)), \ - .default_msg = "Arrays are not equal.", \ __VA_ARGS__)) -# define cr_assert_arrays_neq_(A, B, Size, ...) \ +# define cr_assert_arrays_neq_(A, B, Size, ...) \ CR_EXPAND(cr_assert_impl(FATAL, memcmp((A), (B), (Size)), \ - .default_msg = "Arrays are equal", \ __VA_ARGS__)) -# define cr_expect_arrays_neq_(A, B, Size, ...) \ +# define cr_expect_arrays_neq_(A, B, Size, ...) \ CR_EXPAND(cr_assert_impl(NORMAL, memcmp((A), (B), (Size)), \ - .default_msg = "Arrays are equal", \ __VA_ARGS__)) # ifdef __GNUC__ @@ -230,7 +237,6 @@ struct criterion_assert_args { do { \ CRIT_ARR_COMPARE_(A, B, Size, Cmp, equals); \ cr_assert_impl(FATAL, equals, \ - .default_msg = "Arrays are not equal", \ __VA_ARGS__); \ } while (0) @@ -238,20 +244,18 @@ struct criterion_assert_args { do { \ CRIT_ARR_COMPARE_(A, B, Size, Cmp, equals); \ cr_assert_impl(NORMAL, equals, \ - .default_msg = "Arrays are not equal", \ __VA_ARGS__); \ } while (0) # define cr_assert_arrays_eq_cmp(...) \ - cr_assert_arrays_eq_cmp_(__VA_ARGS__, .sentinel_ = 0) + cr_assert_arrays_eq_cmp_(__VA_ARGS__, 0) # define cr_expect_arrays_eq_cmp(...) \ - cr_expect_arrays_eq_cmp_(__VA_ARGS__, .sentinel_ = 0) + cr_expect_arrays_eq_cmp_(__VA_ARGS__, 0) # define cr_assert_arrays_neq_cmp_(A, B, Size, Cmp, ...) \ do { \ CRIT_ARR_COMPARE_(A, B, Size, Cmp, equals); \ cr_assert_impl(FATAL, !equals, \ - .default_msg = "Arrays not equal", \ __VA_ARGS__); \ } while (0) @@ -259,14 +263,13 @@ struct criterion_assert_args { do { \ CRIT_ARR_COMPARE_(A, B, Size, Cmp, equals); \ cr_assert_impl(NORMAL, equals, \ - .default_msg = "Arrays not equal", \ __VA_ARGS__); \ } while (0) # define cr_assert_arrays_neq_cmp(...) \ - cr_assert_arrays_eq_cmp_(__VA_ARGS__, .sentinel_ = 0) + cr_assert_arrays_eq_cmp_(__VA_ARGS__, 0) # define cr_expect_arrays_neq_cmp(...) \ - cr_expect_arrays_eq_cmp_(__VA_ARGS__, .sentinel_ = 0) + cr_expect_arrays_eq_cmp_(__VA_ARGS__, 0) # endif /* !__GNUC__ */ // The section below is here for backward compatibility purposes. diff --git a/include/criterion/common.h b/include/criterion/common.h index 238a9c2..5ee86a9 100644 --- a/include/criterion/common.h +++ b/include/criterion/common.h @@ -43,12 +43,22 @@ # endif # endif +# ifdef __cplusplus +# define CR_ATTRIBUTE(Arg) [[gnu::Arg]] +# define CR_BEGIN_C_API extern "C" { +# define CR_END_C_API } +# else +# define CR_ATTRIBUTE(Arg) __attribute__((Arg)) +# define CR_BEGIN_C_API +# define CR_END_C_API +# endif + # ifdef __APPLE__ # define SECTION_START_PREFIX __first # define SECTION_END_PREFIX __last # define SECTION_START_SUFFIX(Name) __asm("section$start$__DATA$" Name) # define SECTION_END_SUFFIX(Name) __asm("section$end$__DATA$" Name) -# define SECTION_(Name) __attribute__((section("__DATA," Name))) +# define SECTION_(Name) CR_ATTRIBUTE(section("__DATA," Name) # define SECTION_SUFFIX_ # elif CR_IS_MSVC # define SECTION_START_PREFIX __start @@ -66,7 +76,7 @@ # define SECTION_END_PREFIX __stop # define SECTION_START_SUFFIX(Name) # define SECTION_END_SUFFIX(Name) -# define SECTION_(Name) __attribute__((section(Name))) +# define SECTION_(Name) CR_ATTRIBUTE(section(Name)) # define SECTION_SUFFIX_ # endif @@ -89,8 +99,8 @@ Type *const SECTION_END(Name) = &SECTION_END_(Name) # ifdef __GNUC__ -# define UNUSED __attribute__((unused)) -# define NORETURN __attribute__((noreturn)) +# define UNUSED CR_ATTRIBUTE(unused) +# define NORETURN CR_ATTRIBUTE(noreturn) # elif CR_IS_MSVC # define UNUSED # define NORETURN __declspec(noreturn) @@ -106,7 +116,7 @@ # endif # ifdef __GNUC__ -# define FORMAT(Archetype, Index, Ftc) __attribute__((format(Archetype, Index, Ftc))) +# define FORMAT(Archetype, Index, Ftc) CR_ATTRIBUTE(format(Archetype, Index, Ftc)) # else # define FORMAT(Archetype, Index, Ftc) # endif @@ -114,13 +124,13 @@ # if defined _WIN32 || defined __CYGWIN__ # ifdef CRITERION_BUILDING_DLL # ifdef __GNUC__ -# define CR_API __attribute__ ((dllexport)) +# define CR_API CR_ATTRIBUTE(dllexport) # else # define CR_API __declspec(dllexport) # endif # else # ifdef __GNUC__ -# define CR_API __attribute__ ((dllimport)) +# define CR_API CR_ATTRIBUTE(dllimport) # else # define CR_API __declspec(dllimport) # endif @@ -128,8 +138,8 @@ # define CR_LOCAL # else # if __GNUC__ >= 4 -# define CR_API __attribute__ ((visibility ("default"))) -# define CR_LOCAL __attribute__ ((visibility ("hidden"))) +# define CR_API CR_ATTRIBUTE(visibility("default")) +# define CR_LOCAL CR_ATTRIBUTE(visibility("hidden")) # else # define CR_API # define CR_LOCAL diff --git a/include/criterion/criterion.h b/include/criterion/criterion.h index 51c82fd..bc82ccc 100644 --- a/include/criterion/criterion.h +++ b/include/criterion/criterion.h @@ -24,14 +24,21 @@ #ifndef CRITERION_H_ # define CRITERION_H_ +# include "designated-initializer-compat.h" # include "common.h" -# include "assert.h" # include "types.h" +# include "assert.h" # define IDENTIFIER_(Category, Name, Suffix) \ Category ## _ ## Name ## _ ## Suffix -# define TEST_PROTOTYPE_(Category, Name) \ + +# ifdef __cplusplus +# define TEST_PROTOTYPE_(Category, Name) \ + extern "C" void IDENTIFIER_(Category, Name, impl)(void) +# else +# define TEST_PROTOTYPE_(Category, Name) \ void IDENTIFIER_(Category, Name, impl)(void) +# endif # define SUITE_IDENTIFIER_(Name, Suffix) \ suite_ ## Name ## _ ## Suffix @@ -39,34 +46,40 @@ # define Test(...) CR_EXPAND(Test_(__VA_ARGS__, .sentinel_ = 0)) # define Test_(Category, Name, ...) \ TEST_PROTOTYPE_(Category, Name); \ - struct criterion_test_extra_data IDENTIFIER_(Category, Name, extra) = { \ - .identifier_ = #Category "/" #Name, \ - .file_ = __FILE__, \ - .line_ = __LINE__, \ - __VA_ARGS__ \ - }; \ + struct criterion_test_extra_data IDENTIFIER_(Category, Name, extra) = \ + CR_EXPAND(CRITERION_MAKE_STRUCT(struct criterion_test_extra_data, \ + .identifier_ = #Category "/" #Name, \ + .file_ = __FILE__, \ + .line_ = __LINE__, \ + __VA_ARGS__ \ + )); \ SECTION_("cr_tst") \ const struct criterion_test IDENTIFIER_(Category, Name, meta) = { \ - .name = #Name, \ - .category = #Category, \ - .test = IDENTIFIER_(Category, Name, impl), \ - .data = &IDENTIFIER_(Category, Name, extra) \ + #Name, \ + #Category, \ + IDENTIFIER_(Category, Name, impl), \ + &IDENTIFIER_(Category, Name, extra) \ } SECTION_SUFFIX_; \ TEST_PROTOTYPE_(Category, Name) # define TestSuite(...) CR_EXPAND(TestSuite_(__VA_ARGS__, .sentinel_ = 0)) # define TestSuite_(Name, ...) \ - struct criterion_test_extra_data SUITE_IDENTIFIER_(Name, extra) = { \ - .file_ = __FILE__, \ - .line_ = 0, \ - __VA_ARGS__ \ - }; \ + struct criterion_test_extra_data SUITE_IDENTIFIER_(Name, extra) = \ + CR_EXPAND(CRITERION_MAKE_STRUCT(struct criterion_test_extra_data, \ + .file_ = __FILE__, \ + .line_ = 0, \ + __VA_ARGS__ \ + )); \ SECTION_("cr_sts") \ const struct criterion_suite SUITE_IDENTIFIER_(Name, meta) = { \ - .name = #Name, \ - .data = &SUITE_IDENTIFIER_(Name, extra), \ + #Name, \ + &SUITE_IDENTIFIER_(Name, extra), \ } SECTION_SUFFIX_ +CR_BEGIN_C_API + CR_API int criterion_run_all_tests(void); +CR_END_C_API + #endif /* !CRITERION_H_ */ diff --git a/include/criterion/designated-initializer-compat.h b/include/criterion/designated-initializer-compat.h new file mode 100644 index 0000000..910952b --- /dev/null +++ b/include/criterion/designated-initializer-compat.h @@ -0,0 +1,124 @@ +/* + * The MIT License (MIT) + * + * Copyright © 2015 Franklin "Snaipe" Mathieu + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#ifndef CRITERION_DESIGNATED_INITIALIZER_COMPAT_HH_ +# define CRITERION_DESIGNATED_INITIALIZER_COMPAT_HH_ + +# include "common.h" + +# define CRITERION_ARG_LENGTH(...) CR_EXPAND(CRITERION_ARG_LENGTH_(__VA_ARGS__,\ + 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45,\ + 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26,\ + 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,\ + 5, 4, 3, 2, 1, 0)) +# define CRITERION_ARG_LENGTH_(_63, _62, _61, _60, _59, _58, _57, _56, _55, _54, _53, \ + _52, _51, _50, _49, _48, _47, _46, _45, _44, _43, _42, _41, _40, _39, _38, \ + _37, _36, _35, _34, _33, _32, _31, _30, _29, _28, _27, _26, _25, _24, _23, \ + _22, _21, _20, _19, _18, _17, _16, _15, _14, _13, _12, _11, _10, _9, _8, \ + _7, _6, _5, _4, _3, _2, _1, count, ...) count + +# define CRITERION_APPLY_1(Macro, ...) +# define CRITERION_APPLY_2(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_1(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_3(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_2(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_4(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_3(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_5(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_4(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_6(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_5(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_7(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_6(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_8(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_7(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_9(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_8(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_10(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_9(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_11(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_10(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_12(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_11(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_13(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_12(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_14(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_13(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_15(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_14(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_16(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_15(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_17(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_16(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_18(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_17(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_19(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_18(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_20(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_19(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_21(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_20(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_22(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_21(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_23(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_22(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_24(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_23(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_25(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_24(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_26(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_25(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_27(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_26(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_28(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_27(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_29(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_28(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_30(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_29(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_31(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_30(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_32(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_31(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_33(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_32(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_34(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_33(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_35(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_34(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_36(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_35(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_37(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_36(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_38(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_37(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_39(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_38(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_40(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_39(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_41(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_40(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_42(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_41(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_43(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_42(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_44(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_43(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_45(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_44(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_46(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_45(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_47(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_46(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_48(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_47(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_49(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_48(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_50(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_49(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_51(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_50(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_52(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_51(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_53(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_52(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_54(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_53(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_55(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_54(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_56(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_55(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_57(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_56(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_58(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_57(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_59(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_58(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_60(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_59(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_61(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_60(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_62(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_61(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_63(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_62(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_64(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_63(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_65(Macro, Prefix, Head, ...) Macro(Prefix, Head) CR_EXPAND(CRITERION_APPLY_64(Macro, Prefix, __VA_ARGS__)) + +# define CRITERION_APPLY__(Macro, Prefix, n, ...) CR_EXPAND(CRITERION_APPLY_##n(Macro, Prefix, __VA_ARGS__)) +# define CRITERION_APPLY_(Macro, n, Prefix, ...) CR_EXPAND(CRITERION_APPLY__(Macro, Prefix, n, __VA_ARGS__)) +# define CRITERION_APPLY(Macro, ...) CR_EXPAND(CRITERION_APPLY_(Macro, CRITERION_ARG_LENGTH(__VA_ARGS__), __VA_ARGS__)) + +# define CRITERION_ADD_PREFIX_ONCE(Prefix, Field, ...) Prefix Field; +# define CRITERION_ADD_PREFIX(...) \ + CR_EXPAND(CRITERION_APPLY(CRITERION_ADD_PREFIX_ONCE, __VA_ARGS__)) + +# ifdef __cplusplus +# define CRITERION_MAKE_STRUCT(Type, ...) [&]() { \ + Type t; \ + CR_EXPAND(CRITERION_ADD_PREFIX(t, __VA_ARGS__)) \ + return t; \ + }() +# else +# define CRITERION_MAKE_STRUCT(Type, ...) { __VA_ARGS__ } +# endif + +#endif /* !CRITERION_DESIGNATED_INITIALIZER_COMPAT_HH_ */ diff --git a/include/criterion/event.h b/include/criterion/event.h index db6cfe3..37881db 100644 --- a/include/criterion/event.h +++ b/include/criterion/event.h @@ -24,12 +24,21 @@ #ifndef CRITERION_EVENT_H_ # define CRITERION_EVENT_H_ -# include -# include +# ifdef __cplusplus +# include +# include +# else +# include +# include +# endif # include "common.h" +CR_BEGIN_C_API + extern FILE *g_event_pipe; CR_API void send_event(int kind, void *data, size_t size); +CR_END_C_API + #endif /* !CRITERION_EVENT_H_ */ diff --git a/include/criterion/hooks.h b/include/criterion/hooks.h index 0c86841..098790a 100644 --- a/include/criterion/hooks.h +++ b/include/criterion/hooks.h @@ -25,6 +25,7 @@ # define CRITERION_HOOKS_H_ # include "common.h" +# include "types.h" typedef enum { PRE_ALL, @@ -46,8 +47,13 @@ typedef void (*f_report_hook)(); # define HOOK_IDENTIFIER__(Line, Suffix) HOOK_IDENTIFIER___(Line, Suffix) # define HOOK_IDENTIFIER___(Line, Suffix) hook_l ## Line ## _ ## Suffix -# define HOOK_PROTOTYPE_ \ +# ifdef __cplusplus +# define HOOK_PROTOTYPE_ \ + extern "C" void HOOK_IDENTIFIER_(impl) +# else +# define HOOK_PROTOTYPE_ \ void HOOK_IDENTIFIER_(impl) +# endif // Section abbreviations # define HOOK_SECTION_PRE_ALL cr_pra @@ -68,10 +74,24 @@ typedef void (*f_report_hook)(); # define HOOK_SECTION_STRINGIFY_(Sec) HOOK_SECTION_STRINGIFY__(Sec) # define HOOK_SECTION_STRINGIFY(Kind) HOOK_SECTION_STRINGIFY_(HOOK_SECTION(Kind)) +# define HOOK_PARAM_TYPE_PRE_ALL struct criterion_test_set * +# define HOOK_PARAM_TYPE_PRE_SUITE struct criterion_suite_set * +# define HOOK_PARAM_TYPE_PRE_INIT struct criterion_test * +# define HOOK_PARAM_TYPE_PRE_TEST struct criterion_test * +# define HOOK_PARAM_TYPE_ASSERT struct criterion_assert_stats * +# define HOOK_PARAM_TYPE_THEORY_FAIL struct criterion_theory_stats * +# define HOOK_PARAM_TYPE_TEST_CRASH struct criterion_test_stats * +# define HOOK_PARAM_TYPE_POST_TEST struct criterion_test_stats * +# define HOOK_PARAM_TYPE_POST_FINI struct criterion_test_stats * +# define HOOK_PARAM_TYPE_POST_SUITE struct criterion_suite_stats * +# define HOOK_PARAM_TYPE_POST_ALL struct criterion_global_stats * + +# define HOOK_PARAM_TYPE(Kind) HOOK_PARAM_TYPE_ ## Kind + # define ReportHook(Kind) \ - HOOK_PROTOTYPE_(); \ + HOOK_PROTOTYPE_(HOOK_PARAM_TYPE(Kind)); \ SECTION_(HOOK_SECTION_STRINGIFY(Kind)) \ - const f_report_hook HOOK_IDENTIFIER_(func) = HOOK_IDENTIFIER_(impl); \ + const f_report_hook HOOK_IDENTIFIER_(func) = (f_report_hook) HOOK_IDENTIFIER_(impl); \ HOOK_PROTOTYPE_ #endif /* !CRITERION_HOOKS_H_ */ diff --git a/include/criterion/logging.h b/include/criterion/logging.h index 7cd74f7..c8c0205 100644 --- a/include/criterion/logging.h +++ b/include/criterion/logging.h @@ -24,8 +24,13 @@ #ifndef CRITERION_LOGGING_H_ # define CRITERION_LOGGING_H_ -# include -# include +# ifdef __cplusplus +# include +using std::va_list; +# else +# include +# include +# endif # include "common.h" # include "ordered-set.h" # include "stats.h" @@ -67,6 +72,8 @@ struct criterion_prefix_data { # define RESET CRIT_COLOR_NORMALIZE(CRIT_RESET) # endif +CR_BEGIN_C_API + extern const struct criterion_prefix_data g_criterion_logging_prefixes[]; # define CRITERION_PREFIX_DASHES (&g_criterion_logging_prefixes[CRITERION_LOGGING_PREFIX_DASHES]) @@ -109,6 +116,8 @@ struct criterion_output_provider { extern struct criterion_output_provider normal_logging; extern struct criterion_output_provider tap_logging; +CR_END_C_API + #define NORMAL_LOGGING (&normal_logging) #define TAP_LOGGING (&tap_logging) diff --git a/include/criterion/options.h b/include/criterion/options.h index 31b90d2..0bdcdee 100644 --- a/include/criterion/options.h +++ b/include/criterion/options.h @@ -38,6 +38,10 @@ struct criterion_options { bool short_filename; }; +CR_BEGIN_C_API + extern struct criterion_options criterion_options; +CR_END_C_API + #endif /*!CRITERION_OPTIONS_H_ */ diff --git a/include/criterion/ordered-set.h b/include/criterion/ordered-set.h index 514f601..24044f8 100644 --- a/include/criterion/ordered-set.h +++ b/include/criterion/ordered-set.h @@ -40,15 +40,7 @@ struct criterion_ordered_set_node { char data[0]; }; -struct criterion_suite_set { - struct criterion_suite suite; - struct criterion_ordered_set *tests; -}; - -struct criterion_test_set { - struct criterion_ordered_set *suites; - size_t tests; -}; +CR_BEGIN_C_API CR_API struct criterion_ordered_set *new_ordered_set(f_criterion_cmp cmp, void (*dtor)(void *, void *)); @@ -57,6 +49,8 @@ CR_API void *insert_ordered_set(struct criterion_ordered_set *l, void *ptr, size_t size); +CR_END_C_API + # define FOREACH_SET(Elt, Set) \ for (struct criterion_ordered_set_node *n = Set->first; n; n = n->next) \ for (int cond = 1; cond;) \ diff --git a/include/criterion/theories.h b/include/criterion/theories.h index 6e23345..f23c223 100644 --- a/include/criterion/theories.h +++ b/include/criterion/theories.h @@ -27,6 +27,8 @@ # include # include "criterion.h" +CR_BEGIN_C_API + struct criterion_theory_context; CR_API struct criterion_theory_context* cr_theory_init(void); @@ -114,4 +116,6 @@ CR_API void cr_theory_main(struct criterion_datapoints *dps, size_t datapoints, } \ void CR_EXPAND(CR_VAARG_ID(theory, __VA_ARGS__,))Args +CR_END_C_API + #endif /* !CRITERION_THEORIES_H_ */ diff --git a/include/criterion/types.h b/include/criterion/types.h index 9acd208..aa05e03 100644 --- a/include/criterion/types.h +++ b/include/criterion/types.h @@ -24,8 +24,13 @@ #ifndef CRITERION_TYPES_H_ # define CRITERION_TYPES_H_ -# include -# include +# ifdef __cplusplus +# include +using std::size_t; +# else +# include +# include +# endif # include "common.h" struct criterion_test_extra_data { @@ -54,6 +59,18 @@ struct criterion_suite { struct criterion_test_extra_data *data; }; +struct criterion_ordered_set; + +struct criterion_suite_set { + struct criterion_suite suite; + struct criterion_ordered_set *tests; +}; + +struct criterion_test_set { + struct criterion_ordered_set *suites; + size_t tests; +}; + typedef void (*f_worker_func)(struct criterion_test *, struct criterion_suite *); #endif /* !CRITERION_TYPES_H_ */ diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index d8e1d14..386710a 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -1,5 +1,6 @@ if (NOT MSVC) set(CMAKE_C_FLAGS "-std=c99 -Wall -Wextra -pedantic") + set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -pedantic") endif () include_directories(../include) @@ -40,6 +41,13 @@ foreach(sample ${SAMPLES}) ENVIRONMENT "CRITERION_ALWAYS_SUCCEED=1" ) + add_executable(${sample}_cpp ${sample}.cc) + target_link_libraries(${sample}_cpp criterion) + add_test(${sample}_cpp ${sample}_cpp) + set_property(TEST ${sample} PROPERTY + ENVIRONMENT "CRITERION_ALWAYS_SUCCEED=1" + ) + if (NOT MSVC) # we disable the scripted tests when building with MSVC add_test(${sample}_compare sh ${CMAKE_CURRENT_LIST_DIR}/tests/run_test.sh "${CMAKE_CURRENT_LIST_DIR}" . . ${sample}) set_property(TEST ${sample}_compare PROPERTY diff --git a/samples/asserts.c b/samples/asserts.c index 6b44cb9..ef5bc98 100644 --- a/samples/asserts.c +++ b/samples/asserts.c @@ -6,8 +6,6 @@ Test(asserts, base) { cr_assert(true, "Assertions may take failure messages"); - cr_assert(true, .msg = "You can use explicit named arguments"); - cr_expect(false, "assert is fatal, expect isn't"); cr_assert(false, "This assert runs"); cr_assert(false, "This does not"); diff --git a/samples/report.c b/samples/report.c index 4c7a849..8c9ace8 100644 --- a/samples/report.c +++ b/samples/report.c @@ -15,10 +15,12 @@ ReportHook(POST_TEST)(struct criterion_test_stats *stats) { stats->passed_asserts, stats->failed_asserts, stats->passed_asserts + stats->failed_asserts); } -ReportHook(PRE_ALL)() { +ReportHook(PRE_ALL)(struct criterion_test_set *tests) { + (void) tests; puts("criterion_init"); } -ReportHook(POST_ALL)() { +ReportHook(POST_ALL)(struct criterion_global_stats *stats) { + (void) stats; puts("criterion_fini"); } diff --git a/src/report.c b/src/report.c index 5809bfd..9a6f80e 100644 --- a/src/report.c +++ b/src/report.c @@ -83,15 +83,15 @@ IMPL_CALL_REPORT_HOOKS(POST_FINI); IMPL_CALL_REPORT_HOOKS(POST_SUITE); IMPL_CALL_REPORT_HOOKS(POST_ALL); -ReportHook(PRE_ALL)() {} -ReportHook(PRE_SUITE)() {} -ReportHook(PRE_INIT)() {} -ReportHook(PRE_TEST)() {} -ReportHook(ASSERT)() {} -ReportHook(THEORY_FAIL)() {} -ReportHook(TEST_CRASH)() {} -ReportHook(POST_TEST)() {} -ReportHook(POST_FINI)() {} -ReportHook(POST_SUITE)() {} -ReportHook(POST_ALL)() {} +ReportHook(PRE_ALL)(UNUSED struct criterion_test_set *arg) {} +ReportHook(PRE_SUITE)(UNUSED struct criterion_suite_set *arg) {} +ReportHook(PRE_INIT)(UNUSED struct criterion_test *arg) {} +ReportHook(PRE_TEST)(UNUSED struct criterion_test *arg) {} +ReportHook(ASSERT)(UNUSED struct criterion_assert_stats *arg) {} +ReportHook(THEORY_FAIL)(UNUSED struct criterion_theory_stats *arg) {} +ReportHook(TEST_CRASH)(UNUSED struct criterion_test_stats *arg) {} +ReportHook(POST_TEST)(UNUSED struct criterion_test_stats *arg) {} +ReportHook(POST_FINI)(UNUSED struct criterion_test_stats *arg) {} +ReportHook(POST_SUITE)(UNUSED struct criterion_suite_stats *arg) {} +ReportHook(POST_ALL)(UNUSED struct criterion_global_stats *arg) {}