From 0da93d0c9fa2a5a5c768c52aa7827f50d0513247 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Tue, 5 Dec 2017 18:02:30 +0100
Subject: [PATCH 1/2] Use generated DMD executable for the testsuite

---
 test/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 53cab693e658..a7e1875964e3 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -86,6 +86,10 @@ include ../src/osmodel.mak
 
 export OS
 
+GENERATED=../generated
+BUILD=release
+G=$(GENERATED)/$(OS)/$(BUILD)/$(MODEL)
+
 ifeq (freebsd,$(OS))
     SHELL=/usr/local/bin/bash
 else ifeq (netbsd,$(OS))
@@ -112,7 +116,7 @@ export DFLAGS=-I$(DRUNTIME_PATH)\import -I$(PHOBOS_PATH)
 export LIB=$(PHOBOS_PATH)
 else
 export ARGS=-inline -release -g -O -fPIC
-export DMD=../src/dmd
+export DMD=$G/dmd
 export EXE=
 export OBJ=.o
 export DSEP=/
@@ -122,9 +126,9 @@ DRUNTIME_PATH=../../druntime
 PHOBOS_PATH=../../phobos
 # link against shared libraries (defaults to true on supported platforms, can be overridden w/ make SHARED=0)
 SHARED=$(if $(findstring $(OS),linux freebsd),1,)
-DFLAGS=-I$(DRUNTIME_PATH)/import -I$(PHOBOS_PATH) -L-L$(PHOBOS_PATH)/generated/$(OS)/release/$(MODEL)
+DFLAGS=-I$(DRUNTIME_PATH)/import -I$(PHOBOS_PATH) -L-L$(PHOBOS_PATH)/generated/$(OS)/$(BUILD)/$(MODEL)
 ifeq (1,$(SHARED))
-DFLAGS+=-defaultlib=libphobos2.so -L-rpath=$(PHOBOS_PATH)/generated/$(OS)/release/$(MODEL)
+DFLAGS+=-defaultlib=libphobos2.so -L-rpath=$(PHOBOS_PATH)/generated/$(OS)/$(BUILD)/$(MODEL)
 endif
 export DFLAGS
 endif

From 2df1b64e1456428d440371d8c44b118013c07810 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Tue, 5 Dec 2017 18:11:31 +0100
Subject: [PATCH 2/2] Add debug logs

---
 posix.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/posix.mak b/posix.mak
index e0815581837e..f4c75a2bf286 100644
--- a/posix.mak
+++ b/posix.mak
@@ -21,6 +21,7 @@ clean:
 	$(RM) tags
 
 test:
+	echo $(MODEL)
 	$(QUIET)$(MAKE) -C test -f Makefile
 
 html: