You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2026/01/17 22:07:33 UTC
(couchdb) branch main updated (8dfa59db1 -> d2833ff5a)
This is an automated email from the ASF dual-hosted git repository.
ronny pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git
from 8dfa59db1 Disable FreeBSD ARM64 for now
new d2b8a0e3b feat: parallel eunit for windows
new 54db7f4e5 Some windows fixes
new d2833ff5a dev: Adding more Makefile.win fixes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile.win | 57 ++++++++++++++++++---------------------
src/couch/include/couch_eunit.hrl | 2 +-
2 files changed, 27 insertions(+), 32 deletions(-)
(couchdb) 02/03: Some windows fixes
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ronny pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 54db7f4e5cbe7eed5e5ffa2fd578afc0fbd3d11e
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Wed Jan 14 05:23:43 2026 +0100
Some windows fixes
---
Makefile.win | 33 +++++++++++++++++++--------------
src/couch/include/couch_eunit.hrl | 2 +-
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/Makefile.win b/Makefile.win
index 489db2a0f..4c62ad859 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -104,7 +104,7 @@ endif
.PHONY: all
# target: all - Build everything
-all: couch fauxton docs nouveau
+all: couch-core fauxton docs extra/nouveau
.PHONY: help
@@ -118,9 +118,9 @@ help:
################################################################################
-.PHONY: couch
-# target: couch - Build CouchDB core, use ERL_COMPILER_OPTIONS to provide custom compiler's options
-couch: config.erl
+.PHONY: couch-core
+# target: couch-core - Build CouchDB core, use ERL_COMPILER_OPTIONS to provide custom compiler's options
+couch-core: config.erl
@set COUCHDB_VERSION=$(COUCHDB_VERSION) && set COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) && $(REBAR) compile $(COMPILE_OPTS)
ifeq ($(with_spidermonkey), true)
@copy src\couch\priv\couchjs.exe bin
@@ -163,10 +163,16 @@ endif
# target: eunit - Run EUnit tests, use EUNIT_OPTS to provide custom options
.PHONY: eunit $(EUNIT_SUBDIRS)
+
+eunit: export ERL_AFLAGS = -config $(CURDIR)/rel/files/eunit.config
+eunit: export COUCHDB_QUERY_SERVER_JAVASCRIPT = $(CURDIR)/bin/couchjs $(CURDIR)/share/server/main.js
+eunit: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
+eunit: $(EUNIT_SUBDIRS)
+
$(EUNIT_SUBDIRS):
- @rd /s /q tmp/$@
- @$(REBAR) setup_eunit app=$@ >/dev/null
- @BUILDDIR=$(CURDIR)/tmp/$@ COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR) -r eunit $(EUNIT_OPTS) apps=$@ & rd /s /q tmp/$@
+ @rm -rf tmp\$@
+ @$(REBAR) setup_eunit app=$@
+ @set BUILDDIR=$(CURDIR)/tmp/$@ & set COUCHDB_VERSION=$(COUCHDB_VERSION) & set COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) & $(REBAR) -r eunit $(EUNIT_OPTS) apps=$@
# cat together couch_log files after running eunit test
.PHONY: catlogs
@@ -513,12 +519,12 @@ derived:
# Nouveau
################################################################################
-.PHONY: nouveau
+.PHONY: extra/nouveau
# target: nouveau - Build nouveau
-nouveau:
+extra/nouveau:
ifeq ($(with_nouveau), true)
- @cd nouveau && $(GRADLE) spotlessApply
- @cd nouveau && $(GRADLE) build -x test
+ @cd extra/nouveau && $(GRADLE) spotlessApply
+ @cd extra/nouveau && $(GRADLE) build -x test
endif
.PHONY: nouveau-test
@@ -526,16 +532,15 @@ endif
nouveau-test: nouveau-test-gradle nouveau-test-elixir
.PHONY: nouveau-test-gradle
-nouveau-test-gradle: couch nouveau
+nouveau-test-gradle: couch-core extra/nouveau
ifeq ($(with_nouveau), true)
@cd nouveau && $(GRADLE) test --info --rerun
-
endif
.PHONY: nouveau-test-elixir
nouveau-test-elixir: export MIX_ENV=integration
nouveau-test-elixir: elixir-init devclean
-nouveau-test-elixir: couch nouveau
+nouveau-test-elixir: couch-core extra/nouveau
ifeq ($(with_nouveau), true)
@dev\run "$(TEST_OPTS)" -n 1 -q -a adm:pass --with-nouveau \
--locald-config test/elixir/test/config/test-config.ini \
diff --git a/src/couch/include/couch_eunit.hrl b/src/couch/include/couch_eunit.hrl
index 7d8686000..5bae5b452 100644
--- a/src/couch/include/couch_eunit.hrl
+++ b/src/couch/include/couch_eunit.hrl
@@ -21,7 +21,7 @@
false ->
throw("BUILDDIR environment variable must be set");
Dir ->
- Dir
+ string:strip(Dir)
end
end).
-define(CONFIG_DEFAULT,
(couchdb) 03/03: dev: Adding more Makefile.win fixes
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ronny pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit d2833ff5a224f272f2e90b65d04febb4835da609
Author: Ronny Berndt <ro...@apache.org>
AuthorDate: Thu Jan 15 01:41:15 2026 +0100
dev: Adding more Makefile.win fixes
---
Makefile.win | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/Makefile.win b/Makefile.win
index 4c62ad859..98d275413 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -22,7 +22,7 @@ REBAR?=$(CURDIR)/bin/rebar.cmd
PYTHON=python.exe
ERLFMT?=$(CURDIR)/bin/erlfmt.cmd
MAKE=make -f Makefile.win
-GRADLE?=$(CURDIR)/nouveau/gradlew.bat
+GRADLE?=$(CURDIR)/extra/nouveau/gradlew.bat
# REBAR?=$(shell where rebar.cmd)
# Handle the following scenarios:
@@ -162,17 +162,15 @@ endif
# target: eunit - Run EUnit tests, use EUNIT_OPTS to provide custom options
.PHONY: eunit $(EUNIT_SUBDIRS)
-
-
eunit: export ERL_AFLAGS = -config $(CURDIR)/rel/files/eunit.config
eunit: export COUCHDB_QUERY_SERVER_JAVASCRIPT = $(CURDIR)/bin/couchjs $(CURDIR)/share/server/main.js
eunit: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
eunit: $(EUNIT_SUBDIRS)
$(EUNIT_SUBDIRS):
- @rm -rf tmp\$@
+ -@rmdir /s /q tmp\$@
@$(REBAR) setup_eunit app=$@
- @set BUILDDIR=$(CURDIR)/tmp/$@ & set COUCHDB_VERSION=$(COUCHDB_VERSION) & set COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) & $(REBAR) -r eunit $(EUNIT_OPTS) apps=$@
+ @set BUILDDIR=$(CURDIR)/tmp/$@ && set COUCHDB_VERSION=$(COUCHDB_VERSION) && set COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) && $(REBAR) -r eunit $(EUNIT_OPTS) apps=$@ && @rmdir /s/q tmp\$@
# cat together couch_log files after running eunit test
.PHONY: catlogs
@@ -240,7 +238,6 @@ elixir-cluster-with-quorum: elixir-init devclean
.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 \
@@ -305,7 +302,6 @@ list-eunit-suites:
.PHONY: mango-test
# target: mango-test - Run Mango tests
-mango-test: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
mango-test: devclean all
@$(PYTHON) -m venv src\mango\.venv && \
src\mango\.venv\Scripts\pip.exe install -r src\mango\requirements.txt
@@ -491,8 +487,8 @@ config.erl:
src\docs\build:
- @echo 'Building docs...'
ifeq ($(with_docs), true)
+ @echo 'Building docs...'
@cd src\docs && setup.bat && make.bat html && make.bat man
endif
@@ -534,7 +530,7 @@ nouveau-test: nouveau-test-gradle nouveau-test-elixir
.PHONY: nouveau-test-gradle
nouveau-test-gradle: couch-core extra/nouveau
ifeq ($(with_nouveau), true)
- @cd nouveau && $(GRADLE) test --info --rerun
+ @cd extra/nouveau && $(GRADLE) test --info --rerun
endif
.PHONY: nouveau-test-elixir
(couchdb) 01/03: feat: parallel eunit for windows
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ronny pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit d2b8a0e3bc7940104ea8fc48fb87bb7a774360b9
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Tue Jan 13 13:09:17 2026 +0100
feat: parallel eunit for windows
---
Makefile.win | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/Makefile.win b/Makefile.win
index 38b0bc201..489db2a0f 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -155,30 +155,23 @@ check: all
@$(MAKE) nouveau-test
ifdef apps
-subdirs=$(apps)
+EUNIT_SUBDIRS = $(strip $(subst $(comma),$(space),$(apps)))
else
-subdirs=$(shell dir /b src)
+EUNIT_SUBDIRS = $(filter-out fauxton docs, $(shell dir /b src))
endif
-.PHONY: eunit
# target: eunit - Run EUnit tests, use EUNIT_OPTS to provide custom options
-eunit: export BUILDDIR = $(CURDIR)
-eunit: export ERL_AFLAGS = -config $(CURDIR)/rel/files/eunit.config
-eunit: export COUCHDB_QUERY_SERVER_JAVASCRIPT = $(CURDIR)/bin/couchjs $(CURDIR)/share/server/main.js
-eunit: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
-eunit: couch
- @set COUCHDB_VERSION=$(COUCHDB_VERSION) && set COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) && $(REBAR) setup_eunit 2> nul
- @cmd /c "FOR %d IN ($(subdirs)) DO set COUCHDB_VERSION=$(COUCHDB_VERSION) & set COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) & $(REBAR) -r eunit $(EUNIT_OPTS) apps=%d || exit /b 1"
-
-setup-eunit: export BUILDDIR = $(CURDIR)
-setup-eunit: export ERL_AFLAGS = -config $(CURDIR)/rel/files/eunit.config
-setup-eunit:
- @$(REBAR) setup_eunit 2> nul
-
-just-eunit: export BUILDDIR = $(CURDIR)
-just-eunit: export ERL_AFLAGS = -config $(CURDIR)/rel/files/eunit.config
-just-eunit:
- @$(REBAR) -r eunit $(EUNIT_OPTS)
+.PHONY: eunit $(EUNIT_SUBDIRS)
+
+$(EUNIT_SUBDIRS):
+ @rd /s /q tmp/$@
+ @$(REBAR) setup_eunit app=$@ >/dev/null
+ @BUILDDIR=$(CURDIR)/tmp/$@ COUCHDB_VERSION=$(COUCHDB_VERSION) COUCHDB_GIT_SHA=$(COUCHDB_GIT_SHA) $(REBAR) -r eunit $(EUNIT_OPTS) apps=$@ & rd /s /q tmp/$@
+
+# cat together couch_log files after running eunit test
+.PHONY: catlogs
+catlogs:
+ @type tmp/*/couch.log > tmp/couch.log || true
# target: erlfmt-check - Check Erlang source code formatting
erlfmt-check: export ERLFMT_PATH = $(ERLFMT)
@@ -284,6 +277,7 @@ build-report:
@$(PYTHON) build-aux/show-test-results.py --suites=10 --tests=10 > test-results.log || true
cat .\dev\logs\node1.log || true
cat .\dev\logs\nouveau.log || true
+ $(MAKE) catlogs || true
cat .\tmp\couch.log || true
cat test-results.log || true