[commit: ghc] master: testsuite: look for tests-ghc directories for libraries (c61d40e)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c61d40e8780d5dad2767c7dfb3f9251d586926fe/ghc

>---------------------------------------------------------------

commit c61d40e8780d5dad2767c7dfb3f9251d586926fe
Author: Austin Seipp <austin at well-typed.com>
Date:   Fri Mar 14 04:26:50 2014 -0500

    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 at well-typed.com>


>---------------------------------------------------------------

c61d40e8780d5dad2767c7dfb3f9251d586926fe
 testsuite/tests/Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/Makefile b/testsuite/tests/Makefile
index 9234bcc..3b2ce49 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))