diff options
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | git-annex.cabal | 1 | ||||
-rw-r--r-- | test.hs | 10 |
3 files changed, 8 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 6ba8696c0..f85ebb94d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (3.20120229) unstable; urgency=low + + * Fix test suite to not require a unicode locale. + + -- Joey Hess <joeyh@debian.org> Wed, 29 Feb 2012 02:31:31 -0400 + git-annex (3.20120227) unstable; urgency=low * Modifications to support ghc 7.4's handling of filenames. diff --git a/git-annex.cabal b/git-annex.cabal index 40f928dbf..69a1d5b76 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -39,6 +39,7 @@ Executable git-annex-shell Executable git-union-merge Main-Is: git-union-merge.hs + Build-Depends: text source-repository head type: git @@ -131,7 +131,7 @@ test_init = "git-annex init" ~: TestCase $ innewrepo $ do reponame = "test repo" test_add :: Test -test_add = "git-annex add" ~: TestList [basic, sha1dup, sha1unicode, subdirs] +test_add = "git-annex add" ~: TestList [basic, sha1dup, subdirs] where -- this test case runs in the main repo, to set up a basic -- annexed file that later tests will use @@ -158,10 +158,6 @@ test_add = "git-annex add" ~: TestList [basic, sha1dup, sha1unicode, subdirs] git_annex "add" [sha1annexedfiledup, "--backend=SHA1"] @? "add of second file with same SHA1 failed" annexed_present sha1annexedfiledup annexed_present sha1annexedfile - sha1unicode = TestCase $ intmpclonerepo $ do - writeFile sha1annexedfileunicode $ content sha1annexedfileunicode - git_annex "add" [sha1annexedfileunicode, "--backend=SHA1"] @? "add of unicode filename failed" - annexed_present sha1annexedfileunicode subdirs = TestCase $ intmpclonerepo $ do createDirectory "dir" writeFile "dir/foo" $ content annexedfile @@ -923,9 +919,6 @@ sha1annexedfile = "sha1foo" sha1annexedfiledup :: String sha1annexedfiledup = "sha1foodup" -sha1annexedfileunicode :: String -sha1annexedfileunicode = "foo¡" - ingitfile :: String ingitfile = "bar" @@ -935,7 +928,6 @@ content f | f == ingitfile = "normal file content" | f == sha1annexedfile ="sha1 annexed file content" | f == sha1annexedfiledup = content sha1annexedfile - | f == sha1annexedfileunicode ="sha1 annexed file content ¡ünicodé!" | f == wormannexedfile = "worm annexed file content" | otherwise = "unknown file " ++ f |