Testsuite: do not add top-level tests/ directory to the MATLAB/Octave path

This directory is cluttered with so many files that it creates problem (e.g.
dynare-command-options/ramst.mod was broken under Octave because of this).

Move files that have to be found through the path in a utils/ subdirectory.

tests/Makefile.am

@@ -777,8 +777,8 @@ EXTRA_DIST = \
 	homotopy/common.mod \
 	block_bytecode/ls2003.mod \
 	fs2000_ssfile_aux.m \
-	printMakeCheckMatlabErrMsg.m \
-	printMakeCheckOctaveErrMsg.m \
+	utils/printMakeCheckMatlabErrMsg.m \
+	utils/printMakeCheckOctaveErrMsg.m \
 	fataltest.m \
 	AIM/data_ca1.m \
 	AIM/fsdat.m \

tests/run_all_unitary_tests.m

@@ -16,7 +16,6 @@
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
 top_test_dir = getenv('TOP_TEST_DIR');
-addpath(top_test_dir);
 addpath([top_test_dir filesep '..' filesep 'matlab']);
 dynare_config([], 0);
 

tests/run_block_byte_tests_matlab.m

@@ -24,7 +24,7 @@
 % wsMat' within a 'catch' block will overwrite the last exception.
 
 top_test_dir = getenv('TOP_TEST_DIR');
-addpath(top_test_dir);
+addpath([top_test_dir filesep 'utils']);
 addpath([top_test_dir filesep '..' filesep 'matlab']);
 
 % Test Dynare Version

tests/run_block_byte_tests_octave.m

@@ -22,7 +22,7 @@
 ## Dynare does a 'clear -all').
 
 top_test_dir = getenv('TOP_TEST_DIR');
-addpath(top_test_dir);
+addpath([top_test_dir filesep 'utils']);
 addpath([top_test_dir filesep '..' filesep 'matlab']);
 
 ## Test Dynare Version

tests/run_m_script.m

@@ -16,6 +16,8 @@
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
 top_test_dir = getenv('TOP_TEST_DIR');
+addpath([top_test_dir filesep 'utils']);
+
 [mfile, name] = strtok(getenv('FILESTEM'));
 
 [directory, mscript, ext] = fileparts([top_test_dir '/' mfile]);

tests/run_o_script.m

@@ -18,6 +18,8 @@
 load_octave_packages
 
 top_test_dir = getenv('TOP_TEST_DIR');
+addpath([top_test_dir filesep 'utils']);
+
 [mfile, name] = strtok(getenv('FILESTEM'));
 
 [directory, mscript, ext] = fileparts([top_test_dir '/' mfile]);

tests/run_reporting_test_matlab.m

@@ -16,7 +16,6 @@
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
 top_test_dir = getenv('TOP_TEST_DIR');
-addpath(top_test_dir);
 addpath([top_test_dir filesep '..' filesep 'matlab']);
 
 % Test Dynare Version

tests/run_reporting_test_octave.m

@@ -18,7 +18,6 @@
 load_octave_packages
 
 top_test_dir = getenv('TOP_TEST_DIR');
-addpath(top_test_dir);
 addpath([top_test_dir filesep '..' filesep 'matlab']);
 
 ## Test Dynare Version

tests/run_test_matlab.m

@@ -16,7 +16,7 @@
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
 top_test_dir = getenv('TOP_TEST_DIR');
-addpath(top_test_dir);
+addpath([top_test_dir filesep 'utils']);
 addpath([top_test_dir filesep '..' filesep 'matlab']);
 
 % Test Dynare Version

tests/run_test_octave.m

@@ -24,7 +24,7 @@
 load_octave_packages
 
 top_test_dir = getenv('TOP_TEST_DIR');
-addpath(top_test_dir);
+addpath([top_test_dir filesep 'utils']);
 addpath([top_test_dir filesep '..' filesep 'matlab']);
 
 ## Test Dynare Version