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

diff --git a/bertos/cfg/test.h b/bertos/cfg/test.h
index 29791e5b..6f700e12 100644
--- a/bertos/cfg/test.h
+++ b/bertos/cfg/test.h
@@ -32,34 +32,37 @@
  *
  * \brief Utility for the test suite.
  *
- * \version $Id$
  *
  * \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:
- * 
+ *
+ * \code
  * int module_testSetup(void)
  * int module_testRun(void)
  * int module_testTearDown(void)
- * 
+ * \endcode
+ *
  * 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:
- * #include TEST_ONLY(whatuneed.h)
- * #include TEST_ONLY(whatuneed.c)
- * #include TEST_ONLY(...)
- * 
- * TEST_MAIN(module);
- * 
- * The macro TEST_ONLY expand to nothing in non-TEST mode or to
- * the specified filename if _TEST is defined.
+ * \code
+ * #if UNIT_TEST
+ *	#include <whatuneed.h>
+ *	#include <whatuneed.c>
+ *	#include <...>
+ *
+ *	TEST_MAIN(module);
+ * #endif
+ * \endcode
+ *
  * 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 +72,10 @@
 #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
@@ -86,19 +92,16 @@
 			return 3; \
 		return 0; \
 	}
+#else /* !TEST */
+	#define UNIT_TEST 0
 
-	/** This macro will include the specified file only in test-mode */
-	#define TEST_ONLY(file) PP_STRINGIZE(file)
-	
-#else /* !_TEST */
-
-	#define TEST_MAIN(module)  /* nothing */
-	#define TEST_ONLY(file)    <cfg/nothing.h>
+	#define TEST_MAIN(module) /* nothing */
+#endif /* TEST */
 
-#endif /* _TEST */
 
 /**
  * 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 +114,4 @@
  */
 #define SILENT_ASSERT(str) kputs("SILENT_ASSERT:$"str"$\n")
 
-
 #endif /* CFG_TEST_H */