提交 368a7d89 编写于 作者: M mvandervoord

Fixed a couple of mistakes in last commit

上级 d16c27b0
...@@ -683,7 +683,7 @@ extern const char UnityStrErrShorthand[]; ...@@ -683,7 +683,7 @@ extern const char UnityStrErrShorthand[];
#ifndef RUN_TEST #ifndef RUN_TEST
#ifdef __STDC_VERSION__ #ifdef __STDC_VERSION__
#if __STDC_VERSION__ >= 199901L #if __STDC_VERSION__ >= 199901L
#define UNITY_SUPPORT_VARIADIC #define UNITY_SUPPORT_VARIADIC_MACROS
#endif #endif
#endif #endif
#ifdef UNITY_SUPPORT_VARIADIC_MACROS #ifdef UNITY_SUPPORT_VARIADIC_MACROS
......
...@@ -13,13 +13,13 @@ CFLAGS += -Wbad-function-cast -Wcast-qual -Wold-style-definition -Wshadow -Wstri ...@@ -13,13 +13,13 @@ CFLAGS += -Wbad-function-cast -Wcast-qual -Wold-style-definition -Wshadow -Wstri
-Wstrict-prototypes -Wswitch-default -Wundef -Wstrict-prototypes -Wswitch-default -Wundef
#DEBUG = -O0 -g #DEBUG = -O0 -g
CFLAGS += $(DEBUG) CFLAGS += $(DEBUG)
UNITY_SUPPORT_64 = -D UNITY_SUPPORT_64
UNITY_INCLUDE_DOUBLE = -D UNITY_INCLUDE_DOUBLE
DEFINES = -D UNITY_OUTPUT_CHAR=putcharSpy DEFINES = -D UNITY_OUTPUT_CHAR=putcharSpy
DEFINES += -D UNITY_OUTPUT_CHAR_HEADER_DECLARATION=putcharSpy\(int\) DEFINES += -D UNITY_OUTPUT_CHAR_HEADER_DECLARATION=putcharSpy\(int\)
DEFINES += -D UNITY_OUTPUT_FLUSH=flushSpy DEFINES += -D UNITY_OUTPUT_FLUSH=flushSpy
DEFINES += -D UNITY_OUTPUT_FLUSH_HEADER_DECLARATION=flushSpy\(void\) DEFINES += -D UNITY_OUTPUT_FLUSH_HEADER_DECLARATION=flushSpy\(void\)
DEFINES += $(UNITY_SUPPORT_64) $(UNITY_INCLUDE_DOUBLE) DEFINES += $(UNITY_SUPPORT_64) $(UNITY_INCLUDE_DOUBLE)
UNITY_SUPPORT_64 = -D UNITY_SUPPORT_64
UNITY_INCLUDE_DOUBLE = -D UNITY_INCLUDE_DOUBLE
SRC = ../src/unity.c tests/testunity.c build/testunityRunner.c SRC = ../src/unity.c tests/testunity.c build/testunityRunner.c
INC_DIR = -I ../src INC_DIR = -I ../src
COV_FLAGS = -fprofile-arcs -ftest-coverage -I ../../src COV_FLAGS = -fprofile-arcs -ftest-coverage -I ../../src
...@@ -30,7 +30,6 @@ TARGET = build/testunity-cov.exe ...@@ -30,7 +30,6 @@ TARGET = build/testunity-cov.exe
# For verbose output of all the tests, run 'make test'. # For verbose output of all the tests, run 'make test'.
default: coverage default: coverage
.PHONY: default coverage test clean .PHONY: default coverage test clean
coverage: DEFINES += -D UNITY_NO_WEAK
coverage: $(BUILD_DIR)/testunityRunner.c coverage: $(BUILD_DIR)/testunityRunner.c
cd $(BUILD_DIR) && \ cd $(BUILD_DIR) && \
$(CC) $(CFLAGS) $(DEFINES) $(foreach i,$(SRC), ../$i) $(COV_FLAGS) -o ../$(TARGET) $(CC) $(CFLAGS) $(DEFINES) $(foreach i,$(SRC), ../$i) $(COV_FLAGS) -o ../$(TARGET)
......
...@@ -23,6 +23,7 @@ compiler: ...@@ -23,6 +23,7 @@ compiler:
- UNITY_INCLUDE_DOUBLE - UNITY_INCLUDE_DOUBLE
- UNITY_SUPPORT_TEST_CASES - UNITY_SUPPORT_TEST_CASES
- UNITY_EXCLUDE_TESTING_NEW_COMMENTS - UNITY_EXCLUDE_TESTING_NEW_COMMENTS
- UNITY_SUPPORT_64
object_files: object_files:
prefix: '-o' prefix: '-o'
extension: '.o' extension: '.o'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册