diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-02-10 10:52:25 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-02-10 10:52:25 +0000 |
| commit | 5e65b9fce1697a5b1dfdd53c10baa6f2e2aeaf66 (patch) | |
| tree | 2d20bb1ecf6ba29a9054500900b0b2e26da8f002 /test/lib | |
| parent | c7abfb0b3c6820020f8b8a5de3721baf7e8fca0e (diff) | |
| download | ChibiOS-5e65b9fce1697a5b1dfdd53c10baa6f2e2aeaf66.tar.gz ChibiOS-5e65b9fce1697a5b1dfdd53c10baa6f2e2aeaf66.tar.bz2 ChibiOS-5e65b9fce1697a5b1dfdd53c10baa6f2e2aeaf66.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6691 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'test/lib')
| -rw-r--r-- | test/lib/ch_test.c | 5 | ||||
| -rw-r--r-- | test/lib/templates/test_root.c | 1 | ||||
| -rw-r--r-- | test/lib/templates/test_root.h | 10 |
3 files changed, 13 insertions, 3 deletions
diff --git a/test/lib/ch_test.c b/test/lib/ch_test.c index 9d6cb8d02..c8735ba5b 100644 --- a/test/lib/ch_test.c +++ b/test/lib/ch_test.c @@ -130,7 +130,8 @@ bool _test_assert_time_window(systime_t start, systime_t end,
const char *msg) {
- return _test_assert(osalVTIsSystemTimeWithin(start, end), msg);
+ return _test_assert(osalOsIsTimeWithinX(osalOsGetSystemTimeX(), start, end),
+ msg);
}
/**
@@ -256,7 +257,7 @@ msg_t test_execute(BaseSequentialStream *stream) { test_print(test_suite[i][j]->name);
test_println(")");
#if TEST_DELAY_BETWEEN_TESTS > 0
- osalThreadSleepMilliseconds(TEST_DELAY_BETWEEN_TESTS);
+ osalThreadSleep(OSAL_MS2ST(TEST_DELAY_BETWEEN_TESTS));
#endif
execute_test(test_suite[i][j]);
if (test_local_fail) {
diff --git a/test/lib/templates/test_root.c b/test/lib/templates/test_root.c index 8fb2ec9b9..47e8c67e4 100644 --- a/test/lib/templates/test_root.c +++ b/test/lib/templates/test_root.c @@ -34,6 +34,7 @@ * @brief Array of all the test sequences.
*/
const testcase_t * const *test_suite[] = {
+ test_sequence_000,
NULL
};
diff --git a/test/lib/templates/test_root.h b/test/lib/templates/test_root.h index 3d26ecd50..f32b386f8 100644 --- a/test/lib/templates/test_root.h +++ b/test/lib/templates/test_root.h @@ -25,7 +25,15 @@ #ifndef _TEST_ROOT_H_
#define _TEST_ROOT_H_
-#include "test_000.h"
+#include "test_sequence_000.h"
+
+/*===========================================================================*/
+/* Default definitions. */
+/*===========================================================================*/
+
+/* Global test suite name, it is printed on top of the test
+ report header.*/
+#define TEST_SUITE_NAME "Test Suite"
/*===========================================================================*/
/* External declarations. */
|