[commit: packages/bytestring] 0.10.4.x, master: Disable regression test and turn on test-framework (1cc7cfb)

[git at git.haskell.org]

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

On branches: 0.10.4.x,master
Link       : http://git.haskell.org/packages/bytestring.git/commitdiff/1cc7cfbf28f7b9c1ffdb9ab511a32be0e0194eb1

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

commit 1cc7cfbf28f7b9c1ffdb9ab511a32be0e0194eb1
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Jun 7 11:48:44 2014 +0200

    Disable regression test and turn on test-framework
    
    The regression test has been disabled because it seems to allocate way
    too much memory to be useful for CI purposes.
    
    Moreover, the other two test-suites have been changed to be build using
    test-framework which should have more well-behaved logging output
    suitable for Travis-CI


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

1cc7cfbf28f7b9c1ffdb9ab511a32be0e0194eb1
 bytestring.cabal | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bytestring.cabal b/bytestring.cabal
index 6e14f6d..73f9235 100644
--- a/bytestring.cabal
+++ b/bytestring.cabal
@@ -160,6 +160,7 @@ test-suite prop-compiled
   ghc-options:      -fwarn-unused-binds
                     -fno-enable-rewrite-rules
                     -threaded -rtsopts
+  cpp-options:      -DHAVE_TEST_FRAMEWORK=1
   default-language: Haskell98
   -- older ghc had issues with language pragmas guarded by cpp
   if impl(ghc < 7)
@@ -168,6 +169,8 @@ test-suite prop-compiled
                         NamedFieldPuns
 
 test-suite regressions
+  -- temporarily disabled as it allocates too much memory
+  buildable:        False
   type:             exitcode-stdio-1.0
   main-is:          Regressions.hs
   hs-source-dirs:   . tests
@@ -200,9 +203,14 @@ test-suite test-builder
                     byteorder                  == 1.0.*,
                     dlist                      == 0.5.*,
                     directory,
-                    mtl                        >= 2.0 && < 2.2
+                    mtl                        >= 2.0 && < 2.2,
+                    HUnit,
+                    test-framework,
+                    test-framework-hunit,
+                    test-framework-quickcheck2
 
   ghc-options:      -Wall -fwarn-tabs -threaded -rtsopts
+  cpp-options:      -DHAVE_TEST_FRAMEWORK=1
 
   default-language: Haskell98
   -- older ghc had issues with language pragmas guarded by cpp