Skip to content
This repository was archived by the owner on Jun 20, 2019. It is now read-only.

Commit 2b27539

Browse files
committed
Enable tests for rt.util.typeinfo and core.internal.convert
1 parent 471ac45 commit 2b27539

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

libphobos/libdruntime/Makefile.am

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,8 @@ ALL_DRUNTIME_COMPILE_DSOURCES += $(DRUNTIME_DSOURCES_GENERATED)
7979

8080
ALL_DRUNTIME_SOURCES = $(ALL_DRUNTIME_COMPILE_DSOURCES) $(DRUNTIME_CSOURCES) \
8181
$(DRUNTIME_SSOURCES)
82-
REAL_DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo)
83-
REAL_DRUNTIME_TEST_OBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o)
84-
# Workaround issue #
85-
DRUNTIME_TEST_OBJECTS = $(filter-out rt/util/typeinfo.t.o \
86-
core/internal/convert.t.o, $(REAL_DRUNTIME_TEST_OBJECTS)) \
87-
rt/util/typeinfo.o core/internal/convert.o
88-
89-
DRUNTIME_TEST_LOBJECTS = $(filter-out rt/util/typeinfo.t.lo \
90-
core/internal/convert.t.lo, $(REAL_DRUNTIME_TEST_LOBJECTS)) \
91-
rt/util/typeinfo.lo core/internal/convert.lo
82+
DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo)
83+
DRUNTIME_TEST_OBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o)
9284

9385

9486
# Main library build definitions

libphobos/libdruntime/Makefile.in

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -658,16 +658,8 @@ ALL_DRUNTIME_COMPILE_DSOURCES = $(DRUNTIME_DSOURCES) $(am__append_1) \
658658
ALL_DRUNTIME_SOURCES = $(ALL_DRUNTIME_COMPILE_DSOURCES) $(DRUNTIME_CSOURCES) \
659659
$(DRUNTIME_SSOURCES)
660660

661-
REAL_DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo)
662-
REAL_DRUNTIME_TEST_OBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o)
663-
# Workaround issue #
664-
DRUNTIME_TEST_OBJECTS = $(filter-out rt/util/typeinfo.t.o \
665-
core/internal/convert.t.o, $(REAL_DRUNTIME_TEST_OBJECTS)) \
666-
rt/util/typeinfo.o core/internal/convert.o
667-
668-
DRUNTIME_TEST_LOBJECTS = $(filter-out rt/util/typeinfo.t.lo \
669-
core/internal/convert.t.lo, $(REAL_DRUNTIME_TEST_LOBJECTS)) \
670-
rt/util/typeinfo.lo core/internal/convert.lo
661+
DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo)
662+
DRUNTIME_TEST_OBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o)
671663

672664
@ENABLE_SHARED_TRUE@check_LTLIBRARIES = libgdruntime_t.la
673665
toolexeclib_LTLIBRARIES = libgdruntime.la

0 commit comments

Comments
 (0)