X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcfg%2Ftest.h;h=b45515b044c1f110bd15fa7d76b9662b4183e777;hb=760437314c9e9af5fad596121de78c332129d2f5;hp=29791e5b637acb8cc21710d27fb6412c344197a7;hpb=4369b6a65d89b8b3fd81f5f724463bbc41e9d333;p=bertos.git

diff --git a/bertos/cfg/test.h b/bertos/cfg/test.h
index 29791e5b..b45515b0 100644
--- a/bertos/cfg/test.h
+++ b/bertos/cfg/test.h
@@ -36,30 +36,32 @@
  *
  * \author Daniele Basile <asterix@develer.com>
  * \author Francesco Sacchi <batt@develer.com>
- * 
+ *
  * When you want to test a module that is emulable on hosted
  * platforms, these macros come in handy.
  * Your module_test should supply three basic functions:
- * 
+ *
  * int module_testSetup(void)
  * int module_testRun(void)
  * int module_testTearDown(void)
- * 
+ *
  * All of these should return 0 if ok or a value != 0 on errors.
- * 
+ *
  * Then, at the end of your module_test you can write:
+ * \code
  * #include TEST_ONLY(whatuneed.h)
  * #include TEST_ONLY(whatuneed.c)
  * #include TEST_ONLY(...)
- * 
+ *
  * TEST_MAIN(module);
- * 
+ * \endcode
+ *
  * The macro TEST_ONLY expand to nothing in non-TEST mode or to
  * the specified filename if _TEST is defined.
  * Including directly into your module the file.c you need to
  * run the test allows you to build and run the test compiling
  * only one file.
- * 
+ *
  * To achieve this you also need a main() that is supplied by
  * the TEST_MAIN macro.
  * This will expand to a full main that calls, in sequence:
@@ -69,7 +71,11 @@
 #ifndef CFG_TEST_H
 #define CFG_TEST_H
 
-#ifdef _TEST
+#include "cfg/cfg_arch.h"
+
+#if defined(ARCH_UNITTEST) && (ARCH & ARCH_UNITTEST)
+
+	#define UNIT_TEST 1
 
 	/**
 	 * Macro used to generate a main() for a test to be compiled
@@ -89,8 +95,9 @@
 
 	/** This macro will include the specified file only in test-mode */
 	#define TEST_ONLY(file) PP_STRINGIZE(file)
-	
+
 #else /* !_TEST */
+	#define UNIT_TEST 0
 
 	#define TEST_MAIN(module)  /* nothing */
 	#define TEST_ONLY(file)    <cfg/nothing.h>
@@ -99,6 +106,7 @@
 
 /**
  * Silent an assert in a test.
+ *
  * This is useful when we run a test and we want to test
  * an error condition. We know that an assert will fail but
  * this is not really an error. To ignore that we mark it
@@ -111,5 +119,4 @@
  */
 #define SILENT_ASSERT(str) kputs("SILENT_ASSERT:$"str"$\n")
 
-
 #endif /* CFG_TEST_H */