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

Remove extra newline in verbose output format of Fixture
ThrowTheSwitch · Oct 12, 2016 · bbf2fe3 · bbf2fe3
2 parents 4ce86fd + 3e30290
commit bbf2fe3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/extras/fixture/src/unity_fixture.c b/extras/fixture/src/unity_fixture.c
@@ -41,7 +41,7 @@ int UnityMain(int argc, const char* argv[], void (*runAllTests)(void))
         UnityBegin(argv[0]);
         announceTestRun(r);
         runAllTests();
-        UNITY_PRINT_EOL();
+        if (!UnityFixture.Verbose) UNITY_PRINT_EOL();
         UnityEnd();
     }
 

diff --git a/extras/fixture/test/Makefile b/extras/fixture/test/Makefile
@@ -3,11 +3,7 @@ ifeq ($(shell uname -s), Darwin)
 CC = clang
 endif
 #DEBUG = -O0 -g
-CFLAGS += -std=c99
-CFLAGS += -pedantic
-CFLAGS += -Wall
-CFLAGS += -Wextra
-CFLAGS += -Werror
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror
 CFLAGS += $(DEBUG)
 DEFINES = -D UNITY_OUTPUT_CHAR=UnityOutputCharSpy_OutputChar
 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
 	./$(TARGET)
 
-clangEverything:
-	clang $(CFLAGS) $(DEFINES) $(SRC) $(INC_DIR) -o $(TARGET) -Weverything
-
 $(BUILD_DIR):
 	mkdir -p $(BUILD_DIR)
 
 clean:
 	rm -f $(TARGET) $(BUILD_DIR)/*.gc*
 
-coverage: $(BUILD_DIR)
+cov: $(BUILD_DIR)
 	cd $(BUILD_DIR) && \
 	$(CC) $(DEFINES) $(foreach i, $(SRC), ../test/$(i)) $(INC_DIR) -o $(TARGET) -fprofile-arcs -ftest-coverage
 	rm -f $(BUILD_DIR)/*.gcda