From cdfb7e092ccb3cb1080486dd0d78bc713b7317da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alari=20=C3=95is?= Date: Fri, 1 May 2020 08:18:09 +0300 Subject: [PATCH] More elegant RUN_TEST macro --- src/unity_internals.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/unity_internals.h b/src/unity_internals.h index d7c2116..3ba153b 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -701,11 +701,8 @@ extern const char UnityStrErrShorthand[]; #endif #endif #ifdef UNITY_SUPPORT_VARIADIC_MACROS -#define RUN_TEST(...) UnityDefaultTestRun(RUN_TEST_FIRST(__VA_ARGS__), RUN_TEST_SECOND(__VA_ARGS__)) -#define RUN_TEST_FIRST(...) RUN_TEST_FIRST_HELPER(__VA_ARGS__, throwaway) -#define RUN_TEST_FIRST_HELPER(first, ...) (first), #first -#define RUN_TEST_SECOND(...) RUN_TEST_SECOND_HELPER(__VA_ARGS__, __LINE__, throwaway) -#define RUN_TEST_SECOND_HELPER(first, second, ...) (second) +#define RUN_TEST(...) RUN_TEST_AT_LINE(__VA_ARGS__, __LINE__) +#define RUN_TEST_AT_LINE(func, line, ...) UnityDefaultTestRun(func, #func, line) #endif #endif