diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-09 15:35:53 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-09 15:35:53 +0000 |
commit | 0489f825d4c684155618d922d2f586f70bb0768c (patch) | |
tree | 0d63bb01a408c6f4fbac41d60ae5b54809b7a8d4 | |
parent | 6798462428c2ab0afe7a882b87aad9e4a700d2cb (diff) |
Merged revisions 275021 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r275021 | russell | 2010-07-09 10:33:08 -0500 (Fri, 09 Jul 2010) | 4 lines
Document that a leading and trailing slash is expected for test categories.
Also, emit a warning if a test is registered without one of these.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@275022 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | include/asterisk/test.h | 7 | ||||
-rw-r--r-- | main/test.c | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/asterisk/test.h b/include/asterisk/test.h index f97df80d7..57e05b471 100644 --- a/include/asterisk/test.h +++ b/include/asterisk/test.h @@ -154,7 +154,12 @@ struct ast_test; struct ast_test_info { /*! \brief name of test, unique to category */ const char *name; - /*! \brief test category */ + /*! + * \brief test category + * + * Tests are categorized in a directory tree style hierarchy. It is expected that + * this string have both a leading and trailing forward slash ('/'). + */ const char *category; /*! \brief optional short summary of test */ const char *summary; diff --git a/main/test.c b/main/test.c index 3427bf205..f35dbdb21 100644 --- a/main/test.c +++ b/main/test.c @@ -547,6 +547,11 @@ static struct ast_test *test_alloc(ast_test_cb_t *cb) return test_free(test); } + if (test->info.category[0] != '/' || test->info.category[strlen(test->info.category) - 1] != '/') { + ast_log(LOG_WARNING, "Test category is missing a leading or trailing backslash for test %s%s", + test->info.category, test->info.name); + } + if (ast_strlen_zero(test->info.summary)) { ast_log(LOG_WARNING, "Test %s/%s has no summary, test registration refused.\n", test->info.category, test->info.name); |