From 36e2ca192bd72600a12da9567757426c5b01e475 Mon Sep 17 00:00:00 2001 From: jsalling Date: Mon, 21 Dec 2015 11:39:50 -0600 Subject: [PATCH] Adding -D UNITY_OUTPUT_CHAR=putcharSpy to testing build targets Updated clang and gcc targets. Fixed spelling of LIMITS, which breaks the gcc_auto_sizeof.yml build. Commented -Wunreachable-code, Unity won't build on OSX clang with it, error in unity.c:769 & 932: 'default: break;' case. --- test/targets/clang_file.yml | 5 +++-- test/targets/clang_strict.yml | 5 +++-- 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 | 3 ++- test/targets/gcc_auto_stdint.yml | 1 + test/targets/gcc_manual_math.yml | 1 + 8 files changed, 13 insertions(+), 5 deletions(-) diff --git a/test/targets/clang_file.yml b/test/targets/clang_file.yml index a14205a..470a728 100644 --- a/test/targets/clang_file.yml +++ b/test/targets/clang_file.yml @@ -28,7 +28,7 @@ compiler: - '-Wstrict-overflow=5' - '-Wuninitialized' - '-Wunused' - - '-Wunreachable-code' +# - '-Wunreachable-code' - '-Wreturn-type' - '-Wshadow' - '-Wundef' @@ -57,6 +57,7 @@ compiler: defines: prefix: '-D' items: + - UNITY_OUTPUT_CHAR=putcharSpy - UNITY_INCLUDE_DOUBLE - UNITY_SUPPORT_64 - UNITY_OUTPUT_RESULTS_FILE @@ -65,7 +66,7 @@ compiler: extension: '.o' destination: *build_path linker: - path: gcc + path: clang options: - -lm - '-m64' diff --git a/test/targets/clang_strict.yml b/test/targets/clang_strict.yml index 3e2bdc2..da76aed 100644 --- a/test/targets/clang_strict.yml +++ b/test/targets/clang_strict.yml @@ -28,7 +28,7 @@ compiler: - '-Wstrict-overflow=5' - '-Wuninitialized' - '-Wunused' - - '-Wunreachable-code' +# - '-Wunreachable-code' - '-Wreturn-type' - '-Wshadow' - '-Wundef' @@ -57,6 +57,7 @@ compiler: defines: prefix: '-D' items: + - UNITY_OUTPUT_CHAR=putcharSpy - UNITY_INCLUDE_DOUBLE - UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_64 @@ -65,7 +66,7 @@ compiler: extension: '.o' destination: *build_path linker: - path: gcc + path: clang options: - -lm - '-m64' diff --git a/test/targets/gcc_32.yml b/test/targets/gcc_32.yml index dbed355..3b7ac41 100644 --- a/test/targets/gcc_32.yml +++ b/test/targets/gcc_32.yml @@ -19,6 +19,7 @@ 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 8f60340..04a2a70 100644 --- a/test/targets/gcc_64.yml +++ b/test/targets/gcc_64.yml @@ -19,6 +19,7 @@ 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 72ed555..feec894 100644 --- a/test/targets/gcc_auto_limits.yml +++ b/test/targets/gcc_auto_limits.yml @@ -19,6 +19,7 @@ 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 b7076ea..9a1f9cf 100644 --- a/test/targets/gcc_auto_sizeof.yml +++ b/test/targets/gcc_auto_sizeof.yml @@ -19,8 +19,9 @@ compiler: defines: prefix: '-D' items: + - UNITY_OUTPUT_CHAR=putcharSpy - UNITY_EXCLUDE_STDINT_H - - UNITY_EXCLUDE_LIMTIS_H + - UNITY_EXCLUDE_LIMITS_H - UNITY_INCLUDE_DOUBLE - UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_64 diff --git a/test/targets/gcc_auto_stdint.yml b/test/targets/gcc_auto_stdint.yml index 0405629..bf358f8 100644 --- a/test/targets/gcc_auto_stdint.yml +++ b/test/targets/gcc_auto_stdint.yml @@ -32,6 +32,7 @@ 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 64ea3f9..b910046 100644 --- a/test/targets/gcc_manual_math.yml +++ b/test/targets/gcc_manual_math.yml @@ -19,6 +19,7 @@ compiler: defines: prefix: '-D' items: + - UNITY_OUTPUT_CHAR=putcharSpy - UNITY_EXCLUDE_MATH_H - UNITY_INCLUDE_DOUBLE - UNITY_SUPPORT_TEST_CASES -- GitLab