Commit 12439d5f authored by Sébastien Villemot's avatar Sébastien Villemot

Ensure that test summary is displayed even if there is a test failure

(cherry picked from commit a03fab76)
parent e7c92c33
......@@ -832,29 +832,19 @@ EXTRA_DIST = \
prior_posterior_function/posterior_function_demo.m
TARGETS =
TEXTOUT =
if HAVE_CMD_LINE_MATLAB
TARGETS += check-matlab
TEXTOUT += run_test_matlab_output.txt
check-local: check-matlab
endif
if HAVE_OCTAVE
TARGETS += check-octave
TEXTOUT += run_test_octave_output.txt
check-local: check-octave
endif
check-local: $(TEXTOUT)
@cat $(TEXTOUT)
$(TEXTOUT): $(TARGETS)
check-matlab: $(M_XFAIL_TRS_FILES) $(M_TRS_FILES)
./read_trs_files.sh "$(M_TRS_FILES)" "$(M_XFAIL_TRS_FILES)"
@./read_trs_files.sh "$(M_TRS_FILES)" "$(M_XFAIL_TRS_FILES)"
check-octave: $(O_XFAIL_TRS_FILES) $(O_TRS_FILES)
./read_trs_files.sh "$(O_TRS_FILES)" "$(O_XFAIL_TRS_FILES)"
@./read_trs_files.sh "$(O_TRS_FILES)" "$(O_XFAIL_TRS_FILES)"
%.m.trs %.m.log: %.mod
@echo "`tput bold``tput setaf 8`MATLAB: $(CURDIR)/$*... `tput sgr0`"
......
......@@ -55,7 +55,7 @@ else
outfile=run_test_matlab_output.txt
fi
# Print Output
# Print Output (to stdout and to a file)
{
echo '================================'
echo "DYNARE MAKE CHECK $prg RESULTS"
......@@ -88,7 +88,7 @@ fi
fi
echo "$timing" | tr ':' '\n' | sed -e 's/^[ \t]*//;/^$/d;s/^|[ ]/| * /'
echo
} > $outfile
} | tee $outfile
# Exit with error code if some tests failed
((failed + xpassed == 0))
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment