From 00b2ba6aef51a423df0eda9442588a9c0f33cc93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemian=20=28Hermes=29?= <stepan@dynare.org> Date: Sat, 22 Dec 2018 12:24:40 +0100 Subject: [PATCH] Reverted last change done in Makefile. --- Makefile | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 024e6ca..dc90165 100644 --- a/Makefile +++ b/Makefile @@ -3,25 +3,12 @@ MATLAB=`which matlab` all: check-octave check-matlab -check-octave: check-octave-dseries check-octave-dates +check-octave: + @cd tests ;\ + $(OCTAVE) --no-init-file --silent --no-history --eval "addpath([pwd() '/../m-unit-tests/src']); runalltests" && [ ! -f ./failed ] && [ -f ./pass ] -check-matlab: check-matlab-dseries check-matlab-dates - - -check-octave-dseries: - @cd tests/dseries ;\ - $(OCTAVE) --no-init-file --silent --no-history --eval "addpath([pwd() '/../../m-unit-tests/src']); runalltests" && [ ! -f ./failed ] && [ -f ./pass ] - -check-octave-dates: - @cd tests/dates ;\ - $(OCTAVE) --no-init-file --silent --no-history --eval "addpath([pwd() '/../../m-unit-tests/src']); runalltests" && [ ! -f ./failed ] && [ -f ./pass ] - -check-matlab-dseries: - @$(MATLAB) -nosplash -nodisplay -r "addpath m-unit-tests/src; cd tests/dseries; runalltests; quit" && [ ! -f ./tests/failed ] && [ -f ./tests/pass ] - -check-matlab-dates: - @$(MATLAB) -nosplash -nodisplay -r "addpath m-unit-tests/src; cd tests/dates; runalltests; quit" && [ ! -f ./tests/failed ] && [ -f ./tests/pass ] +check-matlab: + @$(MATLAB) -nosplash -nodisplay -r "addpath m-unit-tests/src; cd tests; runalltests; quit" && [ ! -f ./tests/failed ] && [ -f ./tests/pass ] check-clean: - rm -f tests/dseries/*_test_*.m tests/dseries/*.csv tests/dseries/*.xls tests/dseries/*.xlsx tests/dseries/*.mat tests/dseries/failed tests/dseries/datafile_for_test - rm -f tests/dates/*_test_*.m tests/dates/*.csv tests/dates/*.xls tests/dates/*.xlsx tests/dates/*.mat tests/dates/failed tests/dates/datafile_for_test + rm -f tests/*_test_*.m tests/*.csv tests/*.xls tests/*.xlsx tests/*.mat tests/failed tests/datafile_for_test -- GitLab