aboutsummaryrefslogtreecommitdiff
path: root/Test.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-15 16:54:44 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-15 16:54:44 -0400
commitad6a1ae82010e1b053c48bb520963ea28ea798ee (patch)
treef959eb234c5bd4de76e8650dfc74cc512e5063f6 /Test.hs
parent059137fb427561c05d04a0c62964f032b360df6b (diff)
avoid fromkey test when on crippled fs
Diffstat (limited to 'Test.hs')
-rw-r--r--Test.hs7
1 files changed, 5 insertions, 2 deletions
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"