Skip to content

[Do not merge] Use generated DMD executable for the testsuite [Windows] #7399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wilzbach wants to merge 1 commit into from
Closed

[Do not merge] Use generated DMD executable for the testsuite [Windows] #7399

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,24 +67,35 @@
ifeq (Windows_NT,$(OS))
ifeq ($(findstring WOW64, $(shell uname)),WOW64)
OS:=win64
MODEL:=64
ifeq (,$(MODEL))
MODEL:=64
endif
else
OS:=win32
MODEL:=32
ifeq (,$(MODEL))
MODEL:=32
endif
endif
endif
ifeq (Win_32,$(OS))
OS:=win32
MODEL:=32
ifeq (,$(MODEL))
MODEL:=32
endif
endif
ifeq (Win_64,$(OS))
OS:=win64
MODEL:=64
ifeq (,$(MODEL))
MODEL:=64
endif
endif

include ../src/osmodel.mak

export OS
GENERATED=../generated
BUILD=release
G=$(GENERATED)/$(OS)/$(BUILD)/$(MODEL)

ifeq (freebsd,$(OS))
SHELL=/usr/local/bin/bash
Expand All @@ -100,7 +111,7 @@ export REQUIRED_ARGS=

ifeq ($(findstring win,$(OS)),win)
export ARGS=-inline -release -g -O
export DMD=../src/dmd.exe
export DMD=$G/dmd.exe
export EXE=.exe
export OBJ=.obj
export DSEP=\\
Expand Down