From ad6a1ae82010e1b053c48bb520963ea28ea798ee Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 15 Feb 2016 16:54:44 -0400 Subject: avoid fromkey test when on crippled fs --- Test.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Test.hs') diff --git a/Test.hs b/Test.hs index 8971d18e0..a49122fdd 100644 --- a/Test.hs +++ b/Test.hs @@ -374,8 +374,11 @@ test_reinject = intmpclonerepoInDirect $ do key <- Types.Key.key2file <$> getKey backendSHA1 tmp git_annex "reinject" [tmp, sha1annexedfile] @? "reinject failed" annexed_present sha1annexedfile - git_annex "fromkey" [key, sha1annexedfiledup] @? "fromkey failed for dup" - annexed_present_locked sha1annexedfiledup + -- fromkey can't be used on a crippled filesystem, since it makes a + -- symlink + unlessM (annexeval Config.crippledFileSystem) $ do + git_annex "fromkey" [key, sha1annexedfiledup] @? "fromkey failed for dup" + annexed_present_locked sha1annexedfiledup where tmp = "tmpfile" -- cgit v1.2.3