Skip to content

Commit

Permalink
Travis build failure wasn't working for lint/warn because they didn't
Browse files Browse the repository at this point in the history
exit with a non-zero code -- this fixes that.
  • Loading branch information
jeffdonahue committed Jul 14, 2014
1 parent 89d50ca commit c962e7d
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,11 @@ $(EMPTY_LINT_REPORT): $(LINT_OUTPUTS) | $(BUILD_DIR)
@ if [ -s "$@" ]; then \
cat $@; \
mv $@ $(NONEMPTY_LINT_REPORT); \
else \
$(RM) $(NONEMPTY_LINT_REPORT); \
echo "No lint errors!"; \
fi
echo "Found one or more lint errors."; \
exit 1; \
fi; \
$(RM) $(NONEMPTY_LINT_REPORT); \
echo "No lint errors!";

$(LINT_OUTPUTS): $(LINT_OUTPUT_DIR)/%.lint.txt : % | $(LINT_OUTPUT_DIR)
@ mkdir -p $(dir $@)
Expand Down Expand Up @@ -348,10 +349,11 @@ $(EMPTY_WARN_REPORT): $(ALL_WARNS) | $(BUILD_DIR)
@ if [ -s "$@" ]; then \
cat $@; \
mv $@ $(NONEMPTY_WARN_REPORT); \
else \
$(RM) $(NONEMPTY_WARN_REPORT); \
echo "No compiler warnings!"; \
fi
echo "Found one or more lint errors."; \
exit 1; \
fi; \
$(RM) $(NONEMPTY_WARN_REPORT); \
echo "No compiler warnings!";

$(ALL_CXX_WARNS): %.o.$(WARNS_EXT) : %.o

Expand Down

0 comments on commit c962e7d

Please sign in to comment.