diff options
| -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 | ||||
| -rw-r--r-- | test/rt/test.mk | 1 | ||||
| -rw-r--r-- | test/rt/test_root.c | 45 | ||||
| -rw-r--r-- | test/rt/test_root.h | 57 |
6 files changed, 116 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. */
diff --git a/test/rt/test.mk b/test/rt/test.mk index 92dda7d81..6abe29dfe 100644 --- a/test/rt/test.mk +++ b/test/rt/test.mk @@ -1,5 +1,6 @@ # List of all the ChibiOS/RT test files.
TESTSRC = ${CHIBIOS}/test/lib/ch_test.c \
+ ${CHIBIOS}/test/rt/test_root.c \
${CHIBIOS}/test/rt/test_sequence_000.c
# Required include directories
diff --git a/test/rt/test_root.c b/test/rt/test_root.c new file mode 100644 index 000000000..47e8c67e4 --- /dev/null +++ b/test/rt/test_root.c @@ -0,0 +1,45 @@ +/*
+ ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+/**
+ * @file test_root.c
+ * @brief Test Suite root structures code.
+ *
+ * @addtogroup CH_TEST_ROOT
+ * @{
+ */
+
+#include "hal.h"
+#include "ch_test.h"
+#include "test_root.h"
+
+/*===========================================================================*/
+/* Module exported variables. */
+/*===========================================================================*/
+
+/**
+ * @brief Array of all the test sequences.
+ */
+const testcase_t * const *test_suite[] = {
+ test_sequence_000,
+ NULL
+};
+
+/*===========================================================================*/
+/* Shared code. */
+/*===========================================================================*/
+
+/** @} */
diff --git a/test/rt/test_root.h b/test/rt/test_root.h new file mode 100644 index 000000000..fb6fea873 --- /dev/null +++ b/test/rt/test_root.h @@ -0,0 +1,57 @@ +/*
+ ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+/**
+ * @file test_root.h
+ * @brief Test Suite root structures header.
+ *
+ * @addtogroup CH_TEST_ROOT
+ * @{
+ */
+
+#ifndef _TEST_ROOT_H_
+#define _TEST_ROOT_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 "ChibiOS/RT Test Suite"
+
+/*===========================================================================*/
+/* External declarations. */
+/*===========================================================================*/
+
+extern const testcase_t * const *test_suite[];
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+/*===========================================================================*/
+/* Shared definitions. */
+/*===========================================================================*/
+
+#endif /* _TEST_ROOT_H_ */
+
+/** @} */
|