X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcfg%2Ftest.h;h=6f700e1239de427bdbf08aa7abab177906303950;hb=b9e1e52093d33494bf4a8ca27c14a56a25b6e0bc;hp=a05db372fb6e0cab0a41cac86dc82e6f3440fe22;hpb=bad932366898b7153f2cba75c06cec2d86f35fe1;p=bertos.git

diff --git a/bertos/cfg/test.h b/bertos/cfg/test.h
index a05db372..6f700e12 100644
--- a/bertos/cfg/test.h
+++ b/bertos/cfg/test.h
@@ -32,7 +32,6 @@
  *
  * \brief Utility for the test suite.
  *
- * \version $Id$
  *
  * \author Daniele Basile <asterix@develer.com>
  * \author Francesco Sacchi <batt@develer.com>
@@ -41,23 +40,25 @@
  * 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:
  * \code
- * #include TEST_ONLY(whatuneed.h)
- * #include TEST_ONLY(whatuneed.c)
- * #include TEST_ONLY(...)
+ * #if UNIT_TEST
+ *	#include <whatuneed.h>
+ *	#include <whatuneed.c>
+ *	#include <...>
  *
- * TEST_MAIN(module);
+ *	TEST_MAIN(module);
+ * #endif
  * \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.
@@ -71,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
@@ -88,16 +92,12 @@
 			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.