[svn-commits] dvossel: branch dvossel/test_api r234369 - in /team/dvossel/test_api: build_t...

[SVN commits to the Digium repositories]

Author: dvossel
Date: Thu Dec 10 18:14:50 2009
New Revision: 234369

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=234369
Log:
added TEST_FRAMEWORK flag to build options for dev-mode

Modified:
    team/dvossel/test_api/build_tools/cflags-devmode.xml
    team/dvossel/test_api/include/asterisk/test.h
    team/dvossel/test_api/main/asterisk.c
    team/dvossel/test_api/main/test.c

Modified: team/dvossel/test_api/build_tools/cflags-devmode.xml
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/test_api/build_tools/cflags-devmode.xml?view=diff&rev=234369&r1=234368&r2=234369
==============================================================================
--- team/dvossel/test_api/build_tools/cflags-devmode.xml (original)
+++ team/dvossel/test_api/build_tools/cflags-devmode.xml Thu Dec 10 18:14:50 2009
@@ -20,4 +20,7 @@
 		</member>
 		<member name="SKINNY_DEVMODE" displayname="Enable Skinny Dev Mode">
 		</member>
+		<member name="TEST_FRAMEWORK" displayname="Enable Test Framework API">
+		</member>
+
 	</category>

Modified: team/dvossel/test_api/include/asterisk/test.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/test_api/include/asterisk/test.h?view=diff&rev=234369&r1=234368&r2=234369
==============================================================================
--- team/dvossel/test_api/include/asterisk/test.h (original)
+++ team/dvossel/test_api/include/asterisk/test.h Thu Dec 10 18:14:50 2009
@@ -21,8 +21,6 @@
  * \author David Vossel <dvossel at digium.com>
  * \brief Test Framework API
  */
-
-#define AST_TEST_FRAMEWORK //todohere move to a better place
 
 /* Macros used for for test API
 
@@ -63,7 +61,7 @@
 'test show results all' will show detailed results for ever executed test
 
 */
-#ifdef AST_TEST_FRAMEWORK
+#ifdef TEST_FRAMEWORK
 #define AST_TEST_DEFINE(hdr, body) int hdr(char *errbuf, int len); int hdr(char *errbuf, int len) body
 #define AST_TEST_REGISTER(name, cat, sum, des, cb) ast_test_register(name, cat, sum, des, cb)
 #define AST_TEST_UNREGISTER(cb) ast_test_unregister(cb)
@@ -74,7 +72,7 @@
 #endif
 
 
-#ifdef AST_TEST_FRAMEWORK
+#ifdef TEST_FRAMEWORK
 
 #include "asterisk/cli.h"
 

Modified: team/dvossel/test_api/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/test_api/main/asterisk.c?view=diff&rev=234369&r1=234368&r2=234369
==============================================================================
--- team/dvossel/test_api/main/asterisk.c (original)
+++ team/dvossel/test_api/main/asterisk.c Thu Dec 10 18:14:50 2009
@@ -3550,7 +3550,7 @@
 		exit(1);
 	}
 
-#ifdef AST_TEST_FRAMEWORK
+#ifdef TEST_FRAMEWORK
 	if (ast_test_init()) {
 		printf("%s", term_quit());
 		exit(1);

Modified: team/dvossel/test_api/main/test.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/test_api/main/test.c?view=diff&rev=234369&r1=234368&r2=234369
==============================================================================
--- team/dvossel/test_api/main/test.c (original)
+++ team/dvossel/test_api/main/test.c Thu Dec 10 18:14:50 2009
@@ -30,7 +30,7 @@
 
 #include "asterisk/test.h"
 
-#ifdef AST_TEST_FRAMEWORK
+#ifdef TEST_FRAMEWORK
 #include "asterisk/logger.h"
 #include "asterisk/linkedlists.h"
 #include "asterisk/utils.h"