espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-07-30 15:43:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #227 from jsalling/bugfix/fixture-verbose-eol

Browse Source 
Remove extra newline in verbose output format of Fixture
This commit is contained in:
Mark VanderVoord
2016-10-12 06:55:43 -04:00
committed by GitHub
parent 4ce86fd1c0 3e30290367
commit bbf2fe3a93
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extras/fixture/src/unity_fixture.c
View File

@ -41,7 +41,7 @@ int UnityMain(int argc, const char* argv[], void (*runAllTests)(void))
UnityBegin(argv[0]); UnityBegin(argv[0]);
announceTestRun(r); announceTestRun(r);
runAllTests(); runAllTests();
UNITY_PRINT_EOL(); if (!UnityFixture.Verbose) UNITY_PRINT_EOL();
UnityEnd(); UnityEnd();
} }

11
extras/fixture/test/Makefile
View File

@ -3,11 +3,7 @@ ifeq ($(shell uname -s), Darwin)
CC = clang CC = clang
endif endif
#DEBUG = -O0 -g #DEBUG = -O0 -g
CFLAGS += -std=c99 CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror
CFLAGS += -pedantic
CFLAGS += -Wall
CFLAGS += -Wextra
CFLAGS += -Werror
CFLAGS += $(DEBUG) CFLAGS += $(DEBUG)
DEFINES = -D UNITY_OUTPUT_CHAR=UnityOutputCharSpy_OutputChar DEFINES = -D UNITY_OUTPUT_CHAR=UnityOutputCharSpy_OutputChar
SRC = ../src/unity_fixture.c \ SRC = ../src/unity_fixture.c \
@ -44,16 +40,13 @@ C89: $(BUILD_DIR)
$(CC) $(CFLAGS) $(DEFINES) $(SRC) $(INC_DIR) -o $(TARGET) -D UNITY_EXCLUDE_STDLIB_MALLOC -std=c89 $(CC) $(CFLAGS) $(DEFINES) $(SRC) $(INC_DIR) -o $(TARGET) -D UNITY_EXCLUDE_STDLIB_MALLOC -std=c89
./$(TARGET) ./$(TARGET)
clangEverything:
clang $(CFLAGS) $(DEFINES) $(SRC) $(INC_DIR) -o $(TARGET) -Weverything
$(BUILD_DIR): $(BUILD_DIR):
mkdir -p $(BUILD_DIR) mkdir -p $(BUILD_DIR)
clean: clean:
rm -f $(TARGET) $(BUILD_DIR)/*.gc* rm -f $(TARGET) $(BUILD_DIR)/*.gc*
coverage: $(BUILD_DIR) cov: $(BUILD_DIR)
cd $(BUILD_DIR) && \ cd $(BUILD_DIR) && \
$(CC) $(DEFINES) $(foreach i, $(SRC), ../test/$(i)) $(INC_DIR) -o $(TARGET) -fprofile-arcs -ftest-coverage $(CC) $(DEFINES) $(foreach i, $(SRC), ../test/$(i)) $(INC_DIR) -o $(TARGET) -fprofile-arcs -ftest-coverage
rm -f $(BUILD_DIR)/*.gcda rm -f $(BUILD_DIR)/*.gcda