diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-03-22 17:09:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-03-22 17:32:47 -0400 |
| commit | e38a839a80ae70eba13b6fd0e7ee08be8a62c513 (patch) | |
| tree | c6f3faf1df29c0d9ddf7458554661ee4e50c9aed /Build | |
| parent | f1398b558316a936690a8f3b01493f498d15b659 (diff) | |
Rewrote free disk space checking code
Moving the portability handling into a small C library cleans up things
a lot, avoiding the pain of unpacking structs from inside haskell code.
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/Configure.hs | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/Build/Configure.hs b/Build/Configure.hs index 14667ba86..341b8840d 100644 --- a/Build/Configure.hs +++ b/Build/Configure.hs @@ -10,12 +10,8 @@ import Control.Applicative import Build.TestConfig import Utility.SafeCommand -tests :: Bool -> [TestCase] -tests True = cabaltests ++ common -tests False = common - -common :: [TestCase] -common = +tests :: [TestCase] +tests = [ TestCase "version" getVersion , TestCase "git" $ requireCmd "git" "git --version >/dev/null" , TestCase "git version" getGitVersion @@ -32,11 +28,6 @@ common = , TestCase "ssh connection caching" getSshConnectionCaching ] ++ shaTestCases [1, 256, 512, 224, 384] -cabaltests :: [TestCase] -cabaltests = - [ TestCase "StatFS" testStatFSDummy - ] - shaTestCases :: [Int] -> [TestCase] shaTestCases l = map make l where make n = @@ -81,10 +72,6 @@ getSshConnectionCaching :: Test getSshConnectionCaching = Config "sshconnectioncaching" . BoolConfig <$> boolSystem "sh" [Param "-c", Param "ssh -o ControlPersist=yes -V >/dev/null 2>/dev/null"] -testStatFSDummy :: Test -testStatFSDummy = - return $ Config "statfs_sanity_checked" $ MaybeBoolConfig Nothing - {- Set up cabal file with version. -} cabalSetup :: IO () cabalSetup = do |