summaryrefslogtreecommitdiff
path: root/configure.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-04-07 22:03:31 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-04-07 22:03:31 -0400
commite2404ca40933ccdc046d08f7040b2d86e32d5f88 (patch)
tree6dc73067bbfb00cf989970f6b7c178bf6a39c09b /configure.hs
parentb889543507959c0a311bc8387f78ec4c0e93f7a8 (diff)
refactor away whichCmd and some other cleanup
Diffstat (limited to 'configure.hs')
-rw-r--r--configure.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.hs b/configure.hs
index c0e3d8106..0661813ae 100644
--- a/configure.hs
+++ b/configure.hs
@@ -11,7 +11,7 @@ tests = [
, testCp "cp_a" "-a"
, testCp "cp_p" "-p"
, testCp "cp_reflink_auto" "--reflink=auto"
- , TestCase "uuid generator" $ selectCmd "uuid" ["uuid", "uuidgen"]
+ , TestCase "uuid generator" $ selectCmd True "uuid" ["uuid", "uuidgen"] ""
, TestCase "xargs -0" $ requireCmd "xargs_0" "xargs -0 </dev/null"
, TestCase "rsync" $ requireCmd "rsync" "rsync --version >/dev/null"
, TestCase "curl" $ testCmd "curl" "curl --version >/dev/null"
@@ -22,9 +22,9 @@ shaTestCases :: [Int] -> [TestCase]
shaTestCases l = map make l
where make n =
let
- cmds = map (\x -> "sha" ++ show n ++ x ++ " </dev/null") ["", "sum"]
+ cmds = map (\x -> "sha" ++ show n ++ x) ["", "sum"]
key = "sha" ++ show n
- in TestCase key $ whichCmd key cmds
+ in TestCase key $ selectCmd False key cmds "</dev/null"
tmpDir :: String
tmpDir = "tmp"