diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2019-04-12 06:25:17 +0000 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2019-04-12 06:25:17 +0000 |
| commit | 0d6aae249d1a2ac9efe67407553711be3883a7f8 (patch) | |
| tree | 1731fc388464c1b457df04fa9cbc13b96961a099 /libphobos/d_rules.am | |
| parent | c50eadba265a0e9b3b84267477f953d0d5872522 (diff) | |
| download | gcc-0d6aae249d1a2ac9efe67407553711be3883a7f8.zip gcc-0d6aae249d1a2ac9efe67407553711be3883a7f8.tar.gz gcc-0d6aae249d1a2ac9efe67407553711be3883a7f8.tar.bz2 | |
libphobos: Replace library check programs with dg-runtest
Fixes multilib handling when running the libphobos testsuite.
libphobos/ChangeLog:
2019-04-12 Iain Buclaw <ibuclaw@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.
From-SVN: r270302
Diffstat (limited to 'libphobos/d_rules.am')
| -rw-r--r-- | libphobos/d_rules.am | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/libphobos/d_rules.am b/libphobos/d_rules.am index 7c174b9..1358ae9 100644 --- a/libphobos/d_rules.am +++ b/libphobos/d_rules.am @@ -33,29 +33,6 @@ toolexeclibdir = $(libphobos_toolexeclibdir) LTDCOMPILE = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(GDC) $(AM_DFLAGS) -# Unittest rules. Unfortunately we can't use _DFLAGS in automake without -# explicit D support, so use this hack. -# Compile D sources with libtool and test flags -%.t.lo : %.d - $(LTDCOMPILE) $(GDCFLAGSX) $(MULTIFLAGS) $(D_EXTRA_DFLAGS) -c -o $@ $< - -# Compile objects for static linking with test flags -# Automake breaks empty rules, so use the shell NOP : -%.t.o : %.t.lo - @: - -# Override executable linking commands: We have to use GDC for linking -# to make sure we link pthreads and other dependencies -unittest_static_LINK = $(LIBTOOL) --tag=D \ - $(unittest_static_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_static_LDFLAGS) \ - $(LDFLAGS) -o $@ - -unittest_LINK = $(LIBTOOL) --tag=D \ - $(unittest_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(GDC) $(AM_CFLAGS) $(CFLAGS) $(unittest_LDFLAGS) \ - $(LDFLAGS) -o $@ - # Also override library link commands: This is not strictly # required, but we want to record additional dependencies such # as pthread in the library @@ -63,15 +40,6 @@ libgdruntime_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \ $(libgdruntime_la_LDFLAGS) $(LDFLAGS) -o $@ -libgdruntime_t_la_LINK = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \ - $(libgdruntime_t_la_LDFLAGS) $(LDFLAGS) -o $@ - libgphobos_la_LINK = $(LIBTOOL) --tag=D $(libgphobos_la_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(GDC) $(AM_CFLAGS) $(CFLAGS) \ $(libgphobos_la_LDFLAGS) $(LDFLAGS) -o $@ - -libgphobos_t_la_LINK = $(LIBTOOL) --tag=D \ - $(libgphobos_t_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(GDC) $(AM_CFLAGS) $(CFLAGS) $(libgphobos_t_la_LDFLAGS) \ - $(LDFLAGS) -o $@ |