From d4ac1e1fd2d4c29e5ef245d805f805d83af3541f Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Sat, 9 Dec 2017 06:57:23 +0100
Subject: [PATCH 1/3] Run -unittest target on Windows

---
 src/win32.mak | 1 +
 src/win64.mak | 2 ++
 win32.mak     | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/win32.mak b/src/win32.mak
index 91d90457ecd4..66de2e693166 100644
--- a/src/win32.mak
+++ b/src/win32.mak
@@ -307,6 +307,7 @@ trace:
 
 unittest:
 	$(DMDMAKE) "OPT=-o" "DEBUG=" "DDEBUG=-debug -g -unittest -cov" "DOPT=" "LFLAGS=-L/ma/co/delexe/la" $(TARGETEXE)
+	$(TARGETEXE)
 
 ################################ Libraries ##################################
 
diff --git a/src/win64.mak b/src/win64.mak
index 70022368363e..c3dd1e823b90 100644
--- a/src/win64.mak
+++ b/src/win64.mak
@@ -34,6 +34,8 @@ trace : $(DEPENDENCIES)
 clean :
 	del $(DEPENDENCIES) dmd.pdb
 	$(MAKE_WIN32) $@
+unittest: $(DEPENDENCIES)
+	$(MAKE_WIN32) $@
 install : $(DEPENDENCIES)
 	$(MAKE_WIN32) $@
 install-clean : $(DEPENDENCIES)
diff --git a/win32.mak b/win32.mak
index 0fd01770a77c..14b50a604432 100644
--- a/win32.mak
+++ b/win32.mak
@@ -17,5 +17,6 @@ auto-tester-test:
 	cd samples
 	gmake -f win32.mak DMD=..\src\dmd.exe MODEL=$(MODEL) "LIB=..\..\phobos;$(LIB)" \
 		"DFLAGS=-I..\..\druntime\import -I..\..\phobos -m$(MODEL)"
+	cd ..\src
+	$(MAKE) -f win32.mak unittest
 	cd ..
-

From 77bceddf886ad6588fa3014f2e48b38e587da354 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Tue, 12 Dec 2017 09:33:46 +0100
Subject: [PATCH 2/3] Replace $(MAKE) with make as it is not defined on
 auto-tester

---
 win32.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/win32.mak b/win32.mak
index 14b50a604432..e0415b441f95 100644
--- a/win32.mak
+++ b/win32.mak
@@ -18,5 +18,5 @@ auto-tester-test:
 	gmake -f win32.mak DMD=..\src\dmd.exe MODEL=$(MODEL) "LIB=..\..\phobos;$(LIB)" \
 		"DFLAGS=-I..\..\druntime\import -I..\..\phobos -m$(MODEL)"
 	cd ..\src
-	$(MAKE) -f win32.mak unittest
+	make -f win32.mak unittest
 	cd ..

From daef304988031a20e1b0765eec8096d19b3d2520 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Wed, 27 Jun 2018 04:41:22 +0200
Subject: [PATCH 3/3] Experiment with disabling -debug

---
 src/win32.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/win32.mak b/src/win32.mak
index 66de2e693166..6199532182f5 100644
--- a/src/win32.mak
+++ b/src/win32.mak
@@ -306,7 +306,7 @@ trace:
 	$(DMDMAKE) "OPT=-o" "DEBUG=-gt -Nc" "DDEBUG=-debug -g -unittest" "DOPT=" "LFLAGS=-L/ma/co/delexe/la" $(TARGETEXE)
 
 unittest:
-	$(DMDMAKE) "OPT=-o" "DEBUG=" "DDEBUG=-debug -g -unittest -cov" "DOPT=" "LFLAGS=-L/ma/co/delexe/la" $(TARGETEXE)
+	$(DMDMAKE) "OPT=-o" "DEBUG=" "DDEBUG=-g -unittest -cov" "DOPT=" "LFLAGS=-L/ma/co/delexe/la" $(TARGETEXE)
 	$(TARGETEXE)
 
 ################################ Libraries ##################################