git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10896 35acf78f-673a-0410-8e92-d51de3d6d3f4

4 files changed, 33 insertions, 29 deletions

diff --git a/tools/ftl/processors/unittest/test/test_root.c.ftl b/tools/ftl/processors/unittest/test/test_root.c.ftl
index 90f42cafc..47a84cff0 100755
--- a/tools/ftl/processors/unittest/test/test_root.c.ftl
+++ b/tools/ftl/processors/unittest/test/test_root.c.ftl
@@ -1,31 +1,32 @@
 [#ftl]

 [#import "/@ftllibs/libutils.ftl" as utils /]

-[#list conf.*.application.instances.instance as inst]

+[#list xml.*.application.instances.instance as inst]

   [#if inst.@id?string == "org.chibios.spc5.components.portable.chibios_unitary_tests_engine"]

     [#assign instance = inst /]

     [#break]

   [/#if]

 [/#list]

-[#assign prefix_lower = instance.global_data_and_code.code_prefix.value[0]?trim?lower_case /]

-[#assign prefix_upper = instance.global_data_and_code.code_prefix.value[0]?trim?upper_case /]

+[#assign conf = {"instance":instance} /]

+[#assign prefix_lower = conf.instance.global_data_and_code.code_prefix.value[0]?trim?lower_case /]

+[#assign prefix_upper = conf.instance.global_data_and_code.code_prefix.value[0]?trim?upper_case /]

 [@pp.dropOutputFile /]

 [@pp.changeOutputFile name=prefix_lower+"test_root.c" /]

-[@utils.EmitIndentedCCode "" 2 instance.description.copyright.value[0] /]

+[@utils.EmitIndentedCCode "" 2 conf.instance.description.copyright.value[0] /]

 

 /**

  * @mainpage Test Suite Specification

-[#if instance.description.introduction.value[0]?trim != ""]

+[#if conf.instance.description.introduction.value[0]?trim != ""]

 [@utils.FormatStringAsText " * "

                            " * "

-                           utils.WithDot(instance.description.introduction.value[0]?trim?cap_first)

+                           utils.WithDot(conf.instance.description.introduction.value[0]?trim?cap_first)

                            72 /]

 [#else]

  * No introduction.

 [/#if]

  *

  * <h2>Test Sequences</h2>

-[#if instance.sequences.sequence?size > 0]

-  [#list instance.sequences.sequence as sequence]

+[#if conf.instance.sequences.sequence?size > 0]

+  [#list conf.instance.sequences.sequence as sequence]

  * - @subpage ${prefix_lower}test_sequence_${(sequence_index + 1)?string("000")}

   [/#list]

  * .

@@ -52,7 +53,7 @@
  * @brief   Array of test sequences.

  */

 const testsequence_t * const ${prefix_lower}test_suite_array[] = {

-[#list instance.sequences.sequence as sequence]

+[#list conf.instance.sequences.sequence as sequence]

   [#if sequence.condition.value[0]?trim?length > 0]

 #if (${sequence.condition.value[0]}) || defined(__DOXYGEN__)

   [/#if]

@@ -68,7 +69,7 @@ const testsequence_t * const ${prefix_lower}test_suite_array[] = {
  * @brief   Test suite root structure.

  */

 const testsuite_t ${prefix_lower}test_suite = {

-  "${utils.WithDot(conf.*.application.description[0]?trim)}",

+  "${utils.WithoutDot(conf.instance.description.brief.value[0]?trim)}",

   ${prefix_lower}test_suite_array

 };

 

@@ -76,8 +77,8 @@ const testsuite_t ${prefix_lower}test_suite = {
 /* Shared code.                                                              */

 /*===========================================================================*/

 

-[#if instance.global_data_and_code.global_code.value[0]?trim?length > 0]

-[@utils.EmitIndentedCCode "" 2 instance.global_data_and_code.global_code.value[0] /]

+[#if conf.instance.global_data_and_code.global_code.value[0]?trim?length > 0]

+[@utils.EmitIndentedCCode "" 2 conf.instance.global_data_and_code.global_code.value[0] /]

 

 [/#if]

 #endif /* !defined(__DOXYGEN__) */

diff --git a/tools/ftl/processors/unittest/test/test_root.h.ftl b/tools/ftl/processors/unittest/test/test_root.h.ftl
index c3c8f3203..9bd01b646 100755
--- a/tools/ftl/processors/unittest/test/test_root.h.ftl
+++ b/tools/ftl/processors/unittest/test/test_root.h.ftl
@@ -1,16 +1,17 @@
 [#ftl]

 [#import "/@ftllibs/libutils.ftl" as utils /]

-[#list conf.*.application.instances.instance as inst]

+[#list xml.*.application.instances.instance as inst]

   [#if inst.@id?string == "org.chibios.spc5.components.portable.chibios_unitary_tests_engine"]

     [#assign instance = inst /]

     [#break]

   [/#if]

 [/#list]

-[#assign prefix_lower = instance.global_data_and_code.code_prefix.value[0]?trim?lower_case /]

-[#assign prefix_upper = instance.global_data_and_code.code_prefix.value[0]?trim?upper_case /]

+[#assign conf = {"instance":instance} /]

+[#assign prefix_lower = conf.instance.global_data_and_code.code_prefix.value[0]?trim?lower_case /]

+[#assign prefix_upper = conf.instance.global_data_and_code.code_prefix.value[0]?trim?upper_case /]

 [@pp.dropOutputFile /]

 [@pp.changeOutputFile name=prefix_lower+"test_root.h" /]

-[@utils.EmitIndentedCCode "" 2 instance.description.copyright.value[0] /]

+[@utils.EmitIndentedCCode "" 2 conf.instance.description.copyright.value[0] /]

 

 /**

  * @file    ${prefix_lower}test_root.h

@@ -22,7 +23,7 @@
 

 #include "ch_test.h"

 

-[#list instance.sequences.sequence as sequence]

+[#list conf.instance.sequences.sequence as sequence]

 #include "${prefix_lower}test_sequence_${(sequence_index + 1)?string("000")}.h"

 [/#list]

 

@@ -45,8 +46,8 @@ extern "C" {
 /* Shared definitions.                                                       */

 /*===========================================================================*/

 

-[#if instance.global_data_and_code.global_definitions.value[0]?trim?length > 0]

-[@utils.EmitIndentedCCode "" 2 instance.global_data_and_code.global_definitions.value[0] /]

+[#if conf.instance.global_data_and_code.global_definitions.value[0]?trim?length > 0]

+[@utils.EmitIndentedCCode "" 2 conf.instance.global_data_and_code.global_definitions.value[0] /]

 

 [/#if]

 #endif /* !defined(__DOXYGEN__) */

diff --git a/tools/ftl/processors/unittest/test/test_sequence.c.ftl b/tools/ftl/processors/unittest/test/test_sequence.c.ftl
index 4173b3e99..474eb1718 100755
--- a/tools/ftl/processors/unittest/test/test_sequence.c.ftl
+++ b/tools/ftl/processors/unittest/test/test_sequence.c.ftl
@@ -1,17 +1,18 @@
 [#ftl]

 [#import "/@ftllibs/libutils.ftl" as utils /]

 [@pp.dropOutputFile /]

-[#list conf.*.application.instances.instance as inst]

+[#list xml.*.application.instances.instance as inst]

   [#if inst.@id?string == "org.chibios.spc5.components.portable.chibios_unitary_tests_engine"]

     [#assign instance = inst /]

     [#break]

   [/#if]

 [/#list]

-[#assign prefix_lower = instance.global_data_and_code.code_prefix.value[0]?trim?lower_case /]

-[#assign prefix_upper = instance.global_data_and_code.code_prefix.value[0]?trim?upper_case /]

-[#list instance.sequences.sequence as sequence]

+[#assign conf = {"instance":instance} /]

+[#assign prefix_lower = conf.instance.global_data_and_code.code_prefix.value[0]?trim?lower_case /]

+[#assign prefix_upper = conf.instance.global_data_and_code.code_prefix.value[0]?trim?upper_case /]

+[#list conf.instance.sequences.sequence as sequence]

   [@pp.changeOutputFile name=prefix_lower+"test_sequence_" + (sequence_index + 1)?string("000") + ".c" /]

-[@utils.EmitIndentedCCode "" 2 instance.description.copyright.value[0] /]

+[@utils.EmitIndentedCCode "" 2 conf.instance.description.copyright.value[0] /]

 

 #include "hal.h"

 #include "${prefix_lower}test_root.h"

diff --git a/tools/ftl/processors/unittest/test/test_sequence.h.ftl b/tools/ftl/processors/unittest/test/test_sequence.h.ftl
index 7a5519402..a80dbbe6d 100755
--- a/tools/ftl/processors/unittest/test/test_sequence.h.ftl
+++ b/tools/ftl/processors/unittest/test/test_sequence.h.ftl
@@ -1,17 +1,18 @@
 [#ftl]

 [#import "/@ftllibs/libutils.ftl" as utils /]

 [@pp.dropOutputFile /]

-[#list conf.*.application.instances.instance as inst]

+[#list xml.*.application.instances.instance as inst]

   [#if inst.@id?string == "org.chibios.spc5.components.portable.chibios_unitary_tests_engine"]

     [#assign instance = inst /]

     [#break]

   [/#if]

 [/#list]

-[#assign prefix_lower = instance.global_data_and_code.code_prefix.value[0]?trim?lower_case /]

-[#assign prefix_upper = instance.global_data_and_code.code_prefix.value[0]?trim?upper_case /]

-[#list instance.sequences.sequence as sequence]

+[#assign conf = {"instance":instance} /]

+[#assign prefix_lower = conf.instance.global_data_and_code.code_prefix.value[0]?trim?lower_case /]

+[#assign prefix_upper =conf. instance.global_data_and_code.code_prefix.value[0]?trim?upper_case /]

+[#list conf.instance.sequences.sequence as sequence]

   [@pp.changeOutputFile name=prefix_lower+"test_sequence_" + (sequence_index + 1)?string("000") + ".h" /]

-[@utils.EmitIndentedCCode "" 2 instance.description.copyright.value[0] /]

+[@utils.EmitIndentedCCode "" 2 conf.instance.description.copyright.value[0] /]

 

 /**

  * @file    ${prefix_lower}test_sequence_${(sequence_index + 1)?string("000")}.h