From 0926fe064f975b45f2f9776f4c6b1655be2217c2 Mon Sep 17 00:00:00 2001 From: Houtan Bastani <houtan@dynare.org> Date: Tue, 3 Sep 2019 13:00:18 +0200 Subject: [PATCH] update tests to account for report created in different directory --- .gitlab-ci.yml | 4 ++-- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39022b9..1f51a5b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ testsuite_matlab: - make check-matlab artifacts: paths: - - test/report.pdf + - test/my/report/dir/report.pdf testsuite_octave: stage: test @@ -15,4 +15,4 @@ testsuite_octave: - make check-octave artifacts: paths: - - test/report.pdf + - test/my/report/dir/report.pdf diff --git a/Makefile b/Makefile index 450b157..41ac96e 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ all: check-octave check-matlab check-octave: @cd test ;\ - $(OCTAVE) --no-init-file --silent --no-history --eval "addpath([pwd() '/../dseries/src']); addpath([pwd() '/../src']); runtest;" && [ -f report.pdf ] + $(OCTAVE) --no-init-file --silent --no-history --eval "addpath([pwd() '/../dseries/src']); addpath([pwd() '/../src']); runtest;" && [ -f my/report/dir/report.pdf ] check-matlab: - @$(MATLAB) -nosplash -nodisplay -r "addpath dseries/src; addpath src; cd test; runtest; quit" && [ -f test/report.pdf ] + @$(MATLAB) -nosplash -nodisplay -r "addpath dseries/src; addpath src; cd test; runtest; quit" && [ -f test/my/report/dir/report.pdf ] -- GitLab