diff options
| -rw-r--r-- | .gitlab-ci.yml | 73 | ||||
| -rw-r--r-- | GNUmakefile | 5 |
2 files changed, 57 insertions, 21 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a48fbd9..c4ac375 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -139,62 +139,95 @@ package: paths: - bin/ -test-oni-alert: +unit-test-oni-alert: stage: unit-test dependencies: - package - script: make test-oni-alert TEST_ARCHIVE=$(realpath bin/) + script: make unit-test-oni-alert TEST_ARCHIVE=$(realpath bin/) -test-oni-bookmark: +unit-test-oni-bookmark: stage: unit-test dependencies: - package - script: make test-oni-bookmark TEST_ARCHIVE=$(realpath bin/) + script: make unit-test-oni-bookmark TEST_ARCHIVE=$(realpath bin/) -test-oni-conf: +unit-test-oni-conf: stage: unit-test dependencies: - package - script: make test-oni-conf TEST_ARCHIVE=$(realpath bin/) + script: make unit-test-oni-conf TEST_ARCHIVE=$(realpath bin/) -test-oni-css: +unit-test-oni-css: stage: unit-test dependencies: - package - script: make test-oni-css TEST_ARCHIVE=$(realpath bin/) + script: make unit-test-oni-css TEST_ARCHIVE=$(realpath bin/) -test-oni-elisp: +unit-test-oni-elisp: stage: unit-test dependencies: - package - script: make test-oni-elisp TEST_ARCHIVE=$(realpath bin/) + script: make unit-test-oni-elisp TEST_ARCHIVE=$(realpath bin/) -test-oni-grep: +unit-test-oni-grep: stage: unit-test dependencies: - package - script: make test-oni-grep TEST_ARCHIVE=$(realpath bin/) + script: make unit-test-oni-grep TEST_ARCHIVE=$(realpath bin/) -test-oni-highlight-indent-guides: +unit-test-oni-highlight-indent-guides: stage: unit-test dependencies: - package - script: make test-oni-highlight-indent-guides TEST_ARCHIVE=$(realpath bin/) + script: make unit-test-oni-highlight-indent-guides TEST_ARCHIVE=$(realpath bin/) -test-oni-php: +unit-test-oni-php: stage: unit-test dependencies: - package - script: make test-oni-php TEST_ARCHIVE=$(realpath bin/) + script: make unit-test-oni-php TEST_ARCHIVE=$(realpath bin/) -integration-test: +integration-test-oni-alert: stage: integration-test image: registry.gitlab.com/ryuslash/emacs-config dependencies: - package - script: - - cd test/integration - - bats . + script: make integration-test-oni-alert TEST_ARCHIVE=$(realpath bin/) + +integration-test-oni-autohotkey: + stage: integration-test + image: registry.gitlab.com/ryuslash/emacs-config + dependencies: + - package + script: make integration-test-oni-autohotkey TEST_ARCHIVE=$(realpath bin/) + +integration-test-oni-bats: + stage: integration-test + image: registry.gitlab.com/ryuslash/emacs-config + dependencies: + - package + script: make integration-test-oni-bats TEST_ARCHIVE=$(realpath bin/) + +integration-test-oni-bookmark: + stage: integration-test + image: registry.gitlab.com/ryuslash/emacs-config + dependencies: + - package + script: make integration-test-oni-bookmark TEST_ARCHIVE=$(realpath bin/) + +integration-test-oni-docker: + stage: integration-test + image: registry.gitlab.com/ryuslash/emacs-config + dependencies: + - package + script: make integration-test-oni-docker TEST_ARCHIVE=$(realpath bin/) + +integration-test-oni-scheme: + stage: integration-test + image: registry.gitlab.com/ryuslash/emacs-config + dependencies: + - package + script: make integration-test-oni-scheme TEST_ARCHIVE=$(realpath bin/) deploy: only: diff --git a/GNUmakefile b/GNUmakefile index ee727b4..7e22dd0 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -62,7 +62,7 @@ install-%: --eval '(package-refresh-contents)' \ --eval "(package-install '$*)" -test-%: install-% +unit-test-%: install-% emacs --batch \ --load oni-package.el \ --funcall package-initialize \ @@ -71,5 +71,8 @@ test-%: install-% --eval "(setq ert-batch-backtrace-right-margin nil)" \ --funcall ert-run-tests-batch-and-exit +integration-test-%: install-% + bats test/integration/$*.bats + clean: rm -fv $(FILES) |