Testsuite: move load_octave_packages.m to utils/ subdirectory

tests/.gitignore

@@ -90,7 +90,7 @@ wsOct
 !/kalman_steady_state/test1.m
 !/kronecker/nash_matrices.mat
 !/kronecker/test_kron.m
-!/load_octave_packages.m
+!/utils/load_octave_packages.m
 !/ls2003/data_ca1.m
 !/logarithmicreduction.m
 !/measurement_errors/data_ca1.m

tests/Makefile.am

@@ -1302,7 +1302,7 @@ EXTRA_DIST = \
 	run_test_matlab.m \
 	run_test_octave.m \
 	run_m_script.m \
-	load_octave_packages.m \
+	utils/load_octave_packages.m \
 	$(MODFILES) \
 	$(PARTICLEFILES) \
 	$(XFAIL_MODFILES) \

tests/run_all_unit_tests.m

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

tests/run_o_script.m

@@ -1,4 +1,4 @@
-## Copyright © 2015-2019 Dynare Team
+## Copyright © 2015-2023 Dynare Team
 ##
 ## This file is part of Dynare.
 ##
@@ -15,11 +15,11 @@
 ## You should have received a copy of the GNU General Public License
 ## along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
 
-load_octave_packages
-
 top_test_dir = getenv('TOP_TEST_DIR');
 addpath([top_test_dir filesep 'utils']);
 
+load_octave_packages
+
 [mfile, name] = strtok(getenv('FILESTEM'));
 
 [directory, mscript, ext] = fileparts([top_test_dir '/' mfile]);

tests/run_reporting_test_octave.m

@@ -1,4 +1,4 @@
-## Copyright © 2013-2022 Dynare Team
+## Copyright © 2013-2023 Dynare Team
 ##
 ## This file is part of Dynare.
 ##
@@ -15,11 +15,12 @@
 ## You should have received a copy of the GNU General Public License
 ## along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
 
-load_octave_packages
-
 top_test_dir = getenv('TOP_TEST_DIR');
+addpath([top_test_dir filesep 'utils']);
 addpath([top_test_dir filesep '..' filesep 'matlab']);
 
+load_octave_packages
+
 ## Test Dynare Version
 if !strcmp(dynare_version(), getenv("DYNARE_VERSION"))
     error("Incorrect version of Dynare is being tested")

tests/run_test_octave.m

@@ -1,4 +1,4 @@
-## Copyright © 2009-2022 Dynare Team
+## Copyright © 2009-2023 Dynare Team
 ##
 ## This file is part of Dynare.
 ##
@@ -21,12 +21,12 @@
 ## 'wsOct', and reloaded after Dynare has finished (this is necessary since
 ## Dynare does a 'clear -all').
 
-load_octave_packages
-
 top_test_dir = getenv('TOP_TEST_DIR');
 addpath([top_test_dir filesep 'utils']);
 addpath([top_test_dir filesep '..' filesep 'matlab']);
 
+load_octave_packages
+
 ## Test Dynare Version
 if !strcmp(dynare_version(), getenv("DYNARE_VERSION"))
     error("Incorrect version of Dynare is being tested")