From f748c684765dc2e32f87a33201fb78f7fa58eb2a Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 21 Oct 2017 17:44:06 +0000 Subject: [PATCH] More test improvements. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10867 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- ...-DISCOVERY (OpenOCD, Flash and Run).launch | 104 +++++++++--------- demos/STM32/RT-STM32F746G-DISCOVERY/main.c | 3 +- test/lib/ch_test.c | 31 ++++-- test/nil/source/test/nil_test_sequence_001.c | 2 +- test/nil/source/test/nil_test_sequence_002.c | 2 +- test/nil/source/test/nil_test_sequence_003.c | 2 +- test/nil/source/test/nil_test_sequence_004.c | 2 +- .../source/test/oslib_test_sequence_001.c | 2 +- .../source/test/oslib_test_sequence_002.c | 2 +- .../source/test/oslib_test_sequence_003.c | 2 +- test/rt/source/test/rt_test_sequence_001.c | 2 +- test/rt/source/test/rt_test_sequence_002.c | 2 +- test/rt/source/test/rt_test_sequence_003.c | 2 +- test/rt/source/test/rt_test_sequence_004.c | 2 +- test/rt/source/test/rt_test_sequence_005.c | 2 +- test/rt/source/test/rt_test_sequence_006.c | 2 +- test/rt/source/test/rt_test_sequence_007.c | 2 +- test/rt/source/test/rt_test_sequence_008.c | 2 +- test/rt/source/test/rt_test_sequence_009.c | 2 +- test/rt/source/test/rt_test_sequence_010.c | 2 +- .../unittest/test/test_sequence.c.ftl | 2 +- 21 files changed, 90 insertions(+), 84 deletions(-) diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/debug/RT-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32F746G-DISCOVERY/debug/RT-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch index 92f436493..620c606b2 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/debug/RT-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/debug/RT-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch @@ -1,52 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/main.c b/demos/STM32/RT-STM32F746G-DISCOVERY/main.c index fa7a26acd..5e87cdd5a 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/main.c @@ -53,8 +53,7 @@ int main(void) { /* * ARD_D13 is programmed as output (board LED). - */ - palClearLine(LINE_ARD_D13); + */ palClearLine(LINE_ARD_D13); palSetLineMode(LINE_ARD_D13, PAL_MODE_OUTPUT_PUSHPULL); /* diff --git a/test/lib/ch_test.c b/test/lib/ch_test.c index f922146a6..f4612e421 100644 --- a/test/lib/ch_test.c +++ b/test/lib/ch_test.c @@ -225,7 +225,7 @@ void test_emit_token_i(char token) { * @api */ msg_t test_execute(BaseSequentialStream *stream, const testsuite_t *tsp) { - int i, j; + int tseq, tcase; test_chp = stream; test_println(""); @@ -253,22 +253,28 @@ msg_t test_execute(BaseSequentialStream *stream, const testsuite_t *tsp) { test_println(""); test_global_fail = false; - i = 0; - while (tsp->sequences[i] != NULL) { - j = 0; - while (tsp->sequences[i]->cases[j] != NULL) { + tseq = 0; + while (tsp->sequences[tseq] != NULL) { + print_line(); + test_print("--- Test Sequence "); + test_printn(tseq + 1); + test_print(" ("); + test_print(tsp->sequences[tseq]->name); + test_println(")"); + tcase = 0; + while (tsp->sequences[tseq]->cases[tcase] != NULL) { print_line(); test_print("--- Test Case "); - test_printn(i + 1); + test_printn(tseq + 1); test_print("."); - test_printn(j + 1); + test_printn(tcase + 1); test_print(" ("); - test_print(tsp->sequences[i]->cases[j]->name); + test_print(tsp->sequences[tseq]->cases[tcase]->name); test_println(")"); #if TEST_DELAY_BETWEEN_TESTS > 0 osalThreadSleepMilliseconds(TEST_DELAY_BETWEEN_TESTS); #endif - execute_test(tsp->sequences[i]->cases[j]); + execute_test(tsp->sequences[tseq]->cases[tcase]); if (test_local_fail) { test_print("--- Result: FAILURE (#"); test_printn(test_step); @@ -278,11 +284,12 @@ msg_t test_execute(BaseSequentialStream *stream, const testsuite_t *tsp) { test_print(test_failure_message); test_println("\")"); } - else + else { test_println("--- Result: SUCCESS"); - j++; + } + tcase++; } - i++; + tseq++; } print_line(); test_println(""); diff --git a/test/nil/source/test/nil_test_sequence_001.c b/test/nil/source/test/nil_test_sequence_001.c index 1040700ef..c0bc22fdd 100644 --- a/test/nil/source/test/nil_test_sequence_001.c +++ b/test/nil/source/test/nil_test_sequence_001.c @@ -177,6 +177,6 @@ const testcase_t * const nil_test_sequence_001_array[] = { * @brief Information. */ const testsequence_t nil_test_sequence_001 = { - NULL, + "Information", nil_test_sequence_001_array }; diff --git a/test/nil/source/test/nil_test_sequence_002.c b/test/nil/source/test/nil_test_sequence_002.c index 26d511714..b9c5efedb 100644 --- a/test/nil/source/test/nil_test_sequence_002.c +++ b/test/nil/source/test/nil_test_sequence_002.c @@ -185,6 +185,6 @@ const testcase_t * const nil_test_sequence_002_array[] = { * @brief Threads Functionality. */ const testsequence_t nil_test_sequence_002 = { - NULL, + "Threads Functionality", nil_test_sequence_002_array }; diff --git a/test/nil/source/test/nil_test_sequence_003.c b/test/nil/source/test/nil_test_sequence_003.c index 6fe29ef46..d8ee6f2cb 100644 --- a/test/nil/source/test/nil_test_sequence_003.c +++ b/test/nil/source/test/nil_test_sequence_003.c @@ -259,7 +259,7 @@ const testcase_t * const nil_test_sequence_003_array[] = { * @brief Semaphores. */ const testsequence_t nil_test_sequence_003 = { - NULL, + "Semaphores", nil_test_sequence_003_array }; diff --git a/test/nil/source/test/nil_test_sequence_004.c b/test/nil/source/test/nil_test_sequence_004.c index 719a114e1..16e86897d 100644 --- a/test/nil/source/test/nil_test_sequence_004.c +++ b/test/nil/source/test/nil_test_sequence_004.c @@ -201,6 +201,6 @@ const testcase_t * const nil_test_sequence_004_array[] = { * @brief Suspend/Resume and Event Flags. */ const testsequence_t nil_test_sequence_004 = { - NULL, + "Suspend/Resume and Event Flags", nil_test_sequence_004_array }; diff --git a/test/oslib/source/test/oslib_test_sequence_001.c b/test/oslib/source/test/oslib_test_sequence_001.c index e03831c8d..74672a242 100644 --- a/test/oslib/source/test/oslib_test_sequence_001.c +++ b/test/oslib/source/test/oslib_test_sequence_001.c @@ -409,7 +409,7 @@ const testcase_t * const oslib_test_sequence_001_array[] = { * @brief Mailboxes. */ const testsequence_t oslib_test_sequence_001 = { - NULL, + "Mailboxes", oslib_test_sequence_001_array }; diff --git a/test/oslib/source/test/oslib_test_sequence_002.c b/test/oslib/source/test/oslib_test_sequence_002.c index 75c9d8a1d..bd661ce13 100644 --- a/test/oslib/source/test/oslib_test_sequence_002.c +++ b/test/oslib/source/test/oslib_test_sequence_002.c @@ -296,7 +296,7 @@ const testcase_t * const oslib_test_sequence_002_array[] = { * @brief Memory Pools. */ const testsequence_t oslib_test_sequence_002 = { - NULL, + "Memory Pools", oslib_test_sequence_002_array }; diff --git a/test/oslib/source/test/oslib_test_sequence_003.c b/test/oslib/source/test/oslib_test_sequence_003.c index 806cd2706..9f623e9db 100644 --- a/test/oslib/source/test/oslib_test_sequence_003.c +++ b/test/oslib/source/test/oslib_test_sequence_003.c @@ -273,7 +273,7 @@ const testcase_t * const oslib_test_sequence_003_array[] = { * @brief Memory Heaps. */ const testsequence_t oslib_test_sequence_003 = { - NULL, + "Memory Heaps", oslib_test_sequence_003_array }; diff --git a/test/rt/source/test/rt_test_sequence_001.c b/test/rt/source/test/rt_test_sequence_001.c index 4fe1c79e5..f5f726414 100644 --- a/test/rt/source/test/rt_test_sequence_001.c +++ b/test/rt/source/test/rt_test_sequence_001.c @@ -231,6 +231,6 @@ const testcase_t * const rt_test_sequence_001_array[] = { * @brief Information. */ const testsequence_t rt_test_sequence_001 = { - NULL, + "Information", rt_test_sequence_001_array }; diff --git a/test/rt/source/test/rt_test_sequence_002.c b/test/rt/source/test/rt_test_sequence_002.c index 22be5482d..35c3a079a 100644 --- a/test/rt/source/test/rt_test_sequence_002.c +++ b/test/rt/source/test/rt_test_sequence_002.c @@ -284,6 +284,6 @@ const testcase_t * const rt_test_sequence_002_array[] = { * @brief System layer and port interface. */ const testsequence_t rt_test_sequence_002 = { - NULL, + "System layer and port interface", rt_test_sequence_002_array }; diff --git a/test/rt/source/test/rt_test_sequence_003.c b/test/rt/source/test/rt_test_sequence_003.c index 5a9771d4f..3960e0047 100644 --- a/test/rt/source/test/rt_test_sequence_003.c +++ b/test/rt/source/test/rt_test_sequence_003.c @@ -346,6 +346,6 @@ const testcase_t * const rt_test_sequence_003_array[] = { * @brief Threads Functionality. */ const testsequence_t rt_test_sequence_003 = { - NULL, + "Threads Functionality", rt_test_sequence_003_array }; diff --git a/test/rt/source/test/rt_test_sequence_004.c b/test/rt/source/test/rt_test_sequence_004.c index 9793102e1..ede61bee7 100644 --- a/test/rt/source/test/rt_test_sequence_004.c +++ b/test/rt/source/test/rt_test_sequence_004.c @@ -132,6 +132,6 @@ const testcase_t * const rt_test_sequence_004_array[] = { * @brief Suspend/Resume. */ const testsequence_t rt_test_sequence_004 = { - NULL, + "Suspend/Resume", rt_test_sequence_004_array }; diff --git a/test/rt/source/test/rt_test_sequence_005.c b/test/rt/source/test/rt_test_sequence_005.c index 437bbaf87..151cfc882 100644 --- a/test/rt/source/test/rt_test_sequence_005.c +++ b/test/rt/source/test/rt_test_sequence_005.c @@ -509,7 +509,7 @@ const testcase_t * const rt_test_sequence_005_array[] = { * @brief Counter Semaphores. */ const testsequence_t rt_test_sequence_005 = { - NULL, + "Counter Semaphores", rt_test_sequence_005_array }; diff --git a/test/rt/source/test/rt_test_sequence_006.c b/test/rt/source/test/rt_test_sequence_006.c index 4b4ec262f..db6d1a73a 100644 --- a/test/rt/source/test/rt_test_sequence_006.c +++ b/test/rt/source/test/rt_test_sequence_006.c @@ -1071,7 +1071,7 @@ const testcase_t * const rt_test_sequence_006_array[] = { * @brief Mutexes, Condition Variables and Priority Inheritance. */ const testsequence_t rt_test_sequence_006 = { - NULL, + "Mutexes, Condition Variables and Priority Inheritance", rt_test_sequence_006_array }; diff --git a/test/rt/source/test/rt_test_sequence_007.c b/test/rt/source/test/rt_test_sequence_007.c index 3ceb82f5c..a313cb0e0 100644 --- a/test/rt/source/test/rt_test_sequence_007.c +++ b/test/rt/source/test/rt_test_sequence_007.c @@ -123,7 +123,7 @@ const testcase_t * const rt_test_sequence_007_array[] = { * @brief Synchronous Messages. */ const testsequence_t rt_test_sequence_007 = { - NULL, + "Synchronous Messages", rt_test_sequence_007_array }; diff --git a/test/rt/source/test/rt_test_sequence_008.c b/test/rt/source/test/rt_test_sequence_008.c index 3b23db132..8f7646ec7 100644 --- a/test/rt/source/test/rt_test_sequence_008.c +++ b/test/rt/source/test/rt_test_sequence_008.c @@ -573,7 +573,7 @@ const testcase_t * const rt_test_sequence_008_array[] = { * @brief Event Sources and Event Flags. */ const testsequence_t rt_test_sequence_008 = { - NULL, + "Event Sources and Event Flags", rt_test_sequence_008_array }; diff --git a/test/rt/source/test/rt_test_sequence_009.c b/test/rt/source/test/rt_test_sequence_009.c index 47843184e..f4a88d7b7 100644 --- a/test/rt/source/test/rt_test_sequence_009.c +++ b/test/rt/source/test/rt_test_sequence_009.c @@ -284,7 +284,7 @@ const testcase_t * const rt_test_sequence_009_array[] = { * @brief Dynamic threads. */ const testsequence_t rt_test_sequence_009 = { - NULL, + "Dynamic threads", rt_test_sequence_009_array }; diff --git a/test/rt/source/test/rt_test_sequence_010.c b/test/rt/source/test/rt_test_sequence_010.c index 54f8ef879..519e16de5 100644 --- a/test/rt/source/test/rt_test_sequence_010.c +++ b/test/rt/source/test/rt_test_sequence_010.c @@ -1033,6 +1033,6 @@ const testcase_t * const rt_test_sequence_010_array[] = { * @brief Benchmarks. */ const testsequence_t rt_test_sequence_010 = { - NULL, + "Benchmarks", rt_test_sequence_010_array }; diff --git a/tools/ftl/processors/unittest/test/test_sequence.c.ftl b/tools/ftl/processors/unittest/test/test_sequence.c.ftl index 85d3fc35f..4173b3e99 100755 --- a/tools/ftl/processors/unittest/test/test_sequence.c.ftl +++ b/tools/ftl/processors/unittest/test/test_sequence.c.ftl @@ -209,7 +209,7 @@ const testcase_t * const ${prefix_lower}test_sequence_${(sequence_index + 1)?str * @brief ${utils.WithDot(sequence.brief.value[0]?string)} */ const testsequence_t ${prefix_lower}test_sequence_${(sequence_index + 1)?string("000")} = { - NULL, + "${utils.WithoutDot(sequence.brief.value[0]?string)}", ${prefix_lower}test_sequence_${(sequence_index + 1)?string("000")}_array }; [#if sequence.condition.value[0]?trim?length > 0]