summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-06-18 13:08:28 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-06-18 13:08:28 -0400
commitf32687f895d1fd9b6a5925b4b47136bca2566bb3 (patch)
tree8aa84c1454bb3d63b5a9a03cd0a7f1461e06e051
parente31c91f0e1e250336226ac07957437cde4bd2a93 (diff)
fix regression test on windows
-rw-r--r--Utility/Path.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Utility/Path.hs b/Utility/Path.hs
index 4df0703ab..8c78409b8 100644
--- a/Utility/Path.hs
+++ b/Utility/Path.hs
@@ -131,7 +131,9 @@ prop_relPathDirToFile_regressionTest = same_dir_shortcurcuits_at_difference
- location, but it's not really the same directory.
- Code used to get this wrong. -}
same_dir_shortcurcuits_at_difference =
- relPathDirToFile "/tmp/r/lll/xxx/yyy/18" "/tmp/r/.git/annex/objects/18/gk/SHA256-foo/SHA256-foo" == "../../../../.git/annex/objects/18/gk/SHA256-foo/SHA256-foo"
+ relPathDirToFile (joinPath [pathSeparator : "tmp", "r", "lll", "xxx", "yyy", "18"])
+ (joinPath [pathSeparator : "tmp", "r", ".git", "annex", "objects", "18", "gk", "SHA256-foo", "SHA256-foo"])
+ == joinPath ["..", "..", "..", "..", ".git", "annex", "objects", "18", "gk", "SHA256-foo", "SHA256-foo"]
{- Given an original list of paths, and an expanded list derived from it,
- generates a list of lists, where each sublist corresponds to one of the