diff --git a/test/rakefile_helper.rb b/test/rakefile_helper.rb index ba9e5e258ff9c09550d2e2366b6ec8227727d5ac..7ed128e84e9fe082ea2fd9e96d8f00b6d29ecec3 100644 --- a/test/rakefile_helper.rb +++ b/test/rakefile_helper.rb @@ -97,7 +97,7 @@ module RakefileHelpers if $cfg['compiler']['defines']['items'].nil? defines = '' else - defines = squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items']) + defines = squash($cfg['compiler']['defines']['prefix'], $cfg['compiler']['defines']['items'] + ['UNITY_OUTPUT_CHAR=putcharSpy']) end options = squash('', $cfg['compiler']['options']) includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items']) diff --git a/test/targets/clang_file.yml b/test/targets/clang_file.yml index 189066c5c3353fbc298343a10e5b95cef674ee13..5a19f9c7be7c6b20317a3830046da964dbb51e74 100644 --- a/test/targets/clang_file.yml +++ b/test/targets/clang_file.yml @@ -57,7 +57,6 @@ compiler: defines: prefix: '-D' items: - - UNITY_OUTPUT_CHAR=putcharSpy - UNITY_INCLUDE_DOUBLE - UNITY_SUPPORT_64 - UNITY_OUTPUT_RESULTS_FILE diff --git a/test/targets/clang_strict.yml b/test/targets/clang_strict.yml index 55632fbe0bbc83d7b5afa9885edf373c18dcab2b..3ce354e7c24b11a69cb6c7e9a6dd49a5130c67cf 100644 --- a/test/targets/clang_strict.yml +++ b/test/targets/clang_strict.yml @@ -57,7 +57,6 @@ compiler: defines: prefix: '-D' items: - - UNITY_OUTPUT_CHAR=putcharSpy - UNITY_INCLUDE_DOUBLE - UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_64 diff --git a/test/targets/gcc_32.yml b/test/targets/gcc_32.yml index 773c0b8d238c6982bdcee687b562715a647d296f..d467ab87c49bd13c97b2c4cd49a8abb6bc62746c 100644 --- a/test/targets/gcc_32.yml +++ b/test/targets/gcc_32.yml @@ -19,7 +19,6 @@ compiler: defines: prefix: '-D' items: - - UNITY_OUTPUT_CHAR=putcharSpy - UNITY_EXCLUDE_STDINT_H - UNITY_EXCLUDE_LIMITS_H - UNITY_EXCLUDE_SIZEOF diff --git a/test/targets/gcc_64.yml b/test/targets/gcc_64.yml index 1cc269fb00884546c90731eeb2e76967b228106e..30f6d00d69b23e3f4a16b1f86a39a85843104d7f 100644 --- a/test/targets/gcc_64.yml +++ b/test/targets/gcc_64.yml @@ -19,7 +19,6 @@ compiler: defines: prefix: '-D' items: - - UNITY_OUTPUT_CHAR=putcharSpy - UNITY_EXCLUDE_STDINT_H - UNITY_EXCLUDE_LIMITS_H - UNITY_EXCLUDE_SIZEOF diff --git a/test/targets/gcc_auto_limits.yml b/test/targets/gcc_auto_limits.yml index e424850370236781d79992f7ec96bf0871f3664f..f94b0ca6cbb1a4283203facb0a40b2ee0edd0678 100644 --- a/test/targets/gcc_auto_limits.yml +++ b/test/targets/gcc_auto_limits.yml @@ -19,7 +19,6 @@ compiler: defines: prefix: '-D' items: - - UNITY_OUTPUT_CHAR=putcharSpy - UNITY_EXCLUDE_STDINT_H - UNITY_INCLUDE_DOUBLE - UNITY_SUPPORT_TEST_CASES diff --git a/test/targets/gcc_auto_sizeof.yml b/test/targets/gcc_auto_sizeof.yml index 1126be1de36b6e693710dcabaa85f3cc5037ec96..eae7fbf683b83b238c5c5635c3193864268d9f8a 100644 --- a/test/targets/gcc_auto_sizeof.yml +++ b/test/targets/gcc_auto_sizeof.yml @@ -19,7 +19,6 @@ compiler: defines: prefix: '-D' items: - - UNITY_OUTPUT_CHAR=putcharSpy - UNITY_EXCLUDE_STDINT_H - UNITY_EXCLUDE_LIMITS_H - UNITY_INCLUDE_DOUBLE diff --git a/test/targets/gcc_auto_stdint.yml b/test/targets/gcc_auto_stdint.yml index 44410e8dd6391623a2c04448452b6890a959e64d..8f0725d2da2d8b839d4ff87fa9c5c336b8ff2502 100644 --- a/test/targets/gcc_auto_stdint.yml +++ b/test/targets/gcc_auto_stdint.yml @@ -32,7 +32,6 @@ compiler: defines: prefix: '-D' items: - - UNITY_OUTPUT_CHAR=putcharSpy - UNITY_INCLUDE_DOUBLE - UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_64 diff --git a/test/targets/gcc_manual_math.yml b/test/targets/gcc_manual_math.yml index dad09fbec6f8cd319a390885afc46a065e1a74b1..9efd79767e5aa29128fbeadfb0a26d97fa7f3b4d 100644 --- a/test/targets/gcc_manual_math.yml +++ b/test/targets/gcc_manual_math.yml @@ -19,7 +19,6 @@ compiler: defines: prefix: '-D' items: - - UNITY_OUTPUT_CHAR=putcharSpy - UNITY_EXCLUDE_MATH_H - UNITY_INCLUDE_DOUBLE - UNITY_SUPPORT_TEST_CASES