From 1bc965625c9294beb4a67f807e2d86c7691f8a8b Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Wed, 23 Sep 2015 13:56:16 +0200 Subject: [PATCH] test suite: adjust display of results appropriately depending on whether octave/matlab or both were used --- tests/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1241bbaa4..8a58c443e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -452,18 +452,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)"