From c61d40e8780d5dad2767c7dfb3f9251d586926fe Mon Sep 17 00:00:00 2001 From: Austin Seipp <austin@well-typed.com> Date: Fri, 14 Mar 2014 04:26:50 -0500 Subject: [PATCH] testsuite: look for tests-ghc directories for libraries Who knows how long the tests for containers have been broken. They haven't bitrotted, however. Signed-off-by: Austin Seipp <austin@well-typed.com> --- testsuite/tests/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testsuite/tests/Makefile b/testsuite/tests/Makefile index 9234bcc68ee0..3b2ce49a3dc4 100644 --- a/testsuite/tests/Makefile +++ b/testsuite/tests/Makefile @@ -12,7 +12,9 @@ $(error base library does not seem to be installed) endif # Now find the "tests" directories of those libraries, where they exist -LIBRARY_TEST_PATHS := $(wildcard $(patsubst %, $(TOP)/../libraries/%/tests, $(LIBRARIES))) +LIBRARY_TEST_PATHS := $(wildcard $(patsubst %, $(TOP)/../libraries/%/tests, $(LIBRARIES))) \ + $(wildcard $(patsubst %, $(TOP)/../libraries/%/tests-ghc, $(LIBRARIES))) + # Add tests from packages RUNTEST_OPTS += $(patsubst %, --rootdir=%, $(LIBRARY_TEST_PATHS)) -- GitLab