[couchdb] 03/13: Conditionally exclude nouveau from elixir make target

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ronny pushed a commit to branch nouveau4win
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit f5084ac22b627a8ef3c87022ef3e18d373537e52
Author: Robert Newson <rn...@apache.org>
AuthorDate: Thu Jul 13 10:13:26 2023 +0100

    Conditionally exclude nouveau from elixir make target
---
 Makefile                          | 8 ++++++--
 test/elixir/test/nouveau_test.exs | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1615cac67..8cd1d6f68 100644
--- a/Makefile
+++ b/Makefile
@@ -236,6 +236,11 @@ python-black-update: .venv/bin/black
 		--exclude="build/|buck-out/|dist/|_build/|\.git/|\.hg/|\.mypy_cache/|\.nox/|\.tox/|\.venv/|src/rebar/pr2relnotes.py|src/fauxton" \
 		build-aux/*.py dev/run src/mango/test/*.py src/docs/src/conf.py src/docs/ext/*.py .
 
+-include install.mk
+ifeq ($(with_nouveau), 0)
+  exclude_nouveau=--exclude nouveau
+endif
+
 .PHONY: elixir
 elixir: export MIX_ENV=integration
 elixir: export COUCHDB_TEST_ADMIN_PARTY_OVERRIDE=1
@@ -243,7 +248,7 @@ 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 $(EXUNIT_OPTS)'
+		--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
@@ -405,7 +410,6 @@ dist: all derived
 
 .PHONY: release
 # target: release - Create an Erlang release including CouchDB!
--include install.mk
 release: all
 	@echo "Installing CouchDB into rel/couchdb/ ..."
 	@rm -rf rel/couchdb
diff --git a/test/elixir/test/nouveau_test.exs b/test/elixir/test/nouveau_test.exs
index ad48e58ea..2a8bc513f 100644
--- a/test/elixir/test/nouveau_test.exs
+++ b/test/elixir/test/nouveau_test.exs
@@ -1,7 +1,7 @@
 defmodule NouveauTest do
   use CouchTestCase
 
-  @moduletag :search
+  @moduletag :nouveau
 
   @moduledoc """
   Test search