Skip to content

Commit 45670c2

Browse files
authored
druntime: Enable 'host' shared integration test on Darwin (#4831)
1 parent c68bff1 commit 45670c2

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

runtime/druntime/test/shared/Makefile

+7-12
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LINK_SHARED:=$(SHARED)
44
include ../common.mak # affected by LINK_SHARED!
55

66
ifneq (,$(LINK_SHARED))
7-
# LDC: disable 2 tests on Mac, 1 on Windows
7+
# LDC: enable ~all tests on Windows too
88
ifeq (,$(findstring ldmd2,$(DMD)))
99
# TODO: enable tests on Windows
1010
ifeq (windows,$(OS))
@@ -14,18 +14,13 @@ ifneq (,$(LINK_SHARED))
1414
link_linkdep load_linkdep link_loaddep load_loaddep load_13414
1515
endif
1616
else
17-
TESTS:=link load linkD linkDR loadDR finalize dynamiccast \
17+
TESTS:=link load linkD linkDR loadDR host finalize dynamiccast \
1818
link_linkdep link_loaddep load_loaddep load_13414
19-
ifneq ($(OS),osx)
20-
# * `host` loads two modules with the same name, which is currently disallowed
21-
# by the (potentially overly eager) module collision detection on OS X.
22-
# * FIXME: `load_linkdep`
23-
# it might fail because of unimplemented `getDependencies()` in rt.sections_elf_shared
24-
ifeq (windows,$(OS))
25-
# LDC FIXME: disable `load_linkdep` on Windows - needs `getDependencies()`
26-
TESTS+=host
27-
else
28-
TESTS+=host load_linkdep
19+
# FIXME: `load_linkdep` needs a non-dummy `getDependencies()` in rt.sections_elf_shared,
20+
# not implemented yet on Darwin and Windows
21+
ifneq (osx,$(OS))
22+
ifneq (windows,$(OS))
23+
TESTS+=load_linkdep
2924
endif
3025
endif
3126
endif

0 commit comments

Comments
 (0)