aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2019-03-28 20:19:07 -0700
committerGravatar Tom Willemse2019-03-28 20:24:54 -0700
commit68edabde0cda9faeb5df4eff1a3f0976039beb6f (patch)
treede3a656545b883a786eb839e75f3f1df2fa013ad
parent052fafd9de90cc2ba14cae184d35f32110233102 (diff)
downloademacs-config-68edabde0cda9faeb5df4eff1a3f0976039beb6f.tar.gz
emacs-config-68edabde0cda9faeb5df4eff1a3f0976039beb6f.zip
Move test dependencies out of Makefile
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--GNUmakefile2
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