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

This reverts commit 62b1c85fd4.
time-shift
Stéphane Adjemian (Charybdis) 2015-10-08 23:20:08 +02:00
parent 276c34f394
commit 6396794b5b
1 changed files with 5 additions and 3 deletions

View File

@ -453,18 +453,20 @@ EXTRA_DIST = \
optimizers/fs2000.common.inc
TARGETS =
TEXTOUT =
if HAVE_CMD_LINE_MATLAB
TARGETS += check-matlab
TEXTOUT += run_test_matlab_output.txt
endif
if HAVE_OCTAVE
TARGETS += check-octave
TEXTOUT += run_test_octave_output.txt
endif
check-local: $(TARGETS)
@cat run_test_matlab_output.txt
@cat run_test_octave_output.txt
check-local: $(TARGETS) $(TEXTOUT)
@cat $(TEXTOUT)
check-matlab: $(M_XFAIL_TRS_FILES) $(M_TRS_FILES)
./read_trs_files.sh "$(M_TRS_FILES)" "$(M_XFAIL_TRS_FILES)"