Skip to content
Snippets Groups Projects
Commit e0ee6dae authored by Dóra Kocsis's avatar Dóra Kocsis
Browse files

bump minimal MATLAB version to R2015a, remove Octave test suite

parent 48b96dc1
No related branches found
No related tags found
No related merge requests found
Pipeline #3554 failed
...@@ -10,9 +10,9 @@ test_matlab: ...@@ -10,9 +10,9 @@ test_matlab:
script: script:
- make check-matlab - make check-matlab
test_octave: test_old_matlab:
stage: test stage: test
variables: variables:
OPENBLAS_NUM_THREADS: 1 MATLAB: /usr/local/MATLAB/R2015a/bin/matlab
script: script:
- make check-octave - make check-matlab
\ No newline at end of file \ No newline at end of file
OCTAVE ?= octave-cli
MATLAB ?= $(shell which matlab) MATLAB ?= $(shell which matlab)
all: check-matlab
m-unit-tests/src/mtest.m: m-unit-tests/src/mtest.m:
git clone https://git.dynare.org/Dynare/m-unit-tests 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: m-unit-tests/src/mtest.m check-matlab: m-unit-tests/src/mtest.m
@$(MATLAB) -nosplash -nodisplay -r "addpath([pwd '/m-unit-tests/src']); cd tests; runalltests; quit" && [ ! -f ./tests/failed ] && [ -f ./tests/pass ] @$(MATLAB) -nosplash -nodisplay -r "addpath([pwd '/m-unit-tests/src']); cd tests; runalltests; quit" && [ ! -f ./tests/failed ] && [ -f ./tests/pass ]
......
...@@ -50,8 +50,8 @@ P = cellfun(@(c)[mdbnomics_src_root c], p, 'uni', false); ...@@ -50,8 +50,8 @@ P = cellfun(@(c)[mdbnomics_src_root c], p, 'uni', false);
addpath(P{:}); addpath(P{:});
% Check minimal MATLAB and Octave requirements. % Check minimal MATLAB and Octave requirements.
if (isoctave && octave_ver_less_than('6')) || matlab_ver_less_than('8.5') if matlab_ver_less_than('8.5')
error('The minimum MATLAB requirement of this package is R2015a, and the minimum Octave requirement of this package is version 6.'); error('The minimum MATLAB requirement of this package is R2015a.');
end end
assignin('caller', 'mdbnomics_src_root', mdbnomics_src_root); assignin('caller', 'mdbnomics_src_root', mdbnomics_src_root);
...@@ -58,7 +58,6 @@ for gg = 1:size(grouped_series, 2) ...@@ -58,7 +58,6 @@ for gg = 1:size(grouped_series, 2)
posted_series_list = jsonencode(posted_series_list); posted_series_list = jsonencode(posted_series_list);
end end
posted_series_list = transform_json_request(posted_series_list);
json_request = sprintf('{"filters":%s,"series":%s}', dbnomics_filters, posted_series_list); json_request = sprintf('{"filters":%s,"series":%s}', dbnomics_filters, posted_series_list);
try try
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment