Drop the magical test macros.

[bertos.git] / bertos / cfg / test.h

diff --git a/bertos/cfg/test.h b/bertos/cfg/test.h
index 85c4d4276d93b7cbbb26cdb61c005e76a955acfa..374250269fa0a54c073bc10800c2e8dc78c32ebb 100644 (file)
--- a/bertos/cfg/test.h
+++ b/bertos/cfg/test.h
@@ -71,33 +71,29 @@
 #ifndef CFG_TEST_H
 #define CFG_TEST_H
 
-#if (ARCH & ARCH_UNITTEST)
+#include "cfg/cfg_arch.h"
 
-       /**
-        * Macro used to generate a main() for a test to be compiled
-        * on hosted platform.
-        */
-       #define TEST_MAIN(module) \
-       int main(void) \
-       { \
-               if (module##_testSetup() != 0) \
-                       return 1; \
-               if (module##_testRun() != 0) \
-                       return 2; \
-               if (module##_testTearDown() != 0) \
-                       return 3; \
-               return 0; \
-       }
+#if defined(ARCH_UNITTEST) && (ARCH & ARCH_UNITTEST)
+       #define UNIT_TEST 1
+#else /* !TEST */
+       #define UNIT_TEST 0
+#endif /* TEST */
 
-       /** 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>
-
-#endif /* _TEST */
+/**
+ * Macro used to generate a main() for a test to be compiled
+ * on hosted platform.
+ */
+#define TEST_MAIN(module) \
+int main(void) \
+{ \
+       if (module##_testSetup() != 0) \
+               return 1; \
+       if (module##_testRun() != 0) \
+               return 2; \
+       if (module##_testTearDown() != 0) \
+               return 3; \
+       return 0; \
+}
 
 /**
  * Silent an assert in a test.