From 8bd5ec524f4bcd7eb0471684c0341a2e7fba0c13 Mon Sep 17 00:00:00 2001
From: Andres Toom <toom@adacore.com>
Date: Wed, 10 Apr 2024 10:57:48 +0300
Subject: [PATCH] Make sure that Poetry and thereby the expected venv are used
 in make recipes

Ref. None
---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 01298cd91..d220c72ff 100644
--- a/Makefile
+++ b/Makefile
@@ -342,7 +342,7 @@ test_optimized: $(RFLX)
 	PYTHONOPTIMIZE=1 $(PYTEST) tests/unit tests/integration tests/compilation
 
 test_apps: $(RFLX)
-	$(foreach app,$(APPS),$(MAKE) -C examples/apps/$(app) test || exit;)
+	$(foreach app,$(APPS),$(POETRY) run $(MAKE) -C examples/apps/$(app) test || exit;)
 
 test_compilation: $(RFLX)
 	# Skip test for FSF GNAT to prevent violations of restriction "No_Secondary_Stack" in AUnit units
@@ -384,17 +384,17 @@ test_installation: $(SDIST)
 prove: prove_tests prove_python_tests prove_apps prove_doc
 
 prove_tests: $(GNATPROVE_CACHE_DIR)
-	$(MAKE) -C tests/spark prove
+	$(POETRY) run $(MAKE) -C tests/spark prove
 
 prove_python_tests: export GNATPROVE_PROCS=1
 prove_python_tests: $(RFLX) $(GNATPROVE_CACHE_DIR)
 	$(PYTEST) tests/verification
 
 prove_apps: $(RFLX) $(GNATPROVE_CACHE_DIR)
-	$(foreach app,$(APPS),$(MAKE) -C examples/apps/$(app) prove || exit;)
+	$(foreach app,$(APPS),$(POETRY) run $(MAKE) -C examples/apps/$(app) prove || exit;)
 
 prove_doc: $(RFLX)
-	$(MAKE) -C doc/examples prove
+	$(POETRY) run $(MAKE) -C doc/examples prove
 
 prove_property_tests: $(RFLX) $(GNATPROVE_CACHE_DIR)
 	$(PYTEST) tests/property_verification
@@ -418,10 +418,10 @@ git_hooks:
 .PHONY: generate generate_apps
 
 generate: $(RFLX)
-	tools/generate_spark_test_code.py
+	$(POETRY) run tools/generate_spark_test_code.py
 
 generate_apps: $(RFLX)
-	$(foreach app,$(APPS),$(MAKE) -C examples/apps/$(app) generate || exit;)
+	$(foreach app,$(APPS),$(POETRY) run $(MAKE) -C examples/apps/$(app) generate || exit;)
 
 .PHONY: anod_build_dependencies anod_poetry_dependencies