From b1d96f2491d100a0271944c688e9f7a58863acbf Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Fri, 15 May 2026 14:16:57 -0400 Subject: [PATCH] Work on yaml file reusability for other projects. Catch up a couple test details. --- test/Makefile | 2 +- test/rakefile_helper.rb | 3 +- test/targets/ansi.yml | 3 - test/targets/clang_file.yml | 3 - test/targets/clang_strict.yml | 3 - test/targets/gcc_32.yml | 3 - test/targets/gcc_64.yml | 3 - test/targets/gcc_auto_limits.yml | 3 - test/targets/gcc_auto_stdint.yml | 3 - test/targets/gcc_manual_math.yml | 3 - test/targets/hitech_picc18.yml | 4 +- test/targets/iar_arm_v4.yml | 40 ++++--------- test/targets/iar_arm_v5.yml | 37 ++++-------- test/targets/iar_arm_v5_3.yml | 37 ++++-------- test/targets/iar_armcortex_LM3S9B92_v5_4.yml | 37 ++++-------- test/targets/iar_cortexm3_v5.yml | 37 ++++-------- test/targets/iar_msp430.yml | 63 +++++--------------- test/targets/iar_sh2a_v6.yml | 40 ++++--------- test/tests/test_unity_core.c | 59 +++++++++--------- 19 files changed, 107 insertions(+), 276 deletions(-) diff --git a/test/Makefile b/test/Makefile index 35c2822..9b50740 100644 --- a/test/Makefile +++ b/test/Makefile @@ -15,7 +15,7 @@ CFLAGS += -Wno-unsafe-buffer-usage endif CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror #CFLAGS += -Wconversion #disabled because if falsely complains about the isinf and isnan macros -CFLAGS += -Wno-switch-enum -Wno-double-promotion +CFLAGS += -Wno-switch-enum -Wno-double-promotion -Wno-poison-system-directories -Wno-missing-noreturn CFLAGS += -Wno-covered-switch-default CFLAGS += -Wbad-function-cast -Wcast-qual -Wold-style-definition -Wshadow -Wstrict-overflow \ -Wstrict-prototypes -Wswitch-default -Wundef diff --git a/test/rakefile_helper.rb b/test/rakefile_helper.rb index 6149b8d..440db39 100644 --- a/test/rakefile_helper.rb +++ b/test/rakefile_helper.rb @@ -282,7 +282,7 @@ module RakefileHelpers runner_name = test_base + '_Runner.c' runner_path = File.join('build',runner_name) - options = $cfg[:unity] + options = $cfg[:unity] || {} options[:use_param_tests] = test =~ /parameterized/ ? true : false UnityTestRunnerGenerator.new(options).run(test, runner_path) obj_list << compile(runner_path, test_defines) @@ -360,6 +360,7 @@ module RakefileHelpers end def run_make_tests() + report "\nRunning Unity Examples with Make" [ "make -s", # test with all defaults #"make -s DEBUG=-m32", # test 32-bit architecture with 64-bit support #"make -s DEBUG=-m32 UNITY_SUPPORT_64=", # test 32-bit build without 64-bit types diff --git a/test/targets/ansi.yml b/test/targets/ansi.yml index c09642f..c269cb5 100644 --- a/test/targets/ansi.yml +++ b/test/targets/ansi.yml @@ -6,9 +6,6 @@ # ========================================================================= --- -colour: true -:unity: - :plugins: [] :skip_tests: - :parameterized :tools: diff --git a/test/targets/clang_file.yml b/test/targets/clang_file.yml index 1c4ed53..1144f04 100644 --- a/test/targets/clang_file.yml +++ b/test/targets/clang_file.yml @@ -6,9 +6,6 @@ # ========================================================================= --- -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler diff --git a/test/targets/clang_strict.yml b/test/targets/clang_strict.yml index 1101735..02fcee5 100644 --- a/test/targets/clang_strict.yml +++ b/test/targets/clang_strict.yml @@ -6,9 +6,6 @@ # ========================================================================= --- -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler diff --git a/test/targets/gcc_32.yml b/test/targets/gcc_32.yml index 5a17b30..4706033 100644 --- a/test/targets/gcc_32.yml +++ b/test/targets/gcc_32.yml @@ -6,9 +6,6 @@ # ========================================================================= --- -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler diff --git a/test/targets/gcc_64.yml b/test/targets/gcc_64.yml index 104cf7d..9463825 100644 --- a/test/targets/gcc_64.yml +++ b/test/targets/gcc_64.yml @@ -6,9 +6,6 @@ # ========================================================================= --- -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler diff --git a/test/targets/gcc_auto_limits.yml b/test/targets/gcc_auto_limits.yml index 3da6922..009c97a 100644 --- a/test/targets/gcc_auto_limits.yml +++ b/test/targets/gcc_auto_limits.yml @@ -6,9 +6,6 @@ # ========================================================================= --- -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler diff --git a/test/targets/gcc_auto_stdint.yml b/test/targets/gcc_auto_stdint.yml index 9697ff7..5294f3f 100644 --- a/test/targets/gcc_auto_stdint.yml +++ b/test/targets/gcc_auto_stdint.yml @@ -6,9 +6,6 @@ # ========================================================================= --- -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler diff --git a/test/targets/gcc_manual_math.yml b/test/targets/gcc_manual_math.yml index 0524f72..40374b4 100644 --- a/test/targets/gcc_manual_math.yml +++ b/test/targets/gcc_manual_math.yml @@ -6,9 +6,6 @@ # ========================================================================= --- -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler diff --git a/test/targets/hitech_picc18.yml b/test/targets/hitech_picc18.yml index 8dc9129..3921a96 100644 --- a/test/targets/hitech_picc18.yml +++ b/test/targets/hitech_picc18.yml @@ -16,7 +16,6 @@ else _PASSED_TESTS(); return 0; -colour: true :tools: :test_compiler: :name: compiler @@ -72,8 +71,7 @@ colour: true :name: simulator :executable: 'java -client -jar ' :arguments: - - - C:\Program Files\HI-TECH Software\HI-TIDE\3.15\lib\ - - simpic18.jar + - \C:\Program Files\HI-TECH Software\HI-TIDE\3.15\lib\simpic18.jar - 18F87J10 - "${1}" :extension: diff --git a/test/targets/iar_arm_v4.yml b/test/targets/iar_arm_v4.yml index 74d137d..e6a034d 100644 --- a/test/targets/iar_arm_v4.yml +++ b/test/targets/iar_arm_v4.yml @@ -6,20 +6,13 @@ # ========================================================================= --- -tools_root: C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - - arm\bin\iccarm.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\bin\iccarm.exe :arguments: - "--dlib_config" - - - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - - arm\lib\dl4tptinl8n.h + - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\lib\dl4tptinl8n.h - "-z3" - "--no_cse" - "--no_unroll" @@ -46,14 +39,11 @@ colour: true - "-o ${2}" :test_linker: :name: linker - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - - common\bin\xlink.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\common\bin\xlink.exe :arguments: - "${1}" - "-rt" - - - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - - arm\lib\dl4tptinl8n.r79 + - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\lib\dl4tptinl8n.r79 - "-D_L_EXTMEM_START=0" - "-D_L_EXTMEM_SIZE=0" - "-D_L_HEAP_SIZE=120" @@ -62,29 +52,22 @@ colour: true - "-s" - __program_start - "-f" - - - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - - "\\arm\\config\\lnkarm.xcl" + - "C:\\Program Files\\IAR Systems\\Embedded Workbench 4.0 Kickstart\\arm\\config\\lnkarm.xcl" - "-o ${2}" :test_fixture: :name: simulator - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - - common\bin\CSpyBat.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\common\bin\CSpyBat.exe :arguments: - "--silent" - - - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - - arm\bin\armproc.dll - - - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - - arm\bin\armsim.dll + - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\bin\armproc.dll + - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\bin\armsim.dll - "${1}" - "--plugin" - - - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - - arm\bin\armbat.dll + - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\bin\armbat.dll - "--backend" - "-B" - "-p" - - - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - - arm\config\ioat91sam7X256.ddf + - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\config\ioat91sam7X256.ddf - "-d" - sim :extension: @@ -92,8 +75,7 @@ colour: true :executable: ".d79" :paths: :test: - - - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - - arm\inc\ + - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\inc\ - src\ - "..\\src\\" - testdata/ diff --git a/test/targets/iar_arm_v5.yml b/test/targets/iar_arm_v5.yml index cd0930d..6930df0 100644 --- a/test/targets/iar_arm_v5.yml +++ b/test/targets/iar_arm_v5.yml @@ -6,20 +6,13 @@ # ========================================================================= --- -tools_root: C:\Program Files\IAR Systems\Embedded Workbench 5.3\ -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\bin\iccarm.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\iccarm.exe :arguments: - "--dlib_config" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\inc\DLib_Config_Normal.h + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\inc\DLib_Config_Normal.h - "--no_cse" - "--no_unroll" - "--no_inline" @@ -45,9 +38,7 @@ colour: true - "-o ${2}" :test_linker: :name: linker - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\bin\ilinkarm.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\ilinkarm.exe :arguments: - "${1}" - "--redirect _Printf=_PrintfLarge" @@ -55,29 +46,22 @@ colour: true - "--semihosting" - "--entry __iar_program_start" - "--config" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\config\generic.icf + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\config\generic.icf - "-o ${2}" :test_fixture: :name: simulator - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - common\bin\CSpyBat.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3\common\bin\CSpyBat.exe :arguments: - "--silent" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\bin\armproc.dll - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\bin\armsim.dll + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\armproc.dll + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\armsim.dll - "${1}" - "--plugin" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\bin\armbat.dll + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\armbat.dll - "--backend" - "-B" - "-p" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\config\debugger\atmel\ioat91sam7X256.ddf + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\config\debugger\atmel\ioat91sam7X256.ddf - "-d" - sim :extension: @@ -85,8 +69,7 @@ colour: true :executable: ".out" :paths: :test: - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\inc\ + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\inc\ - src\ - "..\\src\\" - testdata/ diff --git a/test/targets/iar_arm_v5_3.yml b/test/targets/iar_arm_v5_3.yml index cd0930d..6930df0 100644 --- a/test/targets/iar_arm_v5_3.yml +++ b/test/targets/iar_arm_v5_3.yml @@ -6,20 +6,13 @@ # ========================================================================= --- -tools_root: C:\Program Files\IAR Systems\Embedded Workbench 5.3\ -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\bin\iccarm.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\iccarm.exe :arguments: - "--dlib_config" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\inc\DLib_Config_Normal.h + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\inc\DLib_Config_Normal.h - "--no_cse" - "--no_unroll" - "--no_inline" @@ -45,9 +38,7 @@ colour: true - "-o ${2}" :test_linker: :name: linker - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\bin\ilinkarm.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\ilinkarm.exe :arguments: - "${1}" - "--redirect _Printf=_PrintfLarge" @@ -55,29 +46,22 @@ colour: true - "--semihosting" - "--entry __iar_program_start" - "--config" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\config\generic.icf + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\config\generic.icf - "-o ${2}" :test_fixture: :name: simulator - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - common\bin\CSpyBat.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3\common\bin\CSpyBat.exe :arguments: - "--silent" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\bin\armproc.dll - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\bin\armsim.dll + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\armproc.dll + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\armsim.dll - "${1}" - "--plugin" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\bin\armbat.dll + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\armbat.dll - "--backend" - "-B" - "-p" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\config\debugger\atmel\ioat91sam7X256.ddf + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\config\debugger\atmel\ioat91sam7X256.ddf - "-d" - sim :extension: @@ -85,8 +69,7 @@ colour: true :executable: ".out" :paths: :test: - - - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - - arm\inc\ + - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\inc\ - src\ - "..\\src\\" - testdata/ diff --git a/test/targets/iar_armcortex_LM3S9B92_v5_4.yml b/test/targets/iar_armcortex_LM3S9B92_v5_4.yml index 1fc07c6..fec13b7 100644 --- a/test/targets/iar_armcortex_LM3S9B92_v5_4.yml +++ b/test/targets/iar_armcortex_LM3S9B92_v5_4.yml @@ -6,16 +6,10 @@ # ========================================================================= --- -tools_root: C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler - :executable: - - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - - arm\bin\iccarm.exe + :executable: C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\bin\iccarm.exe :arguments: - "--diag_suppress=Pa050" - "--debug" @@ -25,8 +19,7 @@ colour: true - "-e" - "--fpu=None" - "--dlib_config" - - - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - - arm\inc\DLib_Config_Normal.h + - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\inc\DLib_Config_Normal.h - "--interwork" - "--warnings_are_errors" - "-Oh" @@ -37,9 +30,7 @@ colour: true - "-o ${2}" :test_linker: :name: linker - :executable: - - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - - arm\bin\ilinkarm.exe + :executable: C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\bin\ilinkarm.exe :arguments: - "${1}" - "--redirect _Printf=_PrintfLarge" @@ -47,31 +38,24 @@ colour: true - "--semihosting" - "--entry __iar_program_start" - "--config" - - - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - - arm\config\generic.icf + - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\config\generic.icf - "-o ${2}" :test_fixture: :name: simulator - :executable: - - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - - common\bin\CSpyBat.exe + :executable: C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\common\bin\CSpyBat.exe :arguments: - - - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - - arm\bin\armproc.dll - - - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - - arm\bin\armsim2.dll + - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\bin\armproc.dll + - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\bin\armsim2.dll - "${1}" - "--plugin" - - - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - - arm\bin\armbat.dll + - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\bin\armbat.dll - "--backend" - "-B" - "--endian=little" - "--cpu=Cortex-M3" - "--fpu=None" - "-p" - - - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - - arm\config\debugger\TexasInstruments\iolm3sxxxx.ddf + - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\config\debugger\TexasInstruments\iolm3sxxxx.ddf - "--semihosting" - "--device=LM3SxBxx" :extension: @@ -79,8 +63,7 @@ colour: true :executable: ".out" :paths: :test: - - - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - - arm\inc\ + - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\inc\ - src\ - "..\\src\\" - testdata/ diff --git a/test/targets/iar_cortexm3_v5.yml b/test/targets/iar_cortexm3_v5.yml index c5d6ad2..de04705 100644 --- a/test/targets/iar_cortexm3_v5.yml +++ b/test/targets/iar_cortexm3_v5.yml @@ -6,20 +6,13 @@ # ========================================================================= --- -tools_root: C:\Program Files\IAR Systems\Embedded Workbench 5.4\ -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - - arm\bin\iccarm.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\bin\iccarm.exe :arguments: - "--dlib_config" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - - arm\inc\DLib_Config_Normal.h + - C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\inc\DLib_Config_Normal.h - "--no_cse" - "--no_unroll" - "--no_inline" @@ -45,9 +38,7 @@ colour: true - "-o ${2}" :test_linker: :name: linker - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - - arm\bin\ilinkarm.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\bin\ilinkarm.exe :arguments: - "${1}" - "--redirect _Printf=_PrintfLarge" @@ -55,29 +46,22 @@ colour: true - "--semihosting" - "--entry __iar_program_start" - "--config" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - - arm\config\generic_cortex.icf + - C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\config\generic_cortex.icf - "-o ${2}" :test_fixture: :name: simulator - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - - common\bin\CSpyBat.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.4\common\bin\CSpyBat.exe :arguments: - "--silent" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - - arm\bin\armproc.dll - - - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - - arm\bin\armsim.dll + - C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\bin\armproc.dll + - C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\bin\armsim.dll - "${1}" - "--plugin" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - - arm\bin\armbat.dll + - C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\bin\armbat.dll - "--backend" - "-B" - "-p" - - - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - - arm\config\debugger\ST\iostm32f107xx.ddf + - C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\config\debugger\ST\iostm32f107xx.ddf - "--cpu=Cortex-M3" - "-d" - sim @@ -86,8 +70,7 @@ colour: true :executable: ".out" :paths: :test: - - - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - - arm\inc\ + - C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\inc\ - src\ - "..\\src\\" - testdata/ diff --git a/test/targets/iar_msp430.yml b/test/targets/iar_msp430.yml index de89245..57948db 100644 --- a/test/targets/iar_msp430.yml +++ b/test/targets/iar_msp430.yml @@ -6,35 +6,13 @@ # ========================================================================= --- -tools_root: C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\ -core_root: &1 -- C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\ -- 430\ -core_bin: &2 -- *1 -- bin\ -core_config: &4 -- *1 -- config\ -core_lib: &3 -- *1 -- lib\ -core_inc: &5 -- *1 -- inc\ -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler - :executable: - - *2 - - icc430.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\bin\icc430.exe :arguments: - "--dlib_config" - - - *3 - - dlib\dl430fn.h + - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\lib\dlib\dl430fn.h - "--no_cse" - "--no_unroll" - "--no_inline" @@ -54,14 +32,11 @@ colour: true - "-o ${2}" :test_linker: :name: linker - :executable: - - *2 - - xlink.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\bin\xlink.exe :arguments: - "${1}" - "-rt" - - - *3 - - dlib\dl430fn.r43 + - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\lib\dlib\dl430fn.r43 - "-e_PrintfTiny=_Printf" - "-e_ScanfSmall=_Scanf" - "-s __program_start" @@ -69,43 +44,33 @@ colour: true - "-D_DATA16_HEAP_SIZE=50" - "-D_DATA20_HEAP_SIZE=50" - "-f" - - - *4 - - lnk430f5438.xcl + - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\config\lnk430f5438.xcl - "-f" - - - *4 - - multiplier.xcl + - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\config\multiplier.xcl - "-o ${2}" :test_fixture: :name: simulator - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\ - - common\bin\CSpyBat.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\common\bin\CSpyBat.exe :arguments: - "--silent" - - - *2 - - 430proc.dll - - - *2 - - 430sim.dll + - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\bin\430proc.dll + - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\bin\430sim.dll - "${1}" - "--plugin" - - - *2 - - 430bat.dll + - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\bin\430bat.dll - "--backend -B" - "--cpu MSP430F5438" - "-p" - - - *4 - - MSP430F5438.ddf + - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\config\MSP430F5438.ddf - "-d sim" :extension: :object: ".r43" :executable: ".d79" :paths: :test: - - *5 - - - *5 - - dlib - - - *3 - - dlib + - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\inc\ + - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\inc\dlib + - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\lib\dlib - src\ - "../src/" - testdata/ diff --git a/test/targets/iar_sh2a_v6.yml b/test/targets/iar_sh2a_v6.yml index 8e5ded4..4de1c7c 100644 --- a/test/targets/iar_sh2a_v6.yml +++ b/test/targets/iar_sh2a_v6.yml @@ -6,16 +6,10 @@ # ========================================================================= --- -tools_root: C:\Program Files\IAR Systems\Embedded Workbench 6.0\ -colour: true -:unity: - :plugins: [] :tools: :test_compiler: :name: compiler - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - - sh\bin\iccsh.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\bin\iccsh.exe :arguments: - "-e" - "--char_is_signed" @@ -29,8 +23,7 @@ colour: true - "--no_clustering" - "--debug" - "--dlib_config" - - - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - - sh\inc\DLib_Product.h + - "C:\\Program Files\\IAR Systems\\Embedded Workbench 6.0\\sh\\inc\\DLib_Product.h" - "--double=32" - "--code_model=huge" - "--data_model=huge" @@ -47,16 +40,13 @@ colour: true - "-o ${2}" :test_linker: :name: linker - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - - sh\bin\ilinksh.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\bin\ilinksh.exe :arguments: - "${1}" - "--redirect __Printf=__PrintfSmall" - "--redirect __Scanf=__ScanfSmall" - "--config" - - - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - - sh\config\generic.icf + - C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\config\generic.icf - "--config_def _CSTACK_SIZE=0x800" - "--config_def _HEAP_SIZE=0x800" - "--config_def _INT_TABLE=0x10" @@ -65,25 +55,19 @@ colour: true - "-o ${2}" :test_fixture: :name: simulator - :executable: - - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - - common\bin\CSpyBat.exe + :executable: C:\Program Files\IAR Systems\Embedded Workbench 6.0\common\bin\CSpyBat.exe :arguments: - "--silent" - - - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - - sh\bin\shproc.dll - - - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - - sh\bin\shsim.dll + - C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\bin\shproc.dll + - C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\bin\shsim.dll - "${1}" - "--plugin" - - - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - - sh\bin\shbat.dll + - C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\bin\shbat.dll - "--backend" - "-B" - "--core sh2afpu" - "-p" - - - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - - sh\config\debugger\io7264.ddf + - C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\config\debugger\io7264.ddf - "-d" - sim :extension: @@ -91,10 +75,8 @@ colour: true :executable: ".out" :paths: :test: - - - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - - sh\inc\ - - - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - - sh\inc\c + - C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\inc\ + - C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\inc\c - src\ - "..\\src\\" - testdata/ diff --git a/test/tests/test_unity_core.c b/test/tests/test_unity_core.c index dc3a1bf..039600c 100644 --- a/test/tests/test_unity_core.c +++ b/test/tests/test_unity_core.c @@ -44,44 +44,39 @@ void testUnitySizeInitializationReminder(void) "still correct."; /* Define a structure with all the same fields as `struct UNITY_STORAGE_T`. */ -#ifdef UNITY_EXCLUDE_DETAILS - struct { - const char* TestFile; - const char* CurrentTestName; - UNITY_LINE_TYPE CurrentTestLineNumber; - UNITY_COUNTER_TYPE NumberOfTests; - UNITY_COUNTER_TYPE TestFailures; - UNITY_COUNTER_TYPE TestIgnores; - UNITY_COUNTER_TYPE CurrentTestFailed; - UNITY_COUNTER_TYPE CurrentTestIgnored; -#ifdef UNITY_INCLUDE_EXEC_TIME - UNITY_TIME_TYPE CurrentTestStartTime; - UNITY_TIME_TYPE CurrentTestStopTime; +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpadded" #endif -#ifndef UNITY_EXCLUDE_SETJMP_H - jmp_buf AbortFrame; -#endif - } Expected_Unity; +struct { + const char* TestFile; + const char* CurrentTestName; +#ifndef UNITY_EXCLUDE_DETAILS +#ifdef UNITY_DETAIL_STACK_SIZE + UNITY_DETAIL_LABEL_TYPE CurrentDetailStackLabels[UNITY_DETAIL_STACK_SIZE]; + UNITY_DETAIL_VALUE_TYPE CurrentDetailStackValues[UNITY_DETAIL_STACK_SIZE]; + UNITY_COUNTER_TYPE CurrentDetailStackSize; #else - struct { - const char* TestFile; - const char* CurrentTestName; - const char* CurrentDetails1; - const char* CurrentDetails2; - UNITY_LINE_TYPE CurrentTestLineNumber; - UNITY_COUNTER_TYPE NumberOfTests; - UNITY_COUNTER_TYPE TestFailures; - UNITY_COUNTER_TYPE TestIgnores; - UNITY_COUNTER_TYPE CurrentTestFailed; - UNITY_COUNTER_TYPE CurrentTestIgnored; + const char* CurrentDetail1; + const char* CurrentDetail2; +#endif +#endif + UNITY_LINE_TYPE CurrentTestLineNumber; + UNITY_COUNTER_TYPE NumberOfTests; + UNITY_COUNTER_TYPE TestFailures; + UNITY_COUNTER_TYPE TestIgnores; + UNITY_COUNTER_TYPE CurrentTestFailed; + UNITY_COUNTER_TYPE CurrentTestIgnored; #ifdef UNITY_INCLUDE_EXEC_TIME - UNITY_COUNTER_TYPE CurrentTestStartTime; - UNITY_COUNTER_TYPE CurrentTestStopTime; + UNITY_TIME_TYPE CurrentTestStartTime; + UNITY_TIME_TYPE CurrentTestStopTime; #endif #ifndef UNITY_EXCLUDE_SETJMP_H - jmp_buf AbortFrame; + jmp_buf AbortFrame; #endif - } Expected_Unity; +} Expected_Unity; +#if defined(__GNUC__) || defined(__clang__) +#pragma GCC diagnostic pop #endif /* Compare our fake structure's size to the actual structure's size. They