cleanup the way defines are handled in tests.

This commit is contained in:
Mark VanderVoord
2026-05-29 16:28:57 -04:00
parent c06bbe791c
commit 725e2d90ef
5 changed files with 6 additions and 5 deletions
+1 -1
View File
@@ -28,7 +28,7 @@
:executable: '.exe' :executable: '.exe'
:defines: :defines:
:common: :test:
- __monitor - __monitor
- UNITY_SUPPORT_64 - UNITY_SUPPORT_64
+1 -1
View File
@@ -132,7 +132,7 @@ module RakefileHelpers
# All defines: project common + Unity target + CMock overlay + any extras # All defines: project common + Unity target + CMock overlay + any extras
def all_defines(extra = []) def all_defines(extra = [])
(($proj[:defines][:common] || []) + (($proj[:defines][:test] || []) +
($unity_cfg[:defines][:test] || []) + ($unity_cfg[:defines][:test] || []) +
(($cmock_cfg[:defines] || {})[:test] || []) + (($cmock_cfg[:defines] || {})[:test] || []) +
extra).uniq extra).uniq
+1 -1
View File
@@ -28,6 +28,6 @@
:executable: '.exe' :executable: '.exe'
:defines: :defines:
:common: :test:
- CMOCK - CMOCK
+2 -1
View File
@@ -82,7 +82,8 @@ namespace :test do
} }
criteria.each_pair do |k,v| criteria.each_pair do |k,v|
crit_defs = v[:defines] || [] crit_defs = v[:defines] || []
conf_defs = $unity_cfg.dig(:defines,:test,'*') || $unity_cfg.dig(:defines,:test) || [] test_defs = $unity_cfg.dig(:defines,:test)
conf_defs = (test_defs.is_a?(Hash) ? test_defs['*'] : nil) || test_defs || []
if (crit_defs & conf_defs).empty? if (crit_defs & conf_defs).empty?
unsupported |= [k] unsupported |= [k]
end end
+1 -1
View File
@@ -132,7 +132,7 @@ module RakefileHelpers
# All defines: project common + Unity target + CMock overlay + any extras # All defines: project common + Unity target + CMock overlay + any extras
def all_defines(extra = []) def all_defines(extra = [])
(($proj[:defines][:common] || []) + (($proj[:defines][:test] || []) +
($unity_cfg[:defines][:test] || []) + ($unity_cfg[:defines][:test] || []) +
(($cmock_cfg[:defines] || {})[:test] || []) + (($cmock_cfg[:defines] || {})[:test] || []) +
extra).uniq extra).uniq