From 368a7d897059a52bb244ffd314bbe84a830f0f68 Mon Sep 17 00:00:00 2001 From: mvandervoord Date: Fri, 25 Oct 2019 11:20:25 -0400 Subject: [PATCH] Fixed a couple of mistakes in last commit --- src/unity_internals.h | 2 +- test/Makefile | 5 ++--- test/targets/ansi.yml | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/unity_internals.h b/src/unity_internals.h index 0b8578e..11524f0 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -683,7 +683,7 @@ extern const char UnityStrErrShorthand[]; #ifndef RUN_TEST #ifdef __STDC_VERSION__ #if __STDC_VERSION__ >= 199901L -#define UNITY_SUPPORT_VARIADIC +#define UNITY_SUPPORT_VARIADIC_MACROS #endif #endif #ifdef UNITY_SUPPORT_VARIADIC_MACROS diff --git a/test/Makefile b/test/Makefile index 89ece81..7803f38 100644 --- a/test/Makefile +++ b/test/Makefile @@ -13,13 +13,13 @@ CFLAGS += -Wbad-function-cast -Wcast-qual -Wold-style-definition -Wshadow -Wstri -Wstrict-prototypes -Wswitch-default -Wundef #DEBUG = -O0 -g 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_HEADER_DECLARATION=putcharSpy\(int\) DEFINES += -D UNITY_OUTPUT_FLUSH=flushSpy DEFINES += -D UNITY_OUTPUT_FLUSH_HEADER_DECLARATION=flushSpy\(void\) 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 INC_DIR = -I ../src COV_FLAGS = -fprofile-arcs -ftest-coverage -I ../../src @@ -30,7 +30,6 @@ TARGET = build/testunity-cov.exe # For verbose output of all the tests, run 'make test'. default: coverage .PHONY: default coverage test clean -coverage: DEFINES += -D UNITY_NO_WEAK coverage: $(BUILD_DIR)/testunityRunner.c cd $(BUILD_DIR) && \ $(CC) $(CFLAGS) $(DEFINES) $(foreach i,$(SRC), ../$i) $(COV_FLAGS) -o ../$(TARGET) diff --git a/test/targets/ansi.yml b/test/targets/ansi.yml index 9cc393d..182071a 100644 --- a/test/targets/ansi.yml +++ b/test/targets/ansi.yml @@ -23,6 +23,7 @@ compiler: - UNITY_INCLUDE_DOUBLE - UNITY_SUPPORT_TEST_CASES - UNITY_EXCLUDE_TESTING_NEW_COMMENTS + - UNITY_SUPPORT_64 object_files: prefix: '-o' extension: '.o' -- GitLab