Skip to content

Commit d62ff77

Browse files
build.d: Add unittest to auto-tester-build
1 parent 3bb15e7 commit d62ff77

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

src/build.d

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,13 @@ alias autoTesterBuild = makeDep!((builder, dep) {
226226

227227
version (Posix)
228228
dep.deps ~= runCxxUnittest;
229+
230+
// unittests are currently not executed as part of `auto-tester-test` on windows
231+
// because changes to `win32.mak` require additional changes on the autotester
232+
// (see https://github.com/dlang/dmd/pull/7414).
233+
// This requires no further actions and avoids building druntime+phobos on unittest failure
234+
version (Windows)
235+
dep.deps ~= runDmdUnittest;
229236
});
230237

231238
/// Returns: the dependency that builds the lexer object file

src/win32.mak

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,11 @@ RUN_BUILD=$(GEN)\build.exe --called-from-make "OS=$(OS)" "BUILD=$(BUILD)" "MODEL
194194

195195
defaulttarget: $G debdmd
196196

197+
# FIXME: Windows test suite uses src/dmd.exe instead of $(GENERATED)/dmd.exe
198+
# FIXME: DDEBUG needs to be overidden to exclude unittests from dmd.exe
199+
# (They are compiled in a seperate executable for build.d's unittest target)
197200
auto-tester-build: $(GEN)\build.exe
198-
$(RUN_BUILD) "DDEBUG=" "ENABLE_RELEASE=1" $@
201+
$(RUN_BUILD) "DDEBUG=" $@
199202
copy $(TARGETEXE) .
200203

201204
dmd: $G reldmd

0 commit comments

Comments
 (0)