This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git
The following commit(s) were added to refs/heads/main by this push:
new 3294a72ac test(make): remove `elixir` target, rename `elixir-suite` to
`elixir`
3294a72ac is described below
commit 3294a72acea7029598a3eeddddda0fd2006512f1
Author: Jan Lehnardt <j...@apache.org>
AuthorDate: Thu Jul 27 11:10:39 2023 +0200
test(make): remove `elixir` target, rename `elixir-suite` to `elixir`
The `elixir` target should run the default set that passes all tests.
The old target ran search tests that would fail without a separate
clouseau setup step. The new `elixir` target is what we actually run
in CI. This should prevent developer confusion when things pass in CI
but fail locally or vice versa.
---
Makefile | 25 ++++++++-----------------
Makefile.win | 23 ++++++++---------------
README-DEV.rst | 10 +++++-----
build-aux/Jenkinsfile.full | 4 ++--
4 files changed, 23 insertions(+), 39 deletions(-)
diff --git a/Makefile b/Makefile
index 12c433056..231fbb669 100644
--- a/Makefile
+++ b/Makefile
@@ -155,7 +155,7 @@ check: all
@$(MAKE) exunit
@$(MAKE) eunit
@$(MAKE) mango-test
- @$(MAKE) elixir-suite
+ @$(MAKE) elixir
@$(MAKE) weatherreport-test
@$(MAKE) nouveau-test
@@ -241,15 +241,6 @@ ifeq ($(with_nouveau), 0)
exclude_nouveau=--exclude nouveau
endif
-.PHONY: elixir
-elixir: export MIX_ENV=integration
-elixir: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
-elixir: elixir-init devclean
- @dev/run "$(TEST_OPTS)" -a adm:pass -n 1 \
- --enable-erlang-views \
- --locald-config test/elixir/test/config/test-config.ini \
- --no-eval 'mix test --trace --exclude without_quorum_test
--exclude with_quorum_test $(exclude_nouveau) $(EXUNIT_OPTS)'
-
.PHONY: elixir-init
elixir-init: MIX_ENV=integration
elixir-init: config.erl
@@ -269,17 +260,17 @@ elixir-cluster-with-quorum: elixir-init devclean
--degrade-cluster 1 \
--no-eval 'mix test --trace --only with_quorum_test
$(EXUNIT_OPTS)'
-.PHONY: elixir-suite
-# target: elixir-suite - Run Elixir-based integration tests
-elixir-suite: export MIX_ENV=integration
-elixir-suite: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
-elixir-suite: elixir-init devclean
- @dev/run -n 1 -q -a adm:pass \
+.PHONY: elixir
+# target: elixir - Run Elixir-based integration tests
+elixir: export MIX_ENV=integration
+elixir: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
+elixir: elixir-init devclean
+ @dev/run "$(TEST_OPTS)" -n 1 -q -a adm:pass \
--enable-erlang-views \
--no-join \
--locald-config test/elixir/test/config/test-config.ini \
--erlang-config rel/files/eunit.config \
- --no-eval 'mix test --trace --include
test/elixir/test/config/suite.elixir --exclude
test/elixir/test/config/skip.elixir'
+ --no-eval 'mix test --trace --include
test/elixir/test/config/suite.elixir --exclude
test/elixir/test/config/skip.elixir $(EXUNIT_OPTS)'
.PHONY: elixir-search
# target: elixir-search - Run search tests, requires a running Clouseau
instance
diff --git a/Makefile.win b/Makefile.win
index 4c8cb6f04..37ab09511 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -143,7 +143,7 @@ check: all
@$(MAKE) exunit
@$(MAKE) eunit
@$(MAKE) mango-test
- @$(MAKE) elixir-suite
+ @$(MAKE) elixir
@$(MAKE) nouveau-test
ifdef apps
@@ -214,13 +214,6 @@ python-black-update: .venv/bin/black
--exclude="build/|buck-out/|dist/|_build/|\.git/|\.hg/|\.mypy_cache/|\.nox/|\.tox/|\.venv/|src/erlfmt|src/rebar/pr2relnotes.py|src/fauxton"
\
build-aux dev\run dev\format_*.py src\mango\test
src\docs\src\conf.py src\docs\ext .
-.PHONY: elixir
-elixir: export MIX_ENV=integration
-elixir: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
-elixir: elixir-init elixir-check-formatted elixir-credo devclean
- @dev\run $(TEST_OPTS) -a adm:pass -n 1 --enable-erlang-views \
- --locald-config test/elixir/test/config/test-config.ini \
- --no-eval 'mix test --trace --exclude without_quorum_test --exclude
with_quorum_test $(EXUNIT_OPTS)'
.PHONY: elixir-init
elixir-init: MIX_ENV=test
@@ -241,17 +234,17 @@ elixir-cluster-with-quorum: elixir-init
elixir-check-formatted elixir-credo devc
--degrade-cluster 1 \
--no-eval 'mix test --trace --only with_quorum_test
$(EXUNIT_OPTS)'
-.PHONY: elixir-suite
-# target: elixir-suite - Run Elixir-based integration tests
-elixir-suite: export MIX_ENV=integration
-elixir-suite: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
-elixir-suite: elixir-init devclean
- @dev\run -n 1 -q -a adm:pass \
+.PHONY: elixir
+# target: elixir - Run Elixir-based integration tests
+elixir: export MIX_ENV=integration
+elixir: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
+elixir: elixir-init devclean
+ @dev\run "$(TEST_OPTS)" -n 1 -q -a adm:pass \
--enable-erlang-views \
--no-join \
--locald-config test/elixir/test/config/test-config.ini \
--erlang-config rel/files/eunit.config \
- --no-eval 'mix test --trace --include
test\elixir\test\config\suite.elixir --exclude
test\elixir\test\config\skip.elixir'
+ --no-eval 'mix test --trace --include
test\elixir\test\config\suite.elixir --exclude
test\elixir\test\config\skip.elixir $(EXUNIT_OPTS)'
.PHONY: elixir-search
# target: elixir-search - Run search tests, requires a running Clouseau
instance
diff --git a/README-DEV.rst b/README-DEV.rst
index af6c9194b..d698173c1 100644
--- a/README-DEV.rst
+++ b/README-DEV.rst
@@ -191,11 +191,11 @@ To run all the tests use run::
make check
You can also run each test suite individually via the ``eunit``,
``mango-test``,
-``elixir-suite``, and ``weatherreport-test`` targets::
+``elixir``, and ``weatherreport-test`` targets::
make eunit
make mango-test
- make elixir-suite
+ make elixir
make weatherreport-test
Erlang Unit Tests
@@ -226,13 +226,13 @@ to specify exact ``rebar eunit`` options::
Elixir Integration Tests
~~~~~~~~~~~~~~~~~~~~~~~~
-All the Elixir-based integration tests could be by the `elixir-suite`
+All the Elixir-based integration tests could be by the `elixir`
target::
- make elixir-suite
+ make elixir
There is an additional suite for Dreyfus, which is not run
-automatically by either the ``elixir-suite`` or the ``check`` target
+automatically by either the ``elixir`` or the ``check`` target
but it could be done manually via the corresponding target::
make elixir-search
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 293cf2954..74bfbc353 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -152,7 +152,7 @@ def generateNativeStage(platform) {
sh "${configure(meta[platform])}"
sh '$MAKE'
sh '$MAKE eunit'
- sh '$MAKE elixir-suite'
+ sh '$MAKE elixir'
sh '$MAKE exunit'
sh '$MAKE mango-test'
sh '$MAKE weatherreport-test'
@@ -206,7 +206,7 @@ def generateContainerStage(platform) {
sh "${configure(meta[platform])}"
sh 'make'
sh 'make eunit'
- sh 'make elixir-suite'
+ sh 'make elixir'
sh 'make exunit'
sh 'make mango-test'
sh 'make weatherreport-test'
