From 18bb6978916e4265e158a53e7d55b1629c141718 Mon Sep 17 00:00:00 2001 From: mrdudz Date: Wed, 9 Jul 2025 14:20:42 +0200 Subject: [PATCH 1/3] fix stderr redirection --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index f652f6925..e58cdf50c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -57,7 +57,7 @@ ifdef QUIET PQ = "QUIET=1" PD = --no-print-directory ifndef CMD_EXE - CATERR = 2> ../wrk/common/$$@.errlog || (cat ../wrk/common/$$@.errlog && false) + CATERR = 2> $@.errlog || (cat $@.errlog && false) endif endif From 6aad5f6c187ed72ff7bf4568112510f563939915 Mon Sep 17 00:00:00 2001 From: mrdudz Date: Wed, 9 Jul 2025 18:35:05 +0200 Subject: [PATCH 2/3] fix error log output --- test/err/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/err/Makefile b/test/err/Makefile index 60780d27b..5f5bc3841 100644 --- a/test/err/Makefile +++ b/test/err/Makefile @@ -33,7 +33,7 @@ ifdef QUIET NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) ifndef CMD_EXE - CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) + CATERR = 2> $@.errlog && (cat $@.errlog && true) endif endif From 472525eecd0bc5ec9533dc8d52cce1191e810782 Mon Sep 17 00:00:00 2001 From: mrdudz Date: Wed, 9 Jul 2025 23:10:43 +0200 Subject: [PATCH 3/3] redirect errors into file so we can see it if needed --- test/asm/err/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/asm/err/Makefile b/test/asm/err/Makefile index 9b6bc7fa9..d4648029a 100644 --- a/test/asm/err/Makefile +++ b/test/asm/err/Makefile @@ -33,7 +33,7 @@ ifdef QUIET NULLOUT = >$(NULLDEV) NULLERR = 2>$(NULLDEV) ifndef CMD_EXE - CATERR = 2> $(WORKDIR)/$$@.errlog || (cat $(WORKDIR)/$$@.errlog && false) + CATERR = 2> $@.errlog && (cat $@.errlog && true) endif endif @@ -53,7 +53,7 @@ $(WORKDIR): $(WORKDIR)/%.prg: %.s | $(WORKDIR) $(if $(QUIET),echo asm/err/$*.s) - $(NOT) $(CA65) -o $@ $< $(NULLERR) + $(NOT) $(CA65) -o $@ $< $(CATERR) clean: @$(call RMDIR,$(WORKDIR))