Skip to content

Commit

Permalink
Redirect output again.
Browse files Browse the repository at this point in the history
The panic action doesn't work for me, and I'd rather fight with
the makefiles on segv than see hundreds of lines of crap output
the other 99% of the time, when nothing is wrong
  • Loading branch information
alandekok committed Mar 23, 2014
1 parent 719168e commit 2ea7654
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/tests/keywords/all.mk
Expand Up @@ -85,12 +85,9 @@ KEYWORD_LIBS := $(addsuffix .la,$(addprefix rlm_,$(KEYWORD_MODULES)))
# Otherwise, check the log file for a parse error which matches the
# ERROR line in the input.
#
# Only redirect STDOUT, which should contain details of why the test failed.
# Don't molest STDERR as this may be used to receive output from a debugger.
$(BUILD_DIR)/tests/keywords/%: $(DIR)/% $(BUILD_DIR)/tests/keywords/%.attrs $(TESTBINDIR)/unittest | $(BUILD_DIR)/tests/keywords $(KEYWORD_RADDB) $(KEYWORD_LIBS) build.raddb
@echo UNIT-TEST $(notdir $@)
@if ! KEYWORD=$(notdir $@) $(TESTBIN)/unittest -D share -d src/tests/keywords/ -i $@.attrs -f $@.attrs -xx > $@.log; then \
cat $@.log; \
@if ! KEYWORD=$(notdir $@) $(TESTBIN)/unittest -D share -d src/tests/keywords/ -i $@.attrs -f $@.attrs -xx > $@.log 2>&1; then \
if ! grep ERROR $< 2>&1 > /dev/null; then \
cat $@.log; \
echo "# $@.log"; \
Expand Down

0 comments on commit 2ea7654

Please sign in to comment.