handle -s correctly when using these makefiles directly

2026-03-10 17:21:49 +00:00 · 2025-06-29 22:48:03 +02:00
parent 831eedfb58
commit cb4cd114bf
15 changed files with 61 additions and 3 deletions
--- a/targettest/Makefile
+++ b/targettest/Makefile
@@ -55,6 +55,9 @@ ifdef QUIET
    .SILENT:
    PQ = "QUIET=1"
    PD = --no-print-directory
+ifndef CMD_EXE
+  CATERR = 2> $$@.errlog || (cat $$@.errlog && false)
+endif
 endif

 ifneq ($(filter disk testcode.%,$(MAKECMDGOALS)),)
@@ -131,12 +134,12 @@ DISK_atarixl   = testcode.atr

 .c.o:
 	$(if $(QUIET),echo $(SYS):$*.c)
-	$(CC) $(CFLAGS) -Ors --codesize 500 -T -g -t $(SYS) $<
-	$(AS) $(<:.c=.s)
+	$(CC) $(CFLAGS) -Ors --codesize 500 -T -g -t $(SYS) $< $(CATERR)
+	$(AS) $(<:.c=.s) $(CATERR)

 .s.o:
 	$(if $(QUIET),echo $(SYS):$*.s)
-	$(AS) $(ASFLAGS) -t $(SYS) $<
+	$(AS) $(ASFLAGS) -t $(SYS) $< $(CATERR)

 .PRECIOUS: %.o

--- a/test/asm/cpudetect/Makefile
+++ b/test/asm/cpudetect/Makefile
@@ -20,6 +20,9 @@ else
  RMDIR = $(RM) -r $1
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif

 ifdef QUIET
  .SILENT:
--- a/test/asm/err/Makefile
+++ b/test/asm/err/Makefile
@@ -24,6 +24,10 @@ else
  RMDIR = $(RM) -r $1
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/asm/listing/Makefile
+++ b/test/asm/listing/Makefile
@@ -28,6 +28,10 @@ else
  NULLDEV = /dev/null
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/asm/misc/Makefile
+++ b/test/asm/misc/Makefile
@@ -26,6 +26,10 @@ else
  RMDIR = $(RM) -r $1
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/asm/opcodes/Makefile
+++ b/test/asm/opcodes/Makefile
@@ -20,6 +20,10 @@ else
  RMDIR = $(RM) -r $1
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/asm/val/Makefile
+++ b/test/asm/val/Makefile
@@ -22,6 +22,10 @@ else
  RMDIR = $(RM) -r $1
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/dasm/Makefile
+++ b/test/dasm/Makefile
@@ -22,6 +22,10 @@ else
  NULLDEV = /dev/null
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/err/Makefile
+++ b/test/err/Makefile
@@ -24,6 +24,10 @@ else
  RMDIR = $(RM) -r $1
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -26,6 +26,10 @@ else
  RMDIR = $(RM) -r $1
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/ref/Makefile
+++ b/test/ref/Makefile
@@ -27,6 +27,10 @@ else
  COPY = cp $1 $2
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/standard/Makefile
+++ b/test/standard/Makefile
@@ -22,6 +22,10 @@ else
  RMDIR = $(RM) -r $1
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/standard_err/Makefile
+++ b/test/standard_err/Makefile
@@ -24,6 +24,10 @@ else
  RMDIR = $(RM) -r $1
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/todo/Makefile
+++ b/test/todo/Makefile
@@ -24,6 +24,10 @@ else
  RMDIR = $(RM) -r $1
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)
--- a/test/val/Makefile
+++ b/test/val/Makefile
@@ -24,6 +24,10 @@ else
  CATRES = > $(WORKDIR)/$$@.out 2> $(WORKDIR)/$$@.out || (cat $(WORKDIR)/$$@.out && false)
 endif

+ifeq ($(SILENT),s)
+    QUIET = 1
+endif
+
 ifdef QUIET
  .SILENT:
  NULLOUT = >$(NULLDEV)