From cd472439bf550b20f5894b45b7e8316da352a088 Mon Sep 17 00:00:00 2001
From: jsalling <salling@utexas>
Date: Tue, 19 Jan 2016 23:47:32 -0600
Subject: [PATCH] Fixture rakefile has a conflict defining UNITY_OUTPUT_CHAR 
 Make core Unity rakefile helper follow Fixture define procedure.  This commit
 reverts parts of 36e2ca1.

---
 test/rakefile_helper.rb          | 2 +-
 test/targets/clang_file.yml      | 1 -
 test/targets/clang_strict.yml    | 1 -
 test/targets/gcc_32.yml          | 1 -
 test/targets/gcc_64.yml          | 1 -
 test/targets/gcc_auto_limits.yml | 1 -
 test/targets/gcc_auto_sizeof.yml | 1 -
 test/targets/gcc_auto_stdint.yml | 1 -
 test/targets/gcc_manual_math.yml | 1 -
 9 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/test/rakefile_helper.rb b/test/rakefile_helper.rb
index ba9e5e2..7ed128e 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 189066c..5a19f9c 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 55632fb..3ce354e 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 773c0b8..d467ab8 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 1cc269f..30f6d00 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 e424850..f94b0ca 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 1126be1..eae7fbf 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 44410e8..8f0725d 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 dad09fb..9efd797 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