From 68edabde0cda9faeb5df4eff1a3f0976039beb6f Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 28 Mar 2019 20:19:07 -0700 Subject: [PATCH] Move test dependencies out of Makefile --- .gitlab-ci.yml | 2 +- GNUmakefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e001702..2d0c02c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: test-oni-bookmark: stage: test - script: make test-oni-bookmark + script: make test-oni-bookmark DEPS="oni-data-dir" test-oni-alert: stage: test diff --git a/GNUmakefile b/GNUmakefile index 3f364b8..c33f856 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -18,7 +18,7 @@ test-%: --load ert \ --load "test/$*-test.el" \ --funcall package-initialize \ - --eval "(package-install-file \"oni-data-dir.el\")" \ + $(foreach DEP,$(DEPS),--eval "(package-install-file \"$(DEP).el\")") \ --eval "(package-install-file \"$*.el\")" \ --funcall ert-run-tests-batch-and-exit