stepan
/
dynare
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "test suite: adjust display of results appropriately depending on whether octave/matlab or both were used" 

This reverts commit 1bc965625c.
time-shift
Stéphane Adjemian (Charybdis) 2015-10-06 16:37:50 +02:00
parent 4825745047
commit 62b1c85fd4
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Makefile.am
View File

@ -452,20 +452,18 @@ EXTRA_DIST = \
optimizers/fs2000.common.inc optimizers/fs2000.common.inc
TARGETS = TARGETS =
TEXTOUT =
if HAVE_CMD_LINE_MATLAB if HAVE_CMD_LINE_MATLAB
TARGETS += check-matlab TARGETS += check-matlab
TEXTOUT += run_test_matlab_output.txt
endif endif
if HAVE_OCTAVE if HAVE_OCTAVE
TARGETS += check-octave TARGETS += check-octave
TEXTOUT += run_test_octave_output.txt
endif endif
check-local: $(TARGETS) $(TEXTOUT) check-local: $(TARGETS)
@cat $(TEXTOUT) @cat run_test_matlab_output.txt
@cat run_test_octave_output.txt
check-matlab: $(M_XFAIL_TRS_FILES) $(M_TRS_FILES) 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)"