[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 2231db7ddda05cc7b94fe08d5935438cedea0d1c
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Jul 22 21:46:04 2005 +0100

    Test cleanups on Windows

diff --git a/testsrc/ConfigParser/Maintest.hs b/testsrc/ConfigParser/Maintest.hs
index 1c84f98..7e79432 100644
--- a/testsrc/ConfigParser/Maintest.hs
+++ b/testsrc/ConfigParser/Maintest.hs
@@ -24,7 +24,11 @@ import Testutil
 import Control.Exception
 import System.IO
 
+#ifndef mingw32_HOST_OS
 nullfile = openFile "/dev/null" ReadWriteMode
+#else
+nullfile = openFile "NUL:" ReadWriteMode
+#endif
 testfile = "testsrc/ConfigParser/test.cfg"
 p inp = forceEither $ readstring emptyCP inp
 f msg inp exp conv = TestLabel msg $ TestCase $ assertEqual "" (Right exp) (conv (p inp))
diff --git a/wintest.bat b/wintest.bat
index 63b246e..289c0a4 100644
--- a/wintest.bat
+++ b/wintest.bat
@@ -1,3 +1,4 @@
 cd testsrc
 ghc --make -package mtl -package HUnit -fallow-overlapping-instances -fallow-undecidable-instances -fglasgow-exts -cpp -o runtests.exe -i..\dist\build:.. runtests.hs
+cd ..
 

-- 
haskell-testpack