[asterisk-commits] russell: branch 1.6.2 r275023 - in /branches/1.6.2: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Jul  9 10:39:22 2010
New Revision: 275023

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=275023
Log:
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.
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/include/asterisk/test.h
    branches/1.6.2/main/test.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/include/asterisk/test.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/include/asterisk/test.h?view=diff&rev=275023&r1=275022&r2=275023
==============================================================================
--- branches/1.6.2/include/asterisk/test.h (original)
+++ branches/1.6.2/include/asterisk/test.h Fri Jul  9 10:39:22 2010
@@ -154,7 +154,12 @@
 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;

Modified: branches/1.6.2/main/test.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/test.c?view=diff&rev=275023&r1=275022&r2=275023
==============================================================================
--- branches/1.6.2/main/test.c (original)
+++ branches/1.6.2/main/test.c Fri Jul  9 10:39:22 2010
@@ -547,6 +547,11 @@
 		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);