diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-10-25 17:24:03 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-10-25 17:24:03 -0400 |
| commit | e8b83454e15b02357659ab7ec9f9d342cd484c05 (patch) | |
| tree | bc7824cb0b63c3d8589f4e982fd061f84c41d9fa | |
| parent | 495c792d6d3072b2d3703d734173ac4aa6c4d3f8 (diff) | |
allow building w/o rsync installed
rsync is needed to run, but may not be on the build machine; that's ok
| -rw-r--r-- | Build/Configure.hs | 6 | ||||
| -rw-r--r-- | Build/TestConfig.hs | 12 |
2 files changed, 3 insertions, 15 deletions
diff --git a/Build/Configure.hs b/Build/Configure.hs index 7c7c2efe0..f51ceef79 100644 --- a/Build/Configure.hs +++ b/Build/Configure.hs @@ -24,14 +24,14 @@ tests :: [TestCase] tests = [ TestCase "version" (Config "packageversion" . StringConfig <$> getVersion) , TestCase "UPGRADE_LOCATION" getUpgradeLocation - , TestCase "git" $ requireCmd "git" "git --version >/dev/null" + , TestCase "git" $ testCmd "git" "git --version >/dev/null" , TestCase "git version" getGitVersion , testCp "cp_a" "-a" , testCp "cp_p" "-p" , testCp "cp_preserve_timestamps" "--preserve=timestamps" , testCp "cp_reflink_auto" "--reflink=auto" - , TestCase "xargs -0" $ requireCmd "xargs_0" "xargs -0 </dev/null" - , TestCase "rsync" $ requireCmd "rsync" "rsync --version >/dev/null" + , TestCase "xargs -0" $ testCmd "xargs_0" "xargs -0 </dev/null" + , TestCase "rsync" $ testCmd "rsync" "rsync --version >/dev/null" , TestCase "curl" $ testCmd "curl" "curl --version >/dev/null" , TestCase "wget" $ testCmd "wget" "wget --version >/dev/null" , TestCase "wget unclutter options" checkWgetUnclutter diff --git a/Build/TestConfig.hs b/Build/TestConfig.hs index 79979c5fb..f6ad2df6f 100644 --- a/Build/TestConfig.hs +++ b/Build/TestConfig.hs @@ -61,18 +61,6 @@ runTests (TestCase tname t : ts) = do rest <- runTests ts return $ c:rest -{- Tests that a command is available, aborting if not. -} -requireCmd :: ConfigKey -> String -> Test -requireCmd k cmdline = do - ret <- testCmd k cmdline - handle ret - where - handle r@(Config _ (BoolConfig True)) = return r - handle r = do - testEnd r - error $ "** the " ++ c ++ " command is required" - c = head $ words cmdline - {- Checks if a command is available by running a command line. -} testCmd :: ConfigKey -> String -> Test testCmd k cmdline = do |