From f4a413fabd3d86e26d86748d9f1a925c22992bda Mon Sep 17 00:00:00 2001
From: Pierre Muller <pierre@freepascal.org>
Date: Tue, 30 Jan 2024 18:01:25 +0100
Subject: [PATCH] Add rule to generate exitcode.exe dos/go32v2 binary, required
 by dosbox_wrapper

---
 tests/tstunits/Makefile           | 13 ++++++++++++-
 tests/tstunits/Makefile.fpc       | 14 +++++++++++++-
 tests/tstunits/go32v2/Package.fpc |  5 +++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 tests/tstunits/go32v2/Package.fpc

diff --git a/tests/tstunits/Makefile b/tests/tstunits/Makefile
index 3b95820afe..1618b5a67a 100644
--- a/tests/tstunits/Makefile
+++ b/tests/tstunits/Makefile
@@ -2329,7 +2329,18 @@ ctest:
 	@$(ECHO) "No C compiler found"
 	@exit 1
 endif
-extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT)
+ifneq ($(findstring dosbox_wrapper,$(EMULATOR)),)
+  MSDOS_EXITCODE_SRC=../utils/dosbox/exitcode.pas
+  MSDOS_EXITCODE_PROG=../utils/dosbox/exitcode.exe
+else
+  MSDOS_EXITCODE_SRC=
+  MSDOS_EXITCODE_PROG=
+endif
+ifdef MSDOS_EXITCODE_PROG
+$(MSDOS_EXITCODE_PROG): $(MSDOS_EXITCODE_SRC)
+	$(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) -o$(MSDOS_EXITCODE_PROG) $(MSDOS_EXITCODE_SRC)
+endif
+extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT) $(MSDOS_EXITCODE_PROG)
 PPULIST:=$(wildcard */*.ppu) $(wildcard units/*/*.ppu)
 PPULOGLIST:=$(subst .ppu,.log-ppu,$(PPULIST))
 RMPPULOGLIST:=$(subst .ppu,.rm-log-ppu,$(PPULIST))
diff --git a/tests/tstunits/Makefile.fpc b/tests/tstunits/Makefile.fpc
index 465290267b..6db36e320e 100644
--- a/tests/tstunits/Makefile.fpc
+++ b/tests/tstunits/Makefile.fpc
@@ -163,8 +163,20 @@ ctest:
         @exit 1
 endif
 
+ifneq ($(findstring dosbox_wrapper,$(EMULATOR)),)
+  MSDOS_EXITCODE_SRC=../utils/dosbox/exitcode.pas
+  MSDOS_EXITCODE_PROG=../utils/dosbox/exitcode.exe
+else
+  MSDOS_EXITCODE_SRC=
+  MSDOS_EXITCODE_PROG=
+endif
 
-extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT)
+ifdef MSDOS_EXITCODE_PROG
+$(MSDOS_EXITCODE_PROG): $(MSDOS_EXITCODE_SRC)
+	$(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) -o$(MSDOS_EXITCODE_PROG) $(MSDOS_EXITCODE_SRC)
+endif
+
+extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT) $(MSDOS_EXITCODE_PROG)
 
 
 #####################################################################
diff --git a/tests/tstunits/go32v2/Package.fpc b/tests/tstunits/go32v2/Package.fpc
new file mode 100644
index 0000000000..a3dd6acae4
--- /dev/null
+++ b/tests/tstunits/go32v2/Package.fpc
@@ -0,0 +1,5 @@
+[package]
+name=rtl
+version=3.3.1
+[require]
+packages_go32v2_i386=