From 73869a6f389c20b2b8e04998fcaee2f291cf0129 Mon Sep 17 00:00:00 2001
From: mrdudz <mrdudz@users.noreply.github.com>
Date: Thu, 26 Jun 2025 19:45:52 +0200
Subject: [PATCH] make propagating QUIET=1 down actually work, also set
 --no-print-directory depending on QUIET

---
 test/Makefile     | 43 ++++++++++++++++++++++---------------------
 test/asm/Makefile | 29 +++++++++++++++--------------
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index c6cff47a4..b647dbe33 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -17,11 +17,12 @@ else
 endif
 
 ifeq ($(SILENT),s)
-    QUIET := 1
+    QUIET = 1
 endif
 
-ifneq ($(QUIET),1)
-    QUIET := 0
+ifdef QUIET
+    PQ = "QUIET=1"
+    PD = --no-print-directory
 endif
 
 WORKDIR = ../testwrk
@@ -33,15 +34,15 @@ test:
 	@$(MAKE) continue
 
 continue:
-	@$(MAKE) -C asm all QUIET=$(QUIET)
-	@$(MAKE) -C dasm all QUIET=$(QUIET)
-	@$(MAKE) -C val all QUIET=$(QUIET)
-	@$(MAKE) -C ref all QUIET=$(QUIET)
-	@$(MAKE) -C err all QUIET=$(QUIET)
-	@$(MAKE) -C standard all QUIET=$(QUIET)
-	@$(MAKE) -C standard_err all QUIET=$(QUIET)
-	@$(MAKE) -C misc all QUIET=$(QUIET)
-	@$(MAKE) -C todo all QUIET=$(QUIET)
+	@$(MAKE) $(PD) -C asm all $(PQ)
+	@$(MAKE) $(PD) -C dasm all $(PQ)
+	@$(MAKE) $(PD) -C val all $(PQ)
+	@$(MAKE) $(PD) -C ref all $(PQ)
+	@$(MAKE) $(PD) -C err all $(PQ)
+	@$(MAKE) $(PD) -C standard all $(PQ)
+	@$(MAKE) $(PD) -C standard_err all $(PQ)
+	@$(MAKE) $(PD) -C misc all $(PQ)
+	@$(MAKE) $(PD) -C todo all $(PQ)
 	@$(MAKE) success_message
 
 success_message:
@@ -50,15 +51,15 @@ success_message:
 	$(info ###################################)
 
 mostlyclean:
-	@$(MAKE) -C asm clean QUIET=$(QUIET)
-	@$(MAKE) -C dasm clean QUIET=$(QUIET)
-	@$(MAKE) -C val clean QUIET=$(QUIET)
-	@$(MAKE) -C ref clean QUIET=$(QUIET)
-	@$(MAKE) -C err clean QUIET=$(QUIET)
-	@$(MAKE) -C standard clean QUIET=$(QUIET)
-	@$(MAKE) -C standard_err clean QUIET=$(QUIET)
-	@$(MAKE) -C misc clean QUIET=$(QUIET)
-	@$(MAKE) -C todo clean QUIET=$(QUIET)
+	@$(MAKE) $(PD) -C asm clean $(PQ)
+	@$(MAKE) $(PD) -C dasm clean $(PQ)
+	@$(MAKE) $(PD) -C val clean $(PQ)
+	@$(MAKE) $(PD) -C ref clean $(PQ)
+	@$(MAKE) $(PD) -C err clean $(PQ)
+	@$(MAKE) $(PD) -C standard clean $(PQ)
+	@$(MAKE) $(PD) -C standard_err clean $(PQ)
+	@$(MAKE) $(PD) -C misc clean $(PQ)
+	@$(MAKE) $(PD) -C todo clean $(PQ)
 
 clean: mostlyclean
 	@$(call RMDIR,$(WORKDIR))
diff --git a/test/asm/Makefile b/test/asm/Makefile
index bfae97222..8d959ecae 100644
--- a/test/asm/Makefile
+++ b/test/asm/Makefile
@@ -20,8 +20,9 @@ ifeq ($(SILENT),s)
     QUIET := 1
 endif
 
-ifneq ($(QUIET),1)
-    QUIET := 0
+ifdef QUIET
+    PQ = "QUIET=1"
+    PD = --no-print-directory
 endif
 
 WORKDIR = ../testwrk/asm
@@ -31,20 +32,20 @@ WORKDIR = ../testwrk/asm
 all: mostlyclean continue
 
 continue: mostlyclean
-	@$(MAKE) --no-print-directory -C cpudetect all QUIET=$(QUIET)
-	@$(MAKE) --no-print-directory -C opcodes all QUIET=$(QUIET)
-	@$(MAKE) --no-print-directory -C listing all QUIET=$(QUIET)
-	@$(MAKE) --no-print-directory -C val all QUIET=$(QUIET)
-	@$(MAKE) --no-print-directory -C err all QUIET=$(QUIET)
-	@$(MAKE) --no-print-directory -C misc all QUIET=$(QUIET)
+	@$(MAKE) $(PD) -C cpudetect all $(PQ)
+	@$(MAKE) $(PD) -C opcodes all $(PQ)
+	@$(MAKE) $(PD) -C listing all $(PQ)
+	@$(MAKE) $(PD) -C val all $(PQ)
+	@$(MAKE) $(PD) -C err all $(PQ)
+	@$(MAKE) $(PD) -C misc all $(PQ)
 
 mostlyclean:
-	@$(MAKE) --no-print-directory -C cpudetect clean
-	@$(MAKE) --no-print-directory -C opcodes clean
-	@$(MAKE) --no-print-directory -C listing clean
-	@$(MAKE) --no-print-directory -C val clean
-	@$(MAKE) --no-print-directory -C err clean
-	@$(MAKE) --no-print-directory -C misc clean
+	@$(MAKE) $(PD) -C cpudetect clean $(PQ)
+	@$(MAKE) $(PD) -C opcodes clean $(PQ)
+	@$(MAKE) $(PD) -C listing clean $(PQ)
+	@$(MAKE) $(PD) -C val clean $(PQ)
+	@$(MAKE) $(PD) -C err clean $(PQ)
+	@$(MAKE) $(PD) -C misc clean $(PQ)
 
 clean: mostlyclean
 	@$(call RMDIR,$(WORKDIR))