From 6396794b5b048d472ff0d73f6fe7dee45a714424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?= Date: Thu, 8 Oct 2015 23:20:08 +0200 Subject: [PATCH] Revert "Revert "test suite: adjust display of results appropriately depending on whether octave/matlab or both were used"" This reverts commit 62b1c85fd4638cb01435d35ed2458a538d897d2f. --- tests/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index c500f95f9..cdd6e45c9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -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)"