projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a bug found by Massimiliano Cialdi:
[bertos.git]
/
bertos
/
cfg
/
test.h
diff --git
a/bertos/cfg/test.h
b/bertos/cfg/test.h
index 29791e5b637acb8cc21710d27fb6412c344197a7..aacf7e15341b43226b865d74f785ac26aa552c9a 100644
(file)
--- a/
bertos/cfg/test.h
+++ b/
bertos/cfg/test.h
@@
-36,30
+36,34
@@
*
* \author Daniele Basile <asterix@develer.com>
* \author Francesco Sacchi <batt@develer.com>
*
* \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:
* 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)
* 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.
* 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:
* 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.
* 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:
* 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
+73,10
@@
#ifndef CFG_TEST_H
#define CFG_TEST_H
#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
/**
* Macro used to generate a main() for a test to be compiled
@@
-86,19
+93,16
@@
return 3; \
return 0; \
}
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.
/**
* 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
* 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
+115,4
@@
*/
#define SILENT_ASSERT(str) kputs("SILENT_ASSERT:$"str"$\n")
*/
#define SILENT_ASSERT(str) kputs("SILENT_ASSERT:$"str"$\n")
-
#endif /* CFG_TEST_H */
#endif /* CFG_TEST_H */