From 62b1c85fd4638cb01435d35ed2458a538d897d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Charybdis=29?= Date: Tue, 6 Oct 2015 16:37:50 +0200 Subject: [PATCH] Revert "test suite: adjust display of results appropriately depending on whether octave/matlab or both were used" This reverts commit 1bc965625c9294beb4a67f807e2d86c7691f8a8b. --- tests/Makefile.am | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8a58c443e..1241bbaa4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -452,20 +452,18 @@ 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) $(TEXTOUT) - @cat $(TEXTOUT) +check-local: $(TARGETS) + @cat run_test_matlab_output.txt + @cat run_test_octave_output.txt check-matlab: $(M_XFAIL_TRS_FILES) $(M_TRS_FILES) ./read_trs_files.sh "$(M_TRS_FILES)" "$(M_XFAIL_TRS_FILES)"