[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit cf879417400aae0d483f5d2f937477f043966efb
Author: John Goerzen <jgoerzen at complete.org>
Date:   Mon Jan 26 10:17:07 2009 -0600

    Working on test output

diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs
index 8703c12..7c804c9 100644
--- a/src/Test/HUnit/Tools.hs
+++ b/src/Test/HUnit/Tools.hs
@@ -63,11 +63,14 @@ qccheck config lbl property =
 {- | Like 'runTestText', but with more verbose output. -}
 runVerbTestText :: HU.PutText st -> HU.Test -> IO (HU.Counts, st)
 runVerbTestText (HU.PutText put us) t = do
+  hSetBuffering stdout LineBuffering
+  hSetBuffering stderr LineBuffering
   (counts, us') <- HU.performTest reportStart reportError reportFailure us t
   us'' <- put (HU.showCounts counts) True us'
   return (counts, us'')
  where
-  reportStart ss us = do hPrintf stdout "\rTesting %-70s\n"
+  reportStart ss us = do hFlush stderr
+                         hPrintf stdout "\rTesting %-70s\n"
                                      (HU.showPath (HU.path ss))
                          hFlush stdout
                          put (HU.showCounts (HU.counts ss)) False us
@@ -123,7 +126,11 @@ qc2huVerbose maxTest =
 {- | Run verbose tests. -}
 runVerboseTests :: HU.Test -> IO (HU.Counts, Int)
 runVerboseTests tests =
-    runVerbTestText (HU.putTextToHandle stderr True) $ tests
+    -- runVerbTestText (HU.putTextToHandle stderr True) $ tests
+    runVerbTestText (myPutText stderr True) $ tests
+    where myPutText h b = do r <- HU.putTextToHandle h b
+                             hFlush h
+                             return r
 
 {- | Label the tests list. -}
 tl :: String -> [Test] -> Test

-- 
haskell-testpack