From 08d2a6fb3ddaf1489384c0b448f4393bfa4605bf Mon Sep 17 00:00:00 2001 From: Johannes Pfau Date: Sat, 24 Nov 2018 15:28:31 +0100 Subject: [PATCH] Enable tests for rt.util.typeinfo and core.internal.convert --- libphobos/libdruntime/Makefile.am | 12 ++---------- libphobos/libdruntime/Makefile.in | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/libphobos/libdruntime/Makefile.am b/libphobos/libdruntime/Makefile.am index 2a4d341a5..7596117db 100644 --- a/libphobos/libdruntime/Makefile.am +++ b/libphobos/libdruntime/Makefile.am @@ -79,16 +79,8 @@ ALL_DRUNTIME_COMPILE_DSOURCES += $(DRUNTIME_DSOURCES_GENERATED) ALL_DRUNTIME_SOURCES = $(ALL_DRUNTIME_COMPILE_DSOURCES) $(DRUNTIME_CSOURCES) \ $(DRUNTIME_SSOURCES) -REAL_DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo) -REAL_DRUNTIME_TEST_OBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o) -# Workaround issue # -DRUNTIME_TEST_OBJECTS = $(filter-out rt/util/typeinfo.t.o \ - core/internal/convert.t.o, $(REAL_DRUNTIME_TEST_OBJECTS)) \ - rt/util/typeinfo.o core/internal/convert.o - -DRUNTIME_TEST_LOBJECTS = $(filter-out rt/util/typeinfo.t.lo \ - core/internal/convert.t.lo, $(REAL_DRUNTIME_TEST_LOBJECTS)) \ - rt/util/typeinfo.lo core/internal/convert.lo +DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo) +DRUNTIME_TEST_OBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o) # Main library build definitions diff --git a/libphobos/libdruntime/Makefile.in b/libphobos/libdruntime/Makefile.in index 585182f59..a7cad64b3 100644 --- a/libphobos/libdruntime/Makefile.in +++ b/libphobos/libdruntime/Makefile.in @@ -658,16 +658,8 @@ ALL_DRUNTIME_COMPILE_DSOURCES = $(DRUNTIME_DSOURCES) $(am__append_1) \ ALL_DRUNTIME_SOURCES = $(ALL_DRUNTIME_COMPILE_DSOURCES) $(DRUNTIME_CSOURCES) \ $(DRUNTIME_SSOURCES) -REAL_DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo) -REAL_DRUNTIME_TEST_OBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o) -# Workaround issue # -DRUNTIME_TEST_OBJECTS = $(filter-out rt/util/typeinfo.t.o \ - core/internal/convert.t.o, $(REAL_DRUNTIME_TEST_OBJECTS)) \ - rt/util/typeinfo.o core/internal/convert.o - -DRUNTIME_TEST_LOBJECTS = $(filter-out rt/util/typeinfo.t.lo \ - core/internal/convert.t.lo, $(REAL_DRUNTIME_TEST_LOBJECTS)) \ - rt/util/typeinfo.lo core/internal/convert.lo +DRUNTIME_TEST_LOBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.lo) +DRUNTIME_TEST_OBJECTS = $(ALL_DRUNTIME_COMPILE_DSOURCES:.d=.t.o) @ENABLE_SHARED_TRUE@check_LTLIBRARIES = libgdruntime_t.la toolexeclib_LTLIBRARIES = libgdruntime.la