espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-06-04 20:16:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #158 from jsalling/bugfix/fixture-rakefile-fails

Browse Source 
Fixture rakefile has a conflict defining UNITY_OUTPUT_CHAR
This commit is contained in:
Mark VanderVoord
2016-01-24 09:55:50 -05:00
parent 044a1f517d cd472439bf
commit 2179e54d6d
9 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/rakefile_helper.rb
View File

@ -97,7 +97,7 @@ module RakefileHelpers
if $cfg['compiler']['defines']['items'].nil? if $cfg['compiler']['defines']['items'].nil?
defines = '' defines = ''
else 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 end
options = squash('', $cfg['compiler']['options']) options = squash('', $cfg['compiler']['options'])
includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items']) includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items'])

1
test/targets/clang_file.yml
View File

@ -57,7 +57,6 @@ compiler:
defines: defines:
prefix: '-D' prefix: '-D'
items: items:
- UNITY_OUTPUT_CHAR=putcharSpy
- UNITY_INCLUDE_DOUBLE - UNITY_INCLUDE_DOUBLE
- UNITY_SUPPORT_64 - UNITY_SUPPORT_64
- UNITY_OUTPUT_RESULTS_FILE - UNITY_OUTPUT_RESULTS_FILE

1
test/targets/clang_strict.yml
View File

@ -57,7 +57,6 @@ compiler:
defines: defines:
prefix: '-D' prefix: '-D'
items: items:
- UNITY_OUTPUT_CHAR=putcharSpy
- UNITY_INCLUDE_DOUBLE - UNITY_INCLUDE_DOUBLE
- UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_TEST_CASES
- UNITY_SUPPORT_64 - UNITY_SUPPORT_64

1
test/targets/gcc_32.yml
View File

@ -19,7 +19,6 @@ compiler:
defines: defines:
prefix: '-D' prefix: '-D'
items: items:
- UNITY_OUTPUT_CHAR=putcharSpy
- UNITY_EXCLUDE_STDINT_H - UNITY_EXCLUDE_STDINT_H
- UNITY_EXCLUDE_LIMITS_H - UNITY_EXCLUDE_LIMITS_H
- UNITY_EXCLUDE_SIZEOF - UNITY_EXCLUDE_SIZEOF

1
test/targets/gcc_64.yml
View File

@ -19,7 +19,6 @@ compiler:
defines: defines:
prefix: '-D' prefix: '-D'
items: items:
- UNITY_OUTPUT_CHAR=putcharSpy
- UNITY_EXCLUDE_STDINT_H - UNITY_EXCLUDE_STDINT_H
- UNITY_EXCLUDE_LIMITS_H - UNITY_EXCLUDE_LIMITS_H
- UNITY_EXCLUDE_SIZEOF - UNITY_EXCLUDE_SIZEOF

1
test/targets/gcc_auto_limits.yml
View File

@ -19,7 +19,6 @@ compiler:
defines: defines:
prefix: '-D' prefix: '-D'
items: items:
- UNITY_OUTPUT_CHAR=putcharSpy
- UNITY_EXCLUDE_STDINT_H - UNITY_EXCLUDE_STDINT_H
- UNITY_INCLUDE_DOUBLE - UNITY_INCLUDE_DOUBLE
- UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_TEST_CASES

1
test/targets/gcc_auto_sizeof.yml
View File

@ -19,7 +19,6 @@ compiler:
defines: defines:
prefix: '-D' prefix: '-D'
items: items:
- UNITY_OUTPUT_CHAR=putcharSpy
- UNITY_EXCLUDE_STDINT_H - UNITY_EXCLUDE_STDINT_H
- UNITY_EXCLUDE_LIMITS_H - UNITY_EXCLUDE_LIMITS_H
- UNITY_INCLUDE_DOUBLE - UNITY_INCLUDE_DOUBLE

1
test/targets/gcc_auto_stdint.yml
View File

@ -32,7 +32,6 @@ compiler:
defines: defines:
prefix: '-D' prefix: '-D'
items: items:
- UNITY_OUTPUT_CHAR=putcharSpy
- UNITY_INCLUDE_DOUBLE - UNITY_INCLUDE_DOUBLE
- UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_TEST_CASES
- UNITY_SUPPORT_64 - UNITY_SUPPORT_64

1
test/targets/gcc_manual_math.yml
View File

@ -19,7 +19,6 @@ compiler:
defines: defines:
prefix: '-D' prefix: '-D'
items: items:
- UNITY_OUTPUT_CHAR=putcharSpy
- UNITY_EXCLUDE_MATH_H - UNITY_EXCLUDE_MATH_H
- UNITY_INCLUDE_DOUBLE - UNITY_INCLUDE_DOUBLE
- UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_TEST_CASES