Commit e2659938 authored by Stéphane Adjemian's avatar Stéphane Adjemian

Merge branch 'master' into 'master'

CI: simplification

See merge request Dynare/dseries!35
parents 1a523644 d3982ccb
......@@ -7,20 +7,17 @@ before_script:
- git clone https://git.dynare.org/Dynare/m-unit-tests
- wget http://www.dynare.org/x13/x13.zip
- unzip x13.zip
- cp -r binaries/linux externals/x13
testsuite_matlab:
stage: test
script:
- cp -r binaries/linux externals/x13
- make check-matlab
- ./success.sh
testsuite_octave:
stage: test
variables:
OPENBLAS_NUM_THREADS: 1
script:
- cp -r binaries/linux externals/x13
- make check-octave
- ./success.sh
allow_failure: true
......@@ -5,10 +5,10 @@ all: check-octave check-matlab
check-octave:
@cd tests ;\
$(OCTAVE) --no-init-file --silent --no-history --eval "addpath ../m-unit-tests/src; addpath ../dates/src; runalltests"
$(OCTAVE) --no-init-file --silent --no-history --eval "addpath ../m-unit-tests/src; addpath ../dates/src; runalltests" && [ ! -f ./failed ] && [ -f ./pass ]
check-matlab:
@$(MATLAB) -nosplash -nodisplay -r "addpath m-unit-tests/src; addpath dates/src; cd tests; runalltests; quit"
@$(MATLAB) -nosplash -nodisplay -r "addpath m-unit-tests/src; addpath dates/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
#!/bin/bash
if [[ -f ./tests/failed ]]; then
exit 1
elif [[ -f ./tests/pass ]]; then
exit 0
else
exit 1
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment