mirror of
https://github.com/ThrowTheSwitch/CMock.git
synced 2026-06-05 21:15:20 +00:00
cleanup the way defines are handled in tests.
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
:executable: '.exe'
|
||||
|
||||
:defines:
|
||||
:common:
|
||||
:test:
|
||||
- __monitor
|
||||
- UNITY_SUPPORT_64
|
||||
|
||||
|
||||
@@ -132,7 +132,7 @@ module RakefileHelpers
|
||||
|
||||
# All defines: project common + Unity target + CMock overlay + any extras
|
||||
def all_defines(extra = [])
|
||||
(($proj[:defines][:common] || []) +
|
||||
(($proj[:defines][:test] || []) +
|
||||
($unity_cfg[:defines][:test] || []) +
|
||||
(($cmock_cfg[:defines] || {})[:test] || []) +
|
||||
extra).uniq
|
||||
|
||||
+1
-1
@@ -28,6 +28,6 @@
|
||||
:executable: '.exe'
|
||||
|
||||
:defines:
|
||||
:common:
|
||||
:test:
|
||||
- CMOCK
|
||||
|
||||
|
||||
+2
-1
@@ -82,7 +82,8 @@ namespace :test do
|
||||
}
|
||||
criteria.each_pair do |k,v|
|
||||
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?
|
||||
unsupported |= [k]
|
||||
end
|
||||
|
||||
@@ -132,7 +132,7 @@ module RakefileHelpers
|
||||
|
||||
# All defines: project common + Unity target + CMock overlay + any extras
|
||||
def all_defines(extra = [])
|
||||
(($proj[:defines][:common] || []) +
|
||||
(($proj[:defines][:test] || []) +
|
||||
($unity_cfg[:defines][:test] || []) +
|
||||
(($cmock_cfg[:defines] || {})[:test] || []) +
|
||||
extra).uniq
|
||||
|
||||
Reference in New Issue
Block a user