[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 39ee7f8560c56d511ba37f670ba1aad3e5737d9d
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Dec 21 04:39:40 2004 +0100

    Checkpointing (compiles, fixed a test)
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-111)

diff --git a/ChangeLog b/ChangeLog
index f6f23f7..7c8d353 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2004-12-20 21:39:40 GMT	John Goerzen <jgoerzen at complete.org>	patch-111
+
+    Summary:
+      Checkpointing (compiles, fixed a test)
+    Revision:
+      missingh--head--0.7--patch-111
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/IO/HVFS/InstanceHelpers.hs
+     testsrc/HVFStest.hs
+
+
 2004-12-20 21:34:43 GMT	John Goerzen <jgoerzen at complete.org>	patch-110
 
     Summary:
diff --git a/libsrc/MissingH/IO/HVFS/InstanceHelpers.hs b/libsrc/MissingH/IO/HVFS/InstanceHelpers.hs
index 2eae3f4..6536797 100644
--- a/libsrc/MissingH/IO/HVFS/InstanceHelpers.hs
+++ b/libsrc/MissingH/IO/HVFS/InstanceHelpers.hs
@@ -111,7 +111,7 @@ findMelem x path =
                       walk newobj xs
         in do
            c <- readIORef $ content x
-           case walk (MemoryDirectory c) (slice_path path) of
+           case walk (MemoryDirectory c) (sliced2) of
               Left err -> fail err
               Right result -> return result
 
diff --git a/testsrc/HVFStest.hs b/testsrc/HVFStest.hs
index 8e05e22..9fcbe91 100644
--- a/testsrc/HVFStest.hs
+++ b/testsrc/HVFStest.hs
@@ -48,6 +48,10 @@ test_structure =
         [
          f "root" (\x -> ["test.txt", "file2.txt", "emptydir", "dir1"]
                          `ioeq` vGetDirectoryContents x "/")
+        ,f "emptydir" (\x -> [] `ioeq` vGetDirectoryContents x "/emptydir")
+        ,f "dir1" (\x -> ["file3.txt", "test.txt", "dir2"] `ioeq`
+                   vGetDirectoryContents x "/dir1")
+        ,f "dir1/dir2" (\x -> [] `ioeq` vGetDirectoryContents x "/dir1/dir2")
         ]
                             
 

-- 
haskell-testpack