From b75d175b1cb0f468d44bc1a855eb86910c43777e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Adjemia=20=28Scylla=29?= <stepan@dynare.org> Date: Wed, 23 Jan 2019 17:18:22 +0100 Subject: [PATCH] Fixed local testsuite. Fixed dependency on m-unit-tests toolbox. --- .gitignore | 5 ++++- Makefile | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 670dfeb..e02dd85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ *~ .DS_Store + externals/* +m-unit-tests/* + src/git.info -src/git.last-commit-hash \ No newline at end of file +src/git.last-commit-hash diff --git a/Makefile b/Makefile index dc90165..0fb0d14 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,17 @@ MATLAB=`which matlab` all: check-octave check-matlab -check-octave: +m-unit-tests/src/mtest.m: + git clone https://git.dynare.org/Dynare/m-unit-tests + +check-octave: m-unit-tests/src/mtest.m @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: m-unit-tests/src/mtest.m @$(MATLAB) -nosplash -nodisplay -r "addpath m-unit-tests/src; cd tests; runalltests; quit" && [ ! -f ./tests/failed ] && [ -f ./tests/pass ] check-clean: rm -f tests/*_test_*.m tests/*.csv tests/*.xls tests/*.xlsx tests/*.mat tests/failed tests/datafile_for_test + rm -f git.info git.last-commit-hash tests/pass tests/failed tests/*.spc + rm -rf m-unit-tests -- GitLab