From 70f9723a893a1b51c66ac427c225c97ea0bd5720 Mon Sep 17 00:00:00 2001 From: mrdudz Date: Thu, 26 Jun 2025 20:42:15 +0200 Subject: [PATCH] dumb down for cmd.exe --- test/asm/cpudetect/Makefile | 2 ++ test/asm/err/Makefile | 2 ++ test/asm/listing/Makefile | 2 ++ test/asm/misc/Makefile | 2 ++ test/asm/opcodes/Makefile | 2 ++ test/dasm/Makefile | 2 ++ test/err/Makefile | 2 ++ test/misc/Makefile | 2 ++ test/ref/Makefile | 2 ++ test/standard/Makefile | 2 ++ test/standard_err/Makefile | 2 ++ test/todo/Makefile | 2 ++ test/val/Makefile | 2 ++ 13 files changed, 26 insertions(+) diff --git a/test/asm/cpudetect/Makefile b/test/asm/cpudetect/Makefile index a77e5b576..d0077bfd9 100644 --- a/test/asm/cpudetect/Makefile +++ b/test/asm/cpudetect/Makefile @@ -25,8 +25,10 @@ ifdef QUIET .SILENT: NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) +ifndef CMD_EXE CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) endif +endif CA65 := $(if $(wildcard ../../../bin/ca65*),../../../bin/ca65,ca65) LD65 := $(if $(wildcard ../../../bin/ld65*),../../../bin/ld65,ld65) diff --git a/test/asm/err/Makefile b/test/asm/err/Makefile index 5c329138b..8b93cd80d 100644 --- a/test/asm/err/Makefile +++ b/test/asm/err/Makefile @@ -28,8 +28,10 @@ ifdef QUIET .SILENT: NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) +ifndef CMD_EXE CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) endif +endif CA65 := $(if $(wildcard ../../../bin/ca65*),..$S..$S..$Sbin$Sca65,ca65) diff --git a/test/asm/listing/Makefile b/test/asm/listing/Makefile index 9d815985d..dc2c43d73 100644 --- a/test/asm/listing/Makefile +++ b/test/asm/listing/Makefile @@ -32,8 +32,10 @@ ifdef QUIET .SILENT: NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) +ifndef CMD_EXE CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) endif +endif CA65 := $(if $(wildcard ../../../bin/ca65*),..$S..$S..$Sbin$Sca65,ca65) LD65 := $(if $(wildcard ../../../bin/ld65*),..$S..$S..$Sbin$Sld65,ld65) diff --git a/test/asm/misc/Makefile b/test/asm/misc/Makefile index 4f24aa041..3072fa24e 100644 --- a/test/asm/misc/Makefile +++ b/test/asm/misc/Makefile @@ -30,8 +30,10 @@ ifdef QUIET .SILENT: NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) +ifndef CMD_EXE CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) endif +endif SIM65FLAGS = -x 200000000 diff --git a/test/asm/opcodes/Makefile b/test/asm/opcodes/Makefile index c0918499c..2fe046bd9 100644 --- a/test/asm/opcodes/Makefile +++ b/test/asm/opcodes/Makefile @@ -24,8 +24,10 @@ ifdef QUIET .SILENT: NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) +ifndef CMD_EXE CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) endif +endif CA65 := $(if $(wildcard ../../../bin/ca65*),../../../bin/ca65,ca65) LD65 := $(if $(wildcard ../../../bin/ld65*),../../../bin/ld65,ld65) diff --git a/test/dasm/Makefile b/test/dasm/Makefile index 9c19f575c..196975857 100644 --- a/test/dasm/Makefile +++ b/test/dasm/Makefile @@ -26,8 +26,10 @@ ifdef QUIET .SILENT: NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) +ifndef CMD_EXE CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) endif +endif CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) CA65 := $(if $(wildcard ../../bin/ca65*),../../bin/ca65,ca65) diff --git a/test/err/Makefile b/test/err/Makefile index 72b11cd1f..5bd198477 100644 --- a/test/err/Makefile +++ b/test/err/Makefile @@ -28,8 +28,10 @@ ifdef QUIET .SILENT: NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) +ifndef CMD_EXE CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) endif +endif CC65 := $(if $(wildcard ../../bin/cc65*),..$S..$Sbin$Scc65,cc65) diff --git a/test/misc/Makefile b/test/misc/Makefile index fb3730f5c..8eb360e52 100644 --- a/test/misc/Makefile +++ b/test/misc/Makefile @@ -30,8 +30,10 @@ ifdef QUIET .SILENT: NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) +ifndef CMD_EXE CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) endif +endif SIM65FLAGS = -x 200000000 diff --git a/test/ref/Makefile b/test/ref/Makefile index 4ac8f02a4..1a5611083 100644 --- a/test/ref/Makefile +++ b/test/ref/Makefile @@ -31,8 +31,10 @@ ifdef QUIET .SILENT: NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) +ifndef CMD_EXE CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) endif +endif SIM65FLAGS = -x 200000000 diff --git a/test/standard/Makefile b/test/standard/Makefile index c58fdc070..f09024b58 100644 --- a/test/standard/Makefile +++ b/test/standard/Makefile @@ -26,8 +26,10 @@ ifdef QUIET .SILENT: NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) +ifndef CMD_EXE CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) endif +endif SIM65FLAGS = -x 4000000000 -c diff --git a/test/standard_err/Makefile b/test/standard_err/Makefile index 53d4efafd..702ad3f95 100644 --- a/test/standard_err/Makefile +++ b/test/standard_err/Makefile @@ -28,8 +28,10 @@ ifdef QUIET .SILENT: NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) +ifndef CMD_EXE CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) endif +endif CC65 := $(if $(wildcard ../../bin/cc65*),..$S..$Sbin$Scc65,cc65) diff --git a/test/todo/Makefile b/test/todo/Makefile index 338ffb978..7a0cbfa54 100644 --- a/test/todo/Makefile +++ b/test/todo/Makefile @@ -28,8 +28,10 @@ ifdef QUIET .SILENT: NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) +ifndef CMD_EXE CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) endif +endif SIM65FLAGS = -x 200000000 diff --git a/test/val/Makefile b/test/val/Makefile index 58c08d4f8..fe895e217 100644 --- a/test/val/Makefile +++ b/test/val/Makefile @@ -28,8 +28,10 @@ ifdef QUIET .SILENT: NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) +ifndef CMD_EXE CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) endif +endif SIM65FLAGS = -x 4000000000 -c