From d3982ccb50ea764b17c000a1e5024f9fa2b9fe42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Sat, 15 Sep 2018 12:40:19 +0200
Subject: [PATCH] CI: simplification
---
.gitlab-ci.yml | 5 +----
Makefile | 4 ++--
success.sh | 8 --------
3 files changed, 3 insertions(+), 14 deletions(-)
delete mode 100755 success.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33807da..7e293dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/Makefile b/Makefile
index 60cc7e4..80cd0c5 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/success.sh b/success.sh
deleted file mode 100755
index 650a7d0..0000000
--- a/success.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-if [[ -f ./tests/failed ]]; then
- exit 1
-elif [[ -f ./tests/pass ]]; then
- exit 0
-else
- exit 1
-fi
--
GitLab