From 1036f4a853e2c7775289e431a58653d73561e7cc Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sun, 10 Dec 2017 14:41:27 +0000 Subject: Test improvements. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11139 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- test/nil/configuration.xml | 158 +++++++++++++++++++-------- test/nil/source/test/nil_test_root.c | 18 --- test/nil/source/test/nil_test_root.h | 2 - test/nil/source/test/nil_test_sequence_001.c | 150 +++++++++++++++++++------ 4 files changed, 233 insertions(+), 95 deletions(-) (limited to 'test') diff --git a/test/nil/configuration.xml b/test/nil/configuration.xml index 3ed8e5892..45d5a9841 100644 --- a/test/nil/configuration.xml +++ b/test/nil/configuration.xml @@ -40,8 +40,6 @@ - + + + Port Info. + + + Port-related info are reported. + + + + + + + + + + + + + + + + + + + Prints the version string. + + + + + + + + + + Kernel Info. @@ -151,19 +196,19 @@ THD_FUNCTION(test_support, arg) { - @@ -200,52 +245,79 @@ test_println("");]]> - diff --git a/test/nil/source/test/nil_test_root.c b/test/nil/source/test/nil_test_root.c index a1590e012..22fb9f196 100644 --- a/test/nil/source/test/nil_test_root.c +++ b/test/nil/source/test/nil_test_root.c @@ -67,24 +67,6 @@ const testsuite_t nil_test_suite = { /* Shared code. */ /*===========================================================================*/ -void test_print_port_info(void) { - -#ifdef PORT_COMPILER_NAME - test_print("*** Compiler: "); - test_println(PORT_COMPILER_NAME); -#endif - test_print("*** Architecture: "); - test_println(PORT_ARCHITECTURE_NAME); -#ifdef PORT_CORE_VARIANT_NAME - test_print("*** Core Variant: "); - test_println(PORT_CORE_VARIANT_NAME); -#endif -#ifdef PORT_INFO - test_print("*** Port Info: "); - test_println(PORT_INFO); -#endif -} - semaphore_t gsem1, gsem2; thread_reference_t gtr1; diff --git a/test/nil/source/test/nil_test_root.h b/test/nil/source/test/nil_test_root.h index 1f523d5e4..967c2d477 100644 --- a/test/nil/source/test/nil_test_root.h +++ b/test/nil/source/test/nil_test_root.h @@ -50,8 +50,6 @@ extern "C" { #define TEST_SUITE_NAME "ChibiOS/NIL Test Suite" -#define TEST_REPORT_HOOK_HEADER test_print_port_info(); - extern semaphore_t gsem1, gsem2; extern thread_reference_t gtr1; extern THD_WORKING_AREA(wa_test_support, 128); diff --git a/test/nil/source/test/nil_test_sequence_001.c b/test/nil/source/test/nil_test_sequence_001.c index c0bc22fdd..d4a2f830a 100644 --- a/test/nil/source/test/nil_test_sequence_001.c +++ b/test/nil/source/test/nil_test_sequence_001.c @@ -32,6 +32,7 @@ *

Test Cases

* - @subpage nil_test_001_001 * - @subpage nil_test_001_002 + * - @subpage nil_test_001_003 * . */ @@ -46,10 +47,10 @@ ****************************************************************************/ /** - * @page nil_test_001_001 [1.1] Kernel Info + * @page nil_test_001_001 [1.1] Port Info * *

Description

- * The version numbers are reported. + * Port-related info are reported. * *

Test Steps

* - [1.1.1] Prints the version string. @@ -61,103 +62,187 @@ static void nil_test_001_001_execute(void) { /* [1.1.1] Prints the version string.*/ test_set_step(1); { - test_println("--- Product: ChibiOS/NIL"); - test_print("--- Stable Flag: "); +#if defined(PORT_ARCHITECTURE_NAME) + test_print("--- Architecture: "); + test_println(PORT_ARCHITECTURE_NAME); +#endif +#if defined(PORT_CORE_VARIANT_NAME) + test_print("--- Core Variant: "); + test_println(PORT_CORE_VARIANT_NAME); +#endif +#if defined(PORT_COMPILER_NAME) + test_print("--- Compiler: "); + test_println(PORT_COMPILER_NAME); +#endif +#if defined(PORT_INFO) + test_print("--- Port Info: "); + test_println(PORT_INFO); +#endif +#if defined(PORT_NATURAL_ALIGN) + test_print("--- Natural alignment: "); + test_printn(PORT_NATURAL_ALIGN); + test_println(""); +#endif +#if defined(PORT_STACK_ALIGN) + test_print("--- Stack alignment: "); + test_printn(PORT_STACK_ALIGN); + test_println(""); +#endif +#if defined(PORT_WORKING_AREA_ALIGN) + test_print("--- Working area alignment: "); + test_printn(PORT_WORKING_AREA_ALIGN); + test_println(""); +#endif + } +} + +static const testcase_t nil_test_001_001 = { + "Port Info", + NULL, + NULL, + nil_test_001_001_execute +}; + +/** + * @page nil_test_001_002 [1.2] Kernel Info + * + *

Description

+ * The version numbers are reported. + * + *

Test Steps

+ * - [1.2.1] Prints the version string. + * . + */ + +static void nil_test_001_002_execute(void) { + + /* [1.2.1] Prints the version string.*/ + test_set_step(1); + { + test_println("--- Product: ChibiOS/NIL"); + test_print("--- Stable Flag: "); test_printn(CH_KERNEL_STABLE); test_println(""); - test_print("--- Version String: "); + test_print("--- Version String: "); test_println(CH_KERNEL_VERSION); - test_print("--- Major Number: "); + test_print("--- Major Number: "); test_printn(CH_KERNEL_MAJOR); test_println(""); - test_print("--- Minor Number: "); + test_print("--- Minor Number: "); test_printn(CH_KERNEL_MINOR); test_println(""); - test_print("--- Patch Number: "); + test_print("--- Patch Number: "); test_printn(CH_KERNEL_PATCH); test_println(""); } } -static const testcase_t nil_test_001_001 = { +static const testcase_t nil_test_001_002 = { "Kernel Info", NULL, NULL, - nil_test_001_001_execute + nil_test_001_002_execute }; /** - * @page nil_test_001_002 [1.2] Kernel Settings + * @page nil_test_001_003 [1.3] Kernel Settings * *

Description

* The static kernel settings are reported. * *

Test Steps

- * - [1.2.1] Prints the configuration options settings. + * - [1.3.1] Prints the configuration options settings. * . */ -static void nil_test_001_002_execute(void) { +static void nil_test_001_003_execute(void) { - /* [1.2.1] Prints the configuration options settings.*/ + /* [1.3.1] Prints the configuration options settings.*/ test_set_step(1); { - test_print("--- CH_CFG_NUM_THREADS: "); + test_print("--- CH_CFG_NUM_THREADS: "); test_printn(CH_CFG_NUM_THREADS); test_println(""); - test_print("--- CH_CFG_ST_RESOLUTION: "); + test_print("--- CH_CFG_ST_RESOLUTION: "); test_printn(CH_CFG_ST_RESOLUTION); test_println(""); - test_print("--- CH_CFG_ST_FREQUENCY: "); + test_print("--- CH_CFG_ST_FREQUENCY: "); test_printn(CH_CFG_ST_FREQUENCY); test_println(""); - test_print("--- CH_CFG_ST_TIMEDELTA: "); + test_print("--- CH_CFG_ST_TIMEDELTA: "); test_printn(CH_CFG_ST_TIMEDELTA); test_println(""); - test_print("--- CH_CFG_USE_SEMAPHORES: "); + test_print("--- CH_CFG_USE_SEMAPHORES: "); test_printn(CH_CFG_USE_SEMAPHORES); test_println(""); - test_print("--- CH_CFG_USE_MUTEXES: "); + test_print("--- CH_CFG_USE_MUTEXES: "); test_printn(CH_CFG_USE_MUTEXES); test_println(""); - test_print("--- CH_CFG_USE_EVENTS: "); + test_print("--- CH_CFG_USE_EVENTS: "); test_printn(CH_CFG_USE_EVENTS); test_println(""); - test_print("--- CH_CFG_USE_MAILBOXES: "); + test_print("--- CH_CFG_USE_MAILBOXES: "); test_printn(CH_CFG_USE_MAILBOXES); test_println(""); - test_print("--- CH_CFG_USE_MEMCORE: "); + test_print("--- CH_CFG_USE_MEMCORE: "); test_printn(CH_CFG_USE_MEMCORE); test_println(""); - test_print("--- CH_CFG_USE_HEAP: "); + test_print("--- CH_CFG_USE_HEAP: "); test_printn(CH_CFG_USE_HEAP); test_println(""); - test_print("--- CH_CFG_USE_MEMPOOLS: "); + test_print("--- CH_CFG_USE_MEMPOOLS: "); test_printn(CH_CFG_USE_MEMPOOLS); test_println(""); - test_print("--- CH_DBG_STATISTICS: "); + test_print("--- CH_CFG_USE_OBJ_FIFOS: "); + test_printn(CH_CFG_USE_OBJ_FIFOS); + test_println(""); + test_print("--- CH_CFG_MEMCORE_SIZE: "); + test_printn(CH_CFG_MEMCORE_SIZE); + test_println(""); + test_print("--- CH_CFG_USE_FACTORY: "); + test_printn(CH_CFG_USE_FACTORY); + test_println(""); + test_print("--- CH_CFG_FACTORY_MAX_NAMES_LENGTH: "); + test_printn(CH_CFG_FACTORY_MAX_NAMES_LENGTH); + test_println(""); + test_print("--- CH_CFG_FACTORY_OBJECTS_REGISTRY: "); + test_printn(CH_CFG_FACTORY_OBJECTS_REGISTRY); + test_println(""); + test_print("--- CH_CFG_FACTORY_GENERIC_BUFFERS: "); + test_printn(CH_CFG_FACTORY_GENERIC_BUFFERS); + test_println(""); + test_print("--- CH_CFG_FACTORY_SEMAPHORES: "); + test_printn(CH_CFG_FACTORY_SEMAPHORES); + test_println(""); + test_print("--- CH_CFG_FACTORY_MAILBOXES: "); + test_printn(CH_CFG_FACTORY_MAILBOXES); + test_println(""); + test_print("--- CH_CFG_FACTORY_OBJ_FIFOS: "); + test_printn(CH_CFG_FACTORY_OBJ_FIFOS); + test_println(""); + test_print("--- CH_DBG_STATISTICS: "); test_printn(CH_DBG_STATISTICS); test_println(""); - test_print("--- CH_DBG_SYSTEM_STATE_CHECK: "); + test_print("--- CH_DBG_SYSTEM_STATE_CHECK: "); test_printn(CH_DBG_SYSTEM_STATE_CHECK); test_println(""); - test_print("--- CH_DBG_ENABLE_CHECKS: "); + test_print("--- CH_DBG_ENABLE_CHECKS: "); test_printn(CH_DBG_ENABLE_CHECKS); test_println(""); - test_print("--- CH_DBG_ENABLE_ASSERTS: "); + test_print("--- CH_DBG_ENABLE_ASSERTS: "); test_printn(CH_DBG_ENABLE_ASSERTS); test_println(""); - test_print("--- CH_DBG_ENABLE_STACK_CHECK: "); + test_print("--- CH_DBG_ENABLE_STACK_CHECK: "); test_printn(CH_DBG_ENABLE_STACK_CHECK); test_println(""); } } -static const testcase_t nil_test_001_002 = { +static const testcase_t nil_test_001_003 = { "Kernel Settings", NULL, NULL, - nil_test_001_002_execute + nil_test_001_003_execute }; /**************************************************************************** @@ -170,6 +255,7 @@ static const testcase_t nil_test_001_002 = { const testcase_t * const nil_test_sequence_001_array[] = { &nil_test_001_001, &nil_test_001_002, + &nil_test_001_003, NULL }; -- cgit v1.2.3