kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 03:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaked __ast_test_suite_assert_notify() and __ast_test_suite_event_notify() to be void functions.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378823 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-01-09 22:15:41 +00:00
parent 04501f0054
commit 32cb4ca542
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/asterisk/test.h
View File

@@ -145,10 +145,9 @@
* \param state The state the application has changed to * \param state The state the application has changed to
* \param fmt The message with format parameters to add to the manager event * \param fmt The message with format parameters to add to the manager event
* *
* \returns 0 on success * \return Nothing
* \returns any other value on failure
*/ */
int __ast_test_suite_event_notify(const char *file, const char *func, int line, const char *state, const char *fmt, ...) void __ast_test_suite_event_notify(const char *file, const char *func, int line, const char *state, const char *fmt, ...)
__attribute__((format(printf, 5, 6))); __attribute__((format(printf, 5, 6)));
/*! /*!
@@ -161,10 +160,9 @@ int __ast_test_suite_event_notify(const char *file, const char *func, int line,
* *
* \param exp The expression to evaluate * \param exp The expression to evaluate
* *
* \returns 0 on success * \return Nothing
* \returns any other value on failure
*/ */
int __ast_test_suite_assert_notify(const char *file, const char *func, int line, const char *exp); void __ast_test_suite_assert_notify(const char *file, const char *func, int line, const char *exp);
/*! /*!
* \ref __ast_test_suite_event_notify() * \ref __ast_test_suite_event_notify()
@@ -175,13 +173,17 @@ int __ast_test_suite_assert_notify(const char *file, const char *func, int line,
/*! /*!
* \ref __ast_test_suite_assert_notify() * \ref __ast_test_suite_assert_notify()
*/ */
#define ast_test_suite_assert(exp) \ #define ast_test_suite_assert(exp) \
( (exp) ? (void)0 : __ast_test_suite_assert_notify(__FILE__, __PRETTY_FUNCTION__, __LINE__, #exp)) do { \
if (__builtin_expect(!(exp), 1)) { \
__ast_test_suite_assert_notify(__FILE__, __PRETTY_FUNCTION__, __LINE__, #exp); \
} \
} while (0)
#else #else
#define ast_test_suite_event_notify(s, f, ...) (void)0; #define ast_test_suite_event_notify(s, f, ...)
#define ast_test_suite_assert(exp) (void)0; #define ast_test_suite_assert(exp)
#endif #endif

10
main/test.c
View File

@@ -910,13 +910,13 @@ static struct ast_cli_entry test_cli[] = {
AST_CLI_DEFINE(test_cli_generate_results, "generate test results to file"), AST_CLI_DEFINE(test_cli_generate_results, "generate test results to file"),
}; };
int __ast_test_suite_event_notify(const char *file, const char *func, int line, const char *state, const char *fmt, ...) void __ast_test_suite_event_notify(const char *file, const char *func, int line, const char *state, const char *fmt, ...)
{ {
struct ast_str *buf = NULL; struct ast_str *buf = NULL;
va_list ap; va_list ap;
if (!(buf = ast_str_create(128))) { if (!(buf = ast_str_create(128))) {
return -1; return;
} }
va_start(ap, fmt); va_start(ap, fmt);
@@ -933,11 +933,9 @@ int __ast_test_suite_event_notify(const char *file, const char *func, int line,
state, file, func, line, ast_str_buffer(buf)); state, file, func, line, ast_str_buffer(buf));
ast_free(buf); ast_free(buf);
return 0;
} }
int __ast_test_suite_assert_notify(const char *file, const char *func, int line, const char *exp) void __ast_test_suite_assert_notify(const char *file, const char *func, int line, const char *exp)
{ {
manager_event(EVENT_FLAG_TEST, "TestEvent", manager_event(EVENT_FLAG_TEST, "TestEvent",
"Type: Assert\r\n" "Type: Assert\r\n"
@@ -946,8 +944,6 @@ int __ast_test_suite_assert_notify(const char *file, const char *func, int line,
"AppLine: %d\r\n" "AppLine: %d\r\n"
"Expression: %s\r\n", "Expression: %s\r\n",
file, func, line, exp); file, func, line, exp);
return 0;
} }
#endif /* TEST_FRAMEWORK */ #endif /* TEST_FRAMEWORK */