From e81c837c51c8edb07085e1b7e399b7cd1d765427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org> Date: Thu, 19 Dec 2019 14:34:03 +0100 Subject: [PATCH] Testsuite: fix engine for testing M scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I’m not sure it has ever worked. As a consequence, remove the workaround that had apparently been implemented in tests/initval_file/ramst_initval_file.mod. --- .gitignore | 1 + tests/initval_file/ramst_initval_file.mod | 6 ------ tests/run_m_script.m | 6 +++--- tests/run_o_script.m | 4 ++-- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 6b6da23d4e..7945b29768 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ checksum # Make Check Rules *.trs +*.tls # Doc rules *.pdf diff --git a/tests/initval_file/ramst_initval_file.mod b/tests/initval_file/ramst_initval_file.mod index f6afae20b4..0d0cdabb4c 100644 --- a/tests/initval_file/ramst_initval_file.mod +++ b/tests/initval_file/ramst_initval_file.mod @@ -22,12 +22,6 @@ k = ((delt+bet)/(1.0*aa*alph))^(1/(alph-1)); c = aa*k^alph-delt*k; end; -initval_file(filename = ramst_initval_file_data); -steady; -perfect_foresight_setup(periods=200); -perfect_foresight_solver; - - initval_file(filename = ramst_initval_file_data_row_vec_mat); steady; perfect_foresight_setup(periods=200); diff --git a/tests/run_m_script.m b/tests/run_m_script.m index fe51168cce..6085fd5d09 100644 --- a/tests/run_m_script.m +++ b/tests/run_m_script.m @@ -1,4 +1,4 @@ -% Copyright (C) 2015 Dynare Team +% Copyright (C) 2015-2019 Dynare Team % % This file is part of Dynare. % @@ -24,7 +24,7 @@ addpath([top_test_dir filesep 'utils']); cd(directory); try - mscript; + eval(mscript); testFailed = false; catch exception printMakeCheckMatlabErrMsg(strtok(getenv('FILESTEM')), exception); @@ -51,4 +51,4 @@ else fprintf(fid,':list-of-passed-tests: %s\n', [name '.m']); end fclose(fid); -exit; \ No newline at end of file +exit; diff --git a/tests/run_o_script.m b/tests/run_o_script.m index 1db9ecbed2..6e0ec09fbb 100644 --- a/tests/run_o_script.m +++ b/tests/run_o_script.m @@ -1,4 +1,4 @@ -## Copyright (C) 2015-2016 Dynare Team +## Copyright (C) 2015-2019 Dynare Team ## ## This file is part of Dynare. ## @@ -26,7 +26,7 @@ addpath([top_test_dir filesep 'utils']); cd(directory); try - mscript; + eval(mscript); testFailed = false; catch printMakeCheckOctaveErrMsg(getenv('FILESTEM'), lasterror); -- GitLab