aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-09 15:39:22 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-09 15:39:22 +0000
commitfbbb1fd48e2f9f8a9aac27b51d818f80bd8263f3 (patch)
tree6802b431fc7ea4e59b5aa11bec147e5e9c5ff7d3
parent37e792adf62d1c48c5c9175240149089a540eee3 (diff)
Merged revisions 275022 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r275022 | russell | 2010-07-09 10:35:53 -0500 (Fri, 09 Jul 2010) | 11 lines 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/branches/1.6.2@275023 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--include/asterisk/test.h7
-rw-r--r--main/test.c5
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 f1436827d..877e5082e 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);