ThrowTheSwitch/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-08-20 10:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Work on yaml file reusability for other projects.

Browse Source 
Catch up a couple test details.
This commit is contained in:
Mark VanderVoord
2026-05-15 14:16:57 -04:00
parent 6502a671d3
commit b1d96f2491
19 changed files with 107 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Makefile
+1 -1
View File
@@ -15,7 +15,7 @@ CFLAGS += -Wno-unsafe-buffer-usage
endif endif
CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror
#CFLAGS += -Wconversion #disabled because if falsely complains about the isinf and isnan macros #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 += -Wno-covered-switch-default
CFLAGS += -Wbad-function-cast -Wcast-qual -Wold-style-definition -Wshadow -Wstrict-overflow \ CFLAGS += -Wbad-function-cast -Wcast-qual -Wold-style-definition -Wshadow -Wstrict-overflow \
-Wstrict-prototypes -Wswitch-default -Wundef -Wstrict-prototypes -Wswitch-default -Wundef
test/rakefile_helper.rb
+2 -1
View File
@@ -282,7 +282,7 @@ module RakefileHelpers
runner_name = test_base + '_Runner.c' runner_name = test_base + '_Runner.c'
runner_path = File.join('build',runner_name) runner_path = File.join('build',runner_name)
options = $cfg[:unity] options = $cfg[:unity] || {}
options[:use_param_tests] = test =~ /parameterized/ ? true : false options[:use_param_tests] = test =~ /parameterized/ ? true : false
UnityTestRunnerGenerator.new(options).run(test, runner_path) UnityTestRunnerGenerator.new(options).run(test, runner_path)
obj_list << compile(runner_path, test_defines) obj_list << compile(runner_path, test_defines)
@@ -360,6 +360,7 @@ module RakefileHelpers
end end
def run_make_tests() def run_make_tests()
report "\nRunning Unity Examples with Make"
[ "make -s", # test with all defaults [ "make -s", # test with all defaults
#"make -s DEBUG=-m32", # test 32-bit architecture with 64-bit support #"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 #"make -s DEBUG=-m32 UNITY_SUPPORT_64=", # test 32-bit build without 64-bit types
test/targets/ansi.yml
-3
View File
@@ -6,9 +6,6 @@
# ========================================================================= # =========================================================================
--- ---
colour: true
:unity:
:plugins: []
:skip_tests: :skip_tests:
- :parameterized - :parameterized
:tools: :tools:
test/targets/clang_file.yml
-3
View File
@@ -6,9 +6,6 @@
# ========================================================================= # =========================================================================
--- ---
colour: true
:unity:
:plugins: []
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
test/targets/clang_strict.yml
-3
View File
@@ -6,9 +6,6 @@
# ========================================================================= # =========================================================================
--- ---
colour: true
:unity:
:plugins: []
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
test/targets/gcc_32.yml
-3
View File
@@ -6,9 +6,6 @@
# ========================================================================= # =========================================================================
--- ---
colour: true
:unity:
:plugins: []
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
test/targets/gcc_64.yml
-3
View File
@@ -6,9 +6,6 @@
# ========================================================================= # =========================================================================
--- ---
colour: true
:unity:
:plugins: []
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
test/targets/gcc_auto_limits.yml
-3
View File
@@ -6,9 +6,6 @@
# ========================================================================= # =========================================================================
--- ---
colour: true
:unity:
:plugins: []
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
test/targets/gcc_auto_stdint.yml
-3
View File
@@ -6,9 +6,6 @@
# ========================================================================= # =========================================================================
--- ---
colour: true
:unity:
:plugins: []
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
test/targets/gcc_manual_math.yml
-3
View File
@@ -6,9 +6,6 @@
# ========================================================================= # =========================================================================
--- ---
colour: true
:unity:
:plugins: []
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
test/targets/hitech_picc18.yml
+1 -3
View File
@@ -16,7 +16,6 @@
else else
_PASSED_TESTS(); _PASSED_TESTS();
return 0; return 0;
colour: true
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
@@ -72,8 +71,7 @@ colour: true
:name: simulator :name: simulator
:executable: 'java -client -jar ' :executable: 'java -client -jar '
:arguments: :arguments:
- - C:\Program Files\HI-TECH Software\HI-TIDE\3.15\lib\ - \C:\Program Files\HI-TECH Software\HI-TIDE\3.15\lib\simpic18.jar
- simpic18.jar
- 18F87J10 - 18F87J10
- "${1}" - "${1}"
:extension: :extension:
test/targets/iar_arm_v4.yml
+11 -29
View File
@@ -6,20 +6,13 @@
# ========================================================================= # =========================================================================
--- ---
tools_root: C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\
colour: true
:unity:
:plugins: []
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\bin\iccarm.exe
- C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\
- arm\bin\iccarm.exe
:arguments: :arguments:
- "--dlib_config" - "--dlib_config"
- - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\lib\dl4tptinl8n.h
- arm\lib\dl4tptinl8n.h
- "-z3" - "-z3"
- "--no_cse" - "--no_cse"
- "--no_unroll" - "--no_unroll"
@@ -46,14 +39,11 @@ colour: true
- "-o ${2}" - "-o ${2}"
:test_linker: :test_linker:
:name: linker :name: linker
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\common\bin\xlink.exe
- C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\
- common\bin\xlink.exe
:arguments: :arguments:
- "${1}" - "${1}"
- "-rt" - "-rt"
- - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\lib\dl4tptinl8n.r79
- arm\lib\dl4tptinl8n.r79
- "-D_L_EXTMEM_START=0" - "-D_L_EXTMEM_START=0"
- "-D_L_EXTMEM_SIZE=0" - "-D_L_EXTMEM_SIZE=0"
- "-D_L_HEAP_SIZE=120" - "-D_L_HEAP_SIZE=120"
@@ -62,29 +52,22 @@ colour: true
- "-s" - "-s"
- __program_start - __program_start
- "-f" - "-f"
- - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - "C:\\Program Files\\IAR Systems\\Embedded Workbench 4.0 Kickstart\\arm\\config\\lnkarm.xcl"
- "\\arm\\config\\lnkarm.xcl"
- "-o ${2}" - "-o ${2}"
:test_fixture: :test_fixture:
:name: simulator :name: simulator
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\common\bin\CSpyBat.exe
- C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\
- common\bin\CSpyBat.exe
:arguments: :arguments:
- "--silent" - "--silent"
- - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\bin\armproc.dll
- 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\armsim.dll
- "${1}" - "${1}"
- "--plugin" - "--plugin"
- - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\bin\armbat.dll
- arm\bin\armbat.dll
- "--backend" - "--backend"
- "-B" - "-B"
- "-p" - "-p"
- - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\config\ioat91sam7X256.ddf
- arm\config\ioat91sam7X256.ddf
- "-d" - "-d"
- sim - sim
:extension: :extension:
@@ -92,8 +75,7 @@ colour: true
:executable: ".d79" :executable: ".d79"
:paths: :paths:
:test: :test:
- - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ - C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\arm\inc\
- arm\inc\
- src\ - src\
- "..\\src\\" - "..\\src\\"
- testdata/ - testdata/
test/targets/iar_arm_v5.yml
+10 -27
View File
@@ -6,20 +6,13 @@
# ========================================================================= # =========================================================================
--- ---
tools_root: C:\Program Files\IAR Systems\Embedded Workbench 5.3\
colour: true
:unity:
:plugins: []
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\iccarm.exe
- C:\Program Files\IAR Systems\Embedded Workbench 5.3\
- arm\bin\iccarm.exe
:arguments: :arguments:
- "--dlib_config" - "--dlib_config"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\inc\DLib_Config_Normal.h
- arm\inc\DLib_Config_Normal.h
- "--no_cse" - "--no_cse"
- "--no_unroll" - "--no_unroll"
- "--no_inline" - "--no_inline"
@@ -45,9 +38,7 @@ colour: true
- "-o ${2}" - "-o ${2}"
:test_linker: :test_linker:
:name: linker :name: linker
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\ilinkarm.exe
- C:\Program Files\IAR Systems\Embedded Workbench 5.3\
- arm\bin\ilinkarm.exe
:arguments: :arguments:
- "${1}" - "${1}"
- "--redirect _Printf=_PrintfLarge" - "--redirect _Printf=_PrintfLarge"
@@ -55,29 +46,22 @@ colour: true
- "--semihosting" - "--semihosting"
- "--entry __iar_program_start" - "--entry __iar_program_start"
- "--config" - "--config"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\config\generic.icf
- arm\config\generic.icf
- "-o ${2}" - "-o ${2}"
:test_fixture: :test_fixture:
:name: simulator :name: simulator
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3\common\bin\CSpyBat.exe
- C:\Program Files\IAR Systems\Embedded Workbench 5.3\
- common\bin\CSpyBat.exe
:arguments: :arguments:
- "--silent" - "--silent"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\armproc.dll
- 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\armsim.dll
- "${1}" - "${1}"
- "--plugin" - "--plugin"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\armbat.dll
- arm\bin\armbat.dll
- "--backend" - "--backend"
- "-B" - "-B"
- "-p" - "-p"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\config\debugger\atmel\ioat91sam7X256.ddf
- arm\config\debugger\atmel\ioat91sam7X256.ddf
- "-d" - "-d"
- sim - sim
:extension: :extension:
@@ -85,8 +69,7 @@ colour: true
:executable: ".out" :executable: ".out"
:paths: :paths:
:test: :test:
- - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\inc\
- arm\inc\
- src\ - src\
- "..\\src\\" - "..\\src\\"
- testdata/ - testdata/
test/targets/iar_arm_v5_3.yml
+10 -27
View File
@@ -6,20 +6,13 @@
# ========================================================================= # =========================================================================
--- ---
tools_root: C:\Program Files\IAR Systems\Embedded Workbench 5.3\
colour: true
:unity:
:plugins: []
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\iccarm.exe
- C:\Program Files\IAR Systems\Embedded Workbench 5.3\
- arm\bin\iccarm.exe
:arguments: :arguments:
- "--dlib_config" - "--dlib_config"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\inc\DLib_Config_Normal.h
- arm\inc\DLib_Config_Normal.h
- "--no_cse" - "--no_cse"
- "--no_unroll" - "--no_unroll"
- "--no_inline" - "--no_inline"
@@ -45,9 +38,7 @@ colour: true
- "-o ${2}" - "-o ${2}"
:test_linker: :test_linker:
:name: linker :name: linker
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\ilinkarm.exe
- C:\Program Files\IAR Systems\Embedded Workbench 5.3\
- arm\bin\ilinkarm.exe
:arguments: :arguments:
- "${1}" - "${1}"
- "--redirect _Printf=_PrintfLarge" - "--redirect _Printf=_PrintfLarge"
@@ -55,29 +46,22 @@ colour: true
- "--semihosting" - "--semihosting"
- "--entry __iar_program_start" - "--entry __iar_program_start"
- "--config" - "--config"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\config\generic.icf
- arm\config\generic.icf
- "-o ${2}" - "-o ${2}"
:test_fixture: :test_fixture:
:name: simulator :name: simulator
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3\common\bin\CSpyBat.exe
- C:\Program Files\IAR Systems\Embedded Workbench 5.3\
- common\bin\CSpyBat.exe
:arguments: :arguments:
- "--silent" - "--silent"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\armproc.dll
- 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\armsim.dll
- "${1}" - "${1}"
- "--plugin" - "--plugin"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\bin\armbat.dll
- arm\bin\armbat.dll
- "--backend" - "--backend"
- "-B" - "-B"
- "-p" - "-p"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\config\debugger\atmel\ioat91sam7X256.ddf
- arm\config\debugger\atmel\ioat91sam7X256.ddf
- "-d" - "-d"
- sim - sim
:extension: :extension:
@@ -85,8 +69,7 @@ colour: true
:executable: ".out" :executable: ".out"
:paths: :paths:
:test: :test:
- - C:\Program Files\IAR Systems\Embedded Workbench 5.3\ - C:\Program Files\IAR Systems\Embedded Workbench 5.3\arm\inc\
- arm\inc\
- src\ - src\
- "..\\src\\" - "..\\src\\"
- testdata/ - testdata/
test/targets/iar_armcortex_LM3S9B92_v5_4.yml
+10 -27
View File
@@ -6,16 +6,10 @@
# ========================================================================= # =========================================================================
--- ---
tools_root: C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\
colour: true
:unity:
:plugins: []
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
:executable: :executable: C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\bin\iccarm.exe
- C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\
- arm\bin\iccarm.exe
:arguments: :arguments:
- "--diag_suppress=Pa050" - "--diag_suppress=Pa050"
- "--debug" - "--debug"
@@ -25,8 +19,7 @@ colour: true
- "-e" - "-e"
- "--fpu=None" - "--fpu=None"
- "--dlib_config" - "--dlib_config"
- - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\inc\DLib_Config_Normal.h
- arm\inc\DLib_Config_Normal.h
- "--interwork" - "--interwork"
- "--warnings_are_errors" - "--warnings_are_errors"
- "-Oh" - "-Oh"
@@ -37,9 +30,7 @@ colour: true
- "-o ${2}" - "-o ${2}"
:test_linker: :test_linker:
:name: linker :name: linker
:executable: :executable: C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\bin\ilinkarm.exe
- C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\
- arm\bin\ilinkarm.exe
:arguments: :arguments:
- "${1}" - "${1}"
- "--redirect _Printf=_PrintfLarge" - "--redirect _Printf=_PrintfLarge"
@@ -47,31 +38,24 @@ colour: true
- "--semihosting" - "--semihosting"
- "--entry __iar_program_start" - "--entry __iar_program_start"
- "--config" - "--config"
- - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\config\generic.icf
- arm\config\generic.icf
- "-o ${2}" - "-o ${2}"
:test_fixture: :test_fixture:
:name: simulator :name: simulator
:executable: :executable: C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\common\bin\CSpyBat.exe
- C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\
- common\bin\CSpyBat.exe
:arguments: :arguments:
- - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\bin\armproc.dll
- 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\armsim2.dll
- "${1}" - "${1}"
- "--plugin" - "--plugin"
- - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\bin\armbat.dll
- arm\bin\armbat.dll
- "--backend" - "--backend"
- "-B" - "-B"
- "--endian=little" - "--endian=little"
- "--cpu=Cortex-M3" - "--cpu=Cortex-M3"
- "--fpu=None" - "--fpu=None"
- "-p" - "-p"
- - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\config\debugger\TexasInstruments\iolm3sxxxx.ddf
- arm\config\debugger\TexasInstruments\iolm3sxxxx.ddf
- "--semihosting" - "--semihosting"
- "--device=LM3SxBxx" - "--device=LM3SxBxx"
:extension: :extension:
@@ -79,8 +63,7 @@ colour: true
:executable: ".out" :executable: ".out"
:paths: :paths:
:test: :test:
- - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ - C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\arm\inc\
- arm\inc\
- src\ - src\
- "..\\src\\" - "..\\src\\"
- testdata/ - testdata/
test/targets/iar_cortexm3_v5.yml
+10 -27
View File
@@ -6,20 +6,13 @@
# ========================================================================= # =========================================================================
--- ---
tools_root: C:\Program Files\IAR Systems\Embedded Workbench 5.4\
colour: true
:unity:
:plugins: []
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\bin\iccarm.exe
- C:\Program Files\IAR Systems\Embedded Workbench 5.4\
- arm\bin\iccarm.exe
:arguments: :arguments:
- "--dlib_config" - "--dlib_config"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\inc\DLib_Config_Normal.h
- arm\inc\DLib_Config_Normal.h
- "--no_cse" - "--no_cse"
- "--no_unroll" - "--no_unroll"
- "--no_inline" - "--no_inline"
@@ -45,9 +38,7 @@ colour: true
- "-o ${2}" - "-o ${2}"
:test_linker: :test_linker:
:name: linker :name: linker
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\bin\ilinkarm.exe
- C:\Program Files\IAR Systems\Embedded Workbench 5.4\
- arm\bin\ilinkarm.exe
:arguments: :arguments:
- "${1}" - "${1}"
- "--redirect _Printf=_PrintfLarge" - "--redirect _Printf=_PrintfLarge"
@@ -55,29 +46,22 @@ colour: true
- "--semihosting" - "--semihosting"
- "--entry __iar_program_start" - "--entry __iar_program_start"
- "--config" - "--config"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\config\generic_cortex.icf
- arm\config\generic_cortex.icf
- "-o ${2}" - "-o ${2}"
:test_fixture: :test_fixture:
:name: simulator :name: simulator
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.4\common\bin\CSpyBat.exe
- C:\Program Files\IAR Systems\Embedded Workbench 5.4\
- common\bin\CSpyBat.exe
:arguments: :arguments:
- "--silent" - "--silent"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\bin\armproc.dll
- 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\armsim.dll
- "${1}" - "${1}"
- "--plugin" - "--plugin"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\bin\armbat.dll
- arm\bin\armbat.dll
- "--backend" - "--backend"
- "-B" - "-B"
- "-p" - "-p"
- - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\config\debugger\ST\iostm32f107xx.ddf
- arm\config\debugger\ST\iostm32f107xx.ddf
- "--cpu=Cortex-M3" - "--cpu=Cortex-M3"
- "-d" - "-d"
- sim - sim
@@ -86,8 +70,7 @@ colour: true
:executable: ".out" :executable: ".out"
:paths: :paths:
:test: :test:
- - C:\Program Files\IAR Systems\Embedded Workbench 5.4\ - C:\Program Files\IAR Systems\Embedded Workbench 5.4\arm\inc\
- arm\inc\
- src\ - src\
- "..\\src\\" - "..\\src\\"
- testdata/ - testdata/
test/targets/iar_msp430.yml
+14 -49
View File
@@ -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: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\bin\icc430.exe
- *2
- icc430.exe
:arguments: :arguments:
- "--dlib_config" - "--dlib_config"
- - *3 - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\lib\dlib\dl430fn.h
- dlib\dl430fn.h
- "--no_cse" - "--no_cse"
- "--no_unroll" - "--no_unroll"
- "--no_inline" - "--no_inline"
@@ -54,14 +32,11 @@ colour: true
- "-o ${2}" - "-o ${2}"
:test_linker: :test_linker:
:name: linker :name: linker
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\bin\xlink.exe
- *2
- xlink.exe
:arguments: :arguments:
- "${1}" - "${1}"
- "-rt" - "-rt"
- - *3 - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\lib\dlib\dl430fn.r43
- dlib\dl430fn.r43
- "-e_PrintfTiny=_Printf" - "-e_PrintfTiny=_Printf"
- "-e_ScanfSmall=_Scanf" - "-e_ScanfSmall=_Scanf"
- "-s __program_start" - "-s __program_start"
@@ -69,43 +44,33 @@ colour: true
- "-D_DATA16_HEAP_SIZE=50" - "-D_DATA16_HEAP_SIZE=50"
- "-D_DATA20_HEAP_SIZE=50" - "-D_DATA20_HEAP_SIZE=50"
- "-f" - "-f"
- - *4 - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\config\lnk430f5438.xcl
- lnk430f5438.xcl
- "-f" - "-f"
- - *4 - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\config\multiplier.xcl
- multiplier.xcl
- "-o ${2}" - "-o ${2}"
:test_fixture: :test_fixture:
:name: simulator :name: simulator
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\common\bin\CSpyBat.exe
- C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\
- common\bin\CSpyBat.exe
:arguments: :arguments:
- "--silent" - "--silent"
- - *2 - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\bin\430proc.dll
- 430proc.dll - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\bin\430sim.dll
- - *2
- 430sim.dll
- "${1}" - "${1}"
- "--plugin" - "--plugin"
- - *2 - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\bin\430bat.dll
- 430bat.dll
- "--backend -B" - "--backend -B"
- "--cpu MSP430F5438" - "--cpu MSP430F5438"
- "-p" - "-p"
- - *4 - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\config\MSP430F5438.ddf
- MSP430F5438.ddf
- "-d sim" - "-d sim"
:extension: :extension:
:object: ".r43" :object: ".r43"
:executable: ".d79" :executable: ".d79"
:paths: :paths:
:test: :test:
- *5 - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\inc\
- - *5 - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\inc\dlib
- dlib - C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\430\lib\dlib
- - *3
- dlib
- src\ - src\
- "../src/" - "../src/"
- testdata/ - testdata/
test/targets/iar_sh2a_v6.yml
+11 -29
View File
@@ -6,16 +6,10 @@
# ========================================================================= # =========================================================================
--- ---
tools_root: C:\Program Files\IAR Systems\Embedded Workbench 6.0\
colour: true
:unity:
:plugins: []
:tools: :tools:
:test_compiler: :test_compiler:
:name: compiler :name: compiler
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\bin\iccsh.exe
- C:\Program Files\IAR Systems\Embedded Workbench 6.0\
- sh\bin\iccsh.exe
:arguments: :arguments:
- "-e" - "-e"
- "--char_is_signed" - "--char_is_signed"
@@ -29,8 +23,7 @@ colour: true
- "--no_clustering" - "--no_clustering"
- "--debug" - "--debug"
- "--dlib_config" - "--dlib_config"
- - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - "C:\\Program Files\\IAR Systems\\Embedded Workbench 6.0\\sh\\inc\\DLib_Product.h"
- sh\inc\DLib_Product.h
- "--double=32" - "--double=32"
- "--code_model=huge" - "--code_model=huge"
- "--data_model=huge" - "--data_model=huge"
@@ -47,16 +40,13 @@ colour: true
- "-o ${2}" - "-o ${2}"
:test_linker: :test_linker:
:name: linker :name: linker
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\bin\ilinksh.exe
- C:\Program Files\IAR Systems\Embedded Workbench 6.0\
- sh\bin\ilinksh.exe
:arguments: :arguments:
- "${1}" - "${1}"
- "--redirect __Printf=__PrintfSmall" - "--redirect __Printf=__PrintfSmall"
- "--redirect __Scanf=__ScanfSmall" - "--redirect __Scanf=__ScanfSmall"
- "--config" - "--config"
- - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\config\generic.icf
- sh\config\generic.icf
- "--config_def _CSTACK_SIZE=0x800" - "--config_def _CSTACK_SIZE=0x800"
- "--config_def _HEAP_SIZE=0x800" - "--config_def _HEAP_SIZE=0x800"
- "--config_def _INT_TABLE=0x10" - "--config_def _INT_TABLE=0x10"
@@ -65,25 +55,19 @@ colour: true
- "-o ${2}" - "-o ${2}"
:test_fixture: :test_fixture:
:name: simulator :name: simulator
:executable: :executable: C:\Program Files\IAR Systems\Embedded Workbench 6.0\common\bin\CSpyBat.exe
- C:\Program Files\IAR Systems\Embedded Workbench 6.0\
- common\bin\CSpyBat.exe
:arguments: :arguments:
- "--silent" - "--silent"
- - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\bin\shproc.dll
- 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\shsim.dll
- "${1}" - "${1}"
- "--plugin" - "--plugin"
- - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\bin\shbat.dll
- sh\bin\shbat.dll
- "--backend" - "--backend"
- "-B" - "-B"
- "--core sh2afpu" - "--core sh2afpu"
- "-p" - "-p"
- - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\config\debugger\io7264.ddf
- sh\config\debugger\io7264.ddf
- "-d" - "-d"
- sim - sim
:extension: :extension:
@@ -91,10 +75,8 @@ colour: true
:executable: ".out" :executable: ".out"
:paths: :paths:
:test: :test:
- - C:\Program Files\IAR Systems\Embedded Workbench 6.0\ - C:\Program Files\IAR Systems\Embedded Workbench 6.0\sh\inc\
- 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
- src\ - src\
- "..\\src\\" - "..\\src\\"
- testdata/ - testdata/
test/tests/test_unity_core.c
+27 -32
View File
@@ -44,44 +44,39 @@ void testUnitySizeInitializationReminder(void)
"still correct."; "still correct.";
/* Define a structure with all the same fields as `struct UNITY_STORAGE_T`. */ /* Define a structure with all the same fields as `struct UNITY_STORAGE_T`. */
#ifdef UNITY_EXCLUDE_DETAILS #if defined(__GNUC__) || defined(__clang__)
struct { #pragma GCC diagnostic push
const char* TestFile; #pragma GCC diagnostic ignored "-Wpadded"
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;
#endif #endif
#ifndef UNITY_EXCLUDE_SETJMP_H struct {
jmp_buf AbortFrame; const char* TestFile;
#endif const char* CurrentTestName;
} Expected_Unity; #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 #else
struct { const char* CurrentDetail1;
const char* TestFile; const char* CurrentDetail2;
const char* CurrentTestName; #endif
const char* CurrentDetails1; #endif
const char* CurrentDetails2; UNITY_LINE_TYPE CurrentTestLineNumber;
UNITY_LINE_TYPE CurrentTestLineNumber; UNITY_COUNTER_TYPE NumberOfTests;
UNITY_COUNTER_TYPE NumberOfTests; UNITY_COUNTER_TYPE TestFailures;
UNITY_COUNTER_TYPE TestFailures; UNITY_COUNTER_TYPE TestIgnores;
UNITY_COUNTER_TYPE TestIgnores; UNITY_COUNTER_TYPE CurrentTestFailed;
UNITY_COUNTER_TYPE CurrentTestFailed; UNITY_COUNTER_TYPE CurrentTestIgnored;
UNITY_COUNTER_TYPE CurrentTestIgnored;
#ifdef UNITY_INCLUDE_EXEC_TIME #ifdef UNITY_INCLUDE_EXEC_TIME
UNITY_COUNTER_TYPE CurrentTestStartTime; UNITY_TIME_TYPE CurrentTestStartTime;
UNITY_COUNTER_TYPE CurrentTestStopTime; UNITY_TIME_TYPE CurrentTestStopTime;
#endif #endif
#ifndef UNITY_EXCLUDE_SETJMP_H #ifndef UNITY_EXCLUDE_SETJMP_H
jmp_buf AbortFrame; jmp_buf AbortFrame;
#endif #endif
} Expected_Unity; } Expected_Unity;
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic pop
#endif #endif
/* Compare our fake structure's size to the actual structure's size. They /* Compare our fake structure's size to the actual structure's size. They