summaryrefslogtreecommitdiff
path: root/testkiki
diff options
context:
space:
mode:
authorjoe <joe@blackbird>2016-04-25 22:59:31 -0400
committerJames Crayne <jim.crayne@gmail.com>2016-04-26 06:04:05 -0400
commitfa772dad6752b77d55a521322aa9228a35b9f977 (patch)
treee45b9a6977e3ec7eb5bc441db83c3fbdffa26218 /testkiki
parentf00baeefa46a0507f88beee5535dfbb036097ece (diff)
backport testsuite to base 4.6.0
Diffstat (limited to 'testkiki')
-rw-r--r--testkiki/testkiki.hs9
1 files changed, 8 insertions, 1 deletions
diff --git a/testkiki/testkiki.hs b/testkiki/testkiki.hs
index 839cebf..32c8284 100644
--- a/testkiki/testkiki.hs
+++ b/testkiki/testkiki.hs
@@ -1,5 +1,9 @@
1{-# LANGUAGE OverloadedStrings #-} 1{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE DoAndIfThenElse #-} 2{-# LANGUAGE DoAndIfThenElse #-}
3{-# LANGUAGE CPP #-}
4#if !MIN_VERSION_base(4,7,0)
5import qualified System.Posix.Env
6#endif
3import System.Environment 7import System.Environment
4--import System.Posix.Env.ByteString (getEnv) 8--import System.Posix.Env.ByteString (getEnv)
5import System.Posix.Files 9import System.Posix.Files
@@ -15,6 +19,10 @@ import Control.Applicative
15import Control.Monad 19import Control.Monad
16import qualified Data.ByteString.Char8 as B 20import qualified Data.ByteString.Char8 as B
17 21
22#if !MIN_VERSION_base(4,7,0)
23setEnv k v = System.Posix.Env.setEnv k v True
24unsetEnv = System.Posix.Env.unsetEnv
25#endif
18 26
19data TestKikiSettings = TKS 27data TestKikiSettings = TKS
20 { gnupghome :: FilePath 28 { gnupghome :: FilePath
@@ -22,7 +30,6 @@ data TestKikiSettings = TKS
22 } 30 }
23 deriving (Show,Eq) 31 deriving (Show,Eq)
24 32
25
26main = do 33main = do
27 args <- getArgs 34 args <- getArgs
28 cwd <- getCurrentDirectory 35 cwd <- getCurrentDirectory