Skip to content

Commit

Permalink
druntime: Avoid -run in Windows-specific additional tests
Browse files Browse the repository at this point in the history
As temporary object files seem to collide for parallel runs in the
same working dir.
  • Loading branch information
kinke authored and thewilsonator committed Dec 17, 2023
1 parent 4ad93e0 commit f3a0366
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 22 deletions.
40 changes: 22 additions & 18 deletions druntime/test/shared/Makefile
Expand Up @@ -9,30 +9,34 @@ ifeq (windows,$(OS))

TESTS:=loadlibwin dllrefcount dllgc dynamiccast

all: $(addprefix $(ROOT)/,$(TESTS))
all: $(addprefix $(ROOT)/,$(addsuffix .done,$(TESTS)))

$(ROOT)/%.done: $(ROOT)/%$(DOTEXE)
@echo Testing $*
$(QUIET)$(TIMELIMIT)$< $(RUN_ARGS)
@touch $@

$(ROOT)/dynamiccast.done: $(ROOT)/%.done: $(ROOT)/%$(DOTEXE)
@echo Testing $*
$(QUIET)rm -f $(ROOT)/dynamiccast_end{bar,main}
$(QUIET)$(TIMELIMIT)$< $(RUN_ARGS)
$(QUIET)test -f $(ROOT)/dynamiccast_endbar
$(QUIET)test -f $(ROOT)/dynamiccast_endmain
@touch $@

$(ROOT)/dllrefcount: $(SRC)/dllrefcount.d
@echo Testing dllrefcount
$(QUIET)$(DMD) $(DFLAGS) -run $<
$(ROOT)/dllrefcount$(DOTEXE): $(SRC)/dllrefcount.d
$(QUIET)$(DMD) $(DFLAGS) -of$@ $<

$(ROOT)/loadlibwin: $(SRC)/loadlibwin.d
@echo Testing loadlibwin
$(QUIET)$(DMD) $(DFLAGS) -run $<
$(ROOT)/loadlibwin$(DOTEXE): $(SRC)/loadlibwin.d
$(QUIET)$(DMD) $(DFLAGS) -of$@ $<

$(ROOT)/dllgc: $(SRC)/dllgc.d
@echo Testing dllgc
$(ROOT)/dllgc$(DOTEXE): $(SRC)/dllgc.d
$(QUIET)$(DMD) $(DFLAGS) -version=DLL -shared -of$(ROOT)/dllgc$(DOTDLL) $<
$(QUIET)$(DMD) $(DFLAGS) -of$(ROOT)/loaddllgc$(DOTEXE) $<
$(QUIET)$(ROOT)/loaddllgc
$(QUIET)$(DMD) $(DFLAGS) -of$@ $<

$(ROOT)/dynamiccast: $(SRC)/dynamiccast.d
@echo Testing dynamiccast
$(ROOT)/dynamiccast$(DOTEXE): $(SRC)/dynamiccast.d
$(QUIET)$(DMD) $(DFLAGS) -version=DLL -shared -of$(ROOT)/dynamiccast$(DOTDLL) $<
$(QUIET)$(DMD) $(DFLAGS) -of$(ROOT)/dynamiccast$(DOTEXE) $<
$(QUIET)rm -f $(ROOT)/dynamiccast_end{bar,main}
$(QUIET)$(ROOT)/dynamiccast
$(QUIET)test -f $(ROOT)/dynamiccast_endbar
$(QUIET)test -f $(ROOT)/dynamiccast_endmain
$(QUIET)$(DMD) $(DFLAGS) -of$@ $<

else # Posix:

Expand Down
12 changes: 8 additions & 4 deletions druntime/test/stdcpp/Makefile
Expand Up @@ -24,16 +24,20 @@ $(ROOT)/%: $(SRC)/%.cpp $(SRC)/%_test.d
@mkdir -p $(dir $@)

$(QUIET)$(CC) /MT $(EXTRA_CXXFLAGS) -c /Fo$@_cpp$(DOTOBJ) $<
$(QUIET)$(DMD) -mscrtlib=libcmt $(DFLAGS) $(EXTRA_DFLAGS) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(MSC_VER) $@_cpp$(DOTOBJ) -run $(SRC)/$*_test.d
$(QUIET)$(DMD) -mscrtlib=libcmt $(DFLAGS) $(EXTRA_DFLAGS) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(MSC_VER) -of$@$(DOTEXE) $@_cpp$(DOTOBJ) $(SRC)/$*_test.d
$(QUIET)$(TIMELIMIT)$@ $(RUN_ARGS)

$(QUIET)$(CC) /MD $(EXTRA_CXXFLAGS) -c /Fo$@_cpp$(DOTOBJ) $<
$(QUIET)$(DMD) -mscrtlib=msvcrt $(DFLAGS) $(EXTRA_DFLAGS) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(MSC_VER) $@_cpp$(DOTOBJ) -run $(SRC)/$*_test.d
$(QUIET)$(DMD) -mscrtlib=msvcrt $(DFLAGS) $(EXTRA_DFLAGS) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(MSC_VER) -of$@$(DOTEXE) $@_cpp$(DOTOBJ) $(SRC)/$*_test.d
$(QUIET)$(TIMELIMIT)$@ $(RUN_ARGS)

$(QUIET)$(CC) /MTd $(EXTRA_CXXFLAGS) -c /Fo$@_cpp$(DOTOBJ) $<
$(QUIET)$(DMD) -mscrtlib=libcmtd $(DFLAGS) $(EXTRA_DFLAGS) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(MSC_VER) $@_cpp$(DOTOBJ) -run $(SRC)/$*_test.d
$(QUIET)$(DMD) -mscrtlib=libcmtd $(DFLAGS) $(EXTRA_DFLAGS) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(MSC_VER) -of$@$(DOTEXE) $@_cpp$(DOTOBJ) $(SRC)/$*_test.d
$(QUIET)$(TIMELIMIT)$@ $(RUN_ARGS)

$(QUIET)$(CC) /MDd $(EXTRA_CXXFLAGS) -c /Fo$@_cpp$(DOTOBJ) $<
$(QUIET)$(DMD) -mscrtlib=msvcrtd $(DFLAGS) $(EXTRA_DFLAGS) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(MSC_VER) $@_cpp$(DOTOBJ) -run $(SRC)/$*_test.d
$(QUIET)$(DMD) -mscrtlib=msvcrtd $(DFLAGS) $(EXTRA_DFLAGS) -main -unittest -version=CoreUnittest -version=_MSC_VER_$(MSC_VER) -of$@$(DOTEXE) $@_cpp$(DOTOBJ) $(SRC)/$*_test.d
$(QUIET)$(TIMELIMIT)$@ $(RUN_ARGS)

else # Posix:

Expand Down

0 comments on commit f3a0366

Please sign in to comment.