https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89255
--- Comment #17 from ibuclaw at gcc dot gnu.org --- Author: ibuclaw Date: Fri Apr 12 06:25:17 2019 New Revision: 270302 URL: https://gcc.gnu.org/viewcvs?rev=270302&root=gcc&view=rev Log: libphobos: Replace library check programs with dg-runtest Fixes multilib handling when running the libphobos testsuite. libphobos/ChangeLog: 2019-04-12 Iain Buclaw <ibuc...@gdcproject.org> PR d/89255 * configure.ac (ENABLE_SHARED, ENABLE_STATIC): Remove conditionals. * configure: Regenerate. * d_rules.am (%.t.lo, %.t.o): Remove rules. (unittest_static_LINK, unittest_LINK, libgdruntime_t_la_LINK, libgphobos_t_la_LINK): Remove variables. * libdruntime/Makefile.am (DRUNTIME_TEST_LOBJECTS, DRUNTIME_TEST_OBJECTS, check_PROGRAMS, check_LTLIBRARIES, unittest_static_SOURCES, unittest_static_LIBTOOLFLAGS, unittest_static_LDFLAGS, unittest_static_LDADD, EXTRA_unittest_static_DEPENDENCIES, libgdruntime_t_la_SOURCES, libgdruntime_t_la_LIBTOOLFLAGS, libgdruntime_t_la_LDFLAGS, libgdruntime_t_la_LIBADD, EXTRA_libgdruntime_t_la_DEPENDENCIES, unittest_SOURCES, unittest_LIBTOOLFLAGS, unittest_LDFLAGS, unittest_LDADD): Remove variables. (clean-local): Remove rule. * libdruntime/Makefile.in: Regenerate. * src/Makefile.am (PHOBOS_TEST_LOBJECTS, PHOBOS_TEST_OBJECTS, check_PROGRAMS, check_LTLIBRARIES, unittest_static_SOURCES, unittest_static_LIBTOOLFLAGS, unittest_static_LDFLAGS, unittest_static_LDADD, EXTRA_unittest_static_DEPENDENCIES, libgdruntime_t_la_SOURCES, libgdruntime_t_la_LIBTOOLFLAGS, libgdruntime_t_la_LDFLAGS, libgdruntime_t_la_LIBADD, EXTRA_libgdruntime_t_la_DEPENDENCIES, unittest_SOURCES, unittest_LIBTOOLFLAGS, unittest_LDFLAGS, unittest_LDADD): Remove variables. (clean-local): Remove rule. * src/Makefile.in: Regenerate. * testsuite/lib/libphobos.exp (libphobos_test_name): New global. (libphobos_init): Set libphobos_test_name. (libphobos-dg-test): Override name if libphobos_test_name is set. (filter_libphobos_unittests): New proc. * testsuite/libphobos.aa/aa.exp: Don't load libphobos-dg.exp. * testsuite/libphobos.cycles/cycles.exp: Set libphobos_test_name. * testsuite/libphobos.druntime/druntime.exp: New file. * testsuite/libphobos.druntime_shared/druntime_shared.exp: New file. * testsuite/libphobos.phobos/phobos.exp: New file. * testsuite/libphobos.phobos_shared/phobos_shared.exp: New file. * testsuite/libphobos.shared/shared.exp: Use dg-runtest to run tests. * testsuite/libphobos.hash/hash.exp: Don't load libphobos-dg.exp * testsuite/libphobos.init_fini/init_fini.exp: Likewise. * testsuite/libphobos.thread/thread.exp: Likewise. * testsuite/libphobos.typeinfo/typeinfo.exp: Likewise. * testsuite/libphobos.unittests/unittests.exp: Remove. * testsuite/test_runner.d: Remove. * testsuite/testsuite_flags.in: Add phobos to --gdcpaths. Added: trunk/libphobos/testsuite/libphobos.druntime/ trunk/libphobos/testsuite/libphobos.druntime/druntime.exp - copied, changed from r270301, trunk/libphobos/testsuite/libphobos.aa/aa.exp trunk/libphobos/testsuite/libphobos.druntime_shared/ trunk/libphobos/testsuite/libphobos.druntime_shared/druntime_shared.exp - copied, changed from r270301, trunk/libphobos/testsuite/libphobos.aa/aa.exp trunk/libphobos/testsuite/libphobos.phobos/ trunk/libphobos/testsuite/libphobos.phobos/phobos.exp - copied, changed from r270301, trunk/libphobos/testsuite/libphobos.aa/aa.exp trunk/libphobos/testsuite/libphobos.phobos_shared/ trunk/libphobos/testsuite/libphobos.phobos_shared/phobos_shared.exp - copied, changed from r270301, trunk/libphobos/testsuite/libphobos.aa/aa.exp Removed: trunk/libphobos/testsuite/libphobos.unittests/ trunk/libphobos/testsuite/test_runner.d Modified: trunk/libphobos/ChangeLog trunk/libphobos/configure trunk/libphobos/configure.ac trunk/libphobos/d_rules.am trunk/libphobos/libdruntime/Makefile.am trunk/libphobos/libdruntime/Makefile.in trunk/libphobos/src/Makefile.am trunk/libphobos/src/Makefile.in trunk/libphobos/testsuite/lib/libphobos.exp trunk/libphobos/testsuite/libphobos.aa/aa.exp trunk/libphobos/testsuite/libphobos.cycles/cycles.exp trunk/libphobos/testsuite/libphobos.hash/hash.exp trunk/libphobos/testsuite/libphobos.init_fini/init_fini.exp trunk/libphobos/testsuite/libphobos.shared/shared.exp trunk/libphobos/testsuite/libphobos.thread/thread.exp trunk/libphobos/testsuite/libphobos.typeinfo/typeinfo.exp trunk/libphobos/testsuite/testsuite_flags.in
