Fixture rakefile has a conflict defining UNITY_OUTPUT_CHAR

 Make core Unity rakefile helper follow Fixture define procedure.
 This commit reverts parts of 36e2ca19.

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'])

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

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

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

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

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

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

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

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