few final bits for fully working test suite on windows

3 files changed, 9 insertions, 2 deletions

diff --git a/Test.hs b/Test.hs
index 13b65a07b..9673844ca 100644
--- a/Test.hs
+++ b/Test.hs
@@ -75,7 +75,12 @@ main = do
 	putStrLn "  (Do not be alarmed by odd output here; it's normal."
         putStrLn "   wait for the last line to see how it went.)"
 	rs <- runhunit =<< prepare False
+#ifndef __WINDOWS__
 	directrs <- runhunit =<< prepare True
+#else
+	-- Windows is only going to use direct mode, so don't test twice.
+	let directrs = []
+#endif
 	divider
 	propigate (rs++directrs) qcok
   where
@@ -1005,6 +1010,7 @@ cleanup dir = do
 		recurseDir SystemFS dir >>=
 			filterM doesDirectoryExist >>=
 				mapM_ Utility.FileMode.allowWrite
+		-- For unknown reasons, this sometimes fails on Windows.
 		void $ tryIO $ removeDirectoryRecursive dir
 	
 checklink :: FilePath -> Assertion
diff --git a/doc/todo/windows_support.mdwn b/doc/todo/windows_support.mdwn
index 827f3bc43..98b49b84a 100644
--- a/doc/todo/windows_support.mdwn
+++ b/doc/todo/windows_support.mdwn
@@ -7,7 +7,8 @@ now! --[[Joey]]
 * Does not work with Cygwin's build of git (that git does not consistently
   support use of DOS style paths, which git-annex uses on Windows). 
   Must use the upstream build of git for Windows.
-* test suite doesn't work
+* Test suite works and passes, but 6 tests are disabled due to failing.
+* Directory and rsync special remotes are known buggy.
 * Bad file locking, it's probably not safe to run more than one git-annex
   process at the same time on Windows.
 * No support for the assistant or webapp.
diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh
index 43c4e2e08..caea20983 100644
--- a/standalone/windows/build.sh
+++ b/standalone/windows/build.sh
@@ -58,4 +58,4 @@ rm -f last-incremental-failed
 
 # Test git-annex
 rm -rf .t
-withcyg dist/build/git-annex/git-annex.exe test || true
+withcyg dist/build/git-annex/git-annex.exe test