summaryrefslogtreecommitdiff
path: root/testsuite/tests/Makefile
diff options
context:
space:
mode:
authorAustin Seipp <austin@well-typed.com>2014-03-14 04:26:50 -0500
committerAustin Seipp <austin@well-typed.com>2014-03-14 04:32:55 -0500
commitc61d40e8780d5dad2767c7dfb3f9251d586926fe (patch)
treec53e810a964026b3d1cb2ebdfec93f9ca8329949 /testsuite/tests/Makefile
parent41ab58415224b7fa27cfc27846d4b56aad3e1949 (diff)
downloadhaskell-c61d40e8780d5dad2767c7dfb3f9251d586926fe.tar.gz
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>
Diffstat (limited to 'testsuite/tests/Makefile')
-rw-r--r--testsuite/tests/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/testsuite/tests/Makefile b/testsuite/tests/Makefile
index 9234bcc68e..3b2ce49a3d 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))