[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 ace71c7c1a655c8424f7005518536cf00c7670b4
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Dec 3 13:34:54 2006 +0100

    Tests now compile, but don't yet work

diff --git a/Makefile b/Makefile
index 703c9dd..bca61b6 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ local-pkg: all
 	echo "]" >> local-pkg
 
 testsrc/runtests: all $(wildcard testsrc/*.hs) $(wildcard testsrc/*/*.hs) $(wildcard testsrc/*/*/*.hs)
-	cd testsrc && ghc --make -package mtl -package HUnit $(GHCPARMS) -o runtests  -i../dist/build:.. runtests.hs
+	cd testsrc && ghc --make -package FilePath -package mtl -package HUnit $(GHCPARMS) -o runtests  -i../dist/build:../src runtests.hs
 
 test-ghc6: testsrc/runtests
 	testsrc/runtests
diff --git a/testsrc/AnyDBMtest.hs b/testsrc/AnyDBMtest.hs
index 8f9ec7b..1fbb48c 100644
--- a/testsrc/AnyDBMtest.hs
+++ b/testsrc/AnyDBMtest.hs
@@ -26,7 +26,7 @@ import Database.AnyDBM.StringDBM
 import Database.AnyDBM.MapDBM
 import System.Directory
 import System.IO.HVFS.Utils
-import System.Path.FilePath
+import System.FilePath
 import Data.HashTable
 import Data.List(sort)
 import Control.Exception(finally)
@@ -106,10 +106,10 @@ test_hashtable = generic_test (return ())
 test_mapdbm = generic_test (return ())
                   (\_ -> newMapDBM)
 test_stringdbm = generic_persist_test (return SystemFS)
-                   (\f -> openStringVDBM f (joinPaths "testtmp" "StringDBM") ReadWriteMode)
+                   (\f -> openStringVDBM f (joinPath ["testtmp", "StringDBM"]) ReadWriteMode)
                  ++
                  generic_test (return SystemFS)
-                   (\f -> openStringVDBM f (joinPaths "testtmp" "StringDBM") ReadWriteMode)
+                   (\f -> openStringVDBM f (joinPath ["testtmp", "StringDBM"]) ReadWriteMode)
 
 tests = TestList [TestLabel "HashTable" (TestList test_hashtable),
                   TestLabel "StringDBM" (TestList test_stringdbm),
diff --git a/testsrc/GZiptest.hs b/testsrc/GZiptest.hs
index 927056f..eabac89 100644
--- a/testsrc/GZiptest.hs
+++ b/testsrc/GZiptest.hs
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 module GZiptest(tests) where
 import Test.HUnit
 import System.FileArchive.GZip
-import System.Path.FilePath
+import System.FilePath
 import Data.Compression.Inflate
 import System.IO.Binary
 import System.IO
@@ -28,7 +28,7 @@ import Data.List
 
 mf fn exp conf = TestLabel fn $ TestCase $
                      do c <- readBinaryFile $
-                          joinPaths "testsrc" $ joinPaths "gzfiles" fn
+                          joinPath ["testsrc", "gzfiles", fn]
                         assertEqual "" exp (conf c)
 
 {-
diff --git a/testsrc/Str/CSVtest.hs b/testsrc/Str/CSVtest.hs
index 495796a..af44d48 100644
--- a/testsrc/Str/CSVtest.hs
+++ b/testsrc/Str/CSVtest.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 module Str.CSVtest(tests) where
 import Test.HUnit
-import Data.String.CSV
+import Data.CSV
 import Text.ParserCombinators.Parsec
 
 test_csv =

-- 
haskell-testpack