Remove executables

Author: jorisdral

bloomfilter/examples/spell.hs

@@ -1,16 +1,17 @@
 {-# LANGUAGE BangPatterns #-}
 module Main (main) where
 
-import           Control.Monad (forM_, when)
+import           Control.Monad (forM_, unless, when)
 import           System.Environment (getArgs)
 
 import qualified Data.BloomFilter as B
 
 main :: IO ()
 main = do
     files <- getArgs
-    dictionary <- readFile "/usr/share/dict/words"
-    let !bloom = B.fromList (B.policyForFPR 0.01) (words dictionary)
-    forM_ files $ \file ->
-          putStrLn . unlines . filter (`B.notElem` bloom) . words
-      =<< readFile file
+    unless (null files) $ do
+      dictionary <- readFile "/usr/share/dict/words"
+      let !bloom = B.fromList (B.policyForFPR 0.01) (words dictionary)
+      forM_ files $ \file ->
+            putStrLn . unlines . filter (`B.notElem` bloom) . words
+        =<< readFile file

bloomfilter/tests/fpr-calc.hs

@@ -12,7 +12,6 @@ import qualified Data.IntSet as IntSet
 import           Data.List (unfoldr)
 import           Math.Regression.Simple
 import           System.Environment (getArgs)
-import           System.Exit (exitFailure)
 import           System.IO
 import           System.Random
 
@@ -29,7 +28,8 @@ main = do
       ["Regression"] -> main_regression
       _   -> do
         putStrLn "Usage: bloomfilter-fpr-calc [Generate|Regression]"
-        exitFailure
+        -- NOTE: we expicitly don't use exitFailure here because
+        -- @bloomfilter-fpr-calc@ is a cabal @test-suite@.
 
 main_regression :: IO ()
 main_regression = do

lsm-tree.cabal

@@ -692,9 +692,14 @@ benchmark bloomfilter-bench
     , lsm-tree:bloomfilter
     , random
 
-executable bloomfilter-fpr-calc
+-- TODO: ideally this should be an executable because it's not really testing
+-- anything, but if we make it an executable component then the solver takes the
+-- build-depends into account when building the public library, which is not
+-- desirable. Maybe these executables should be moved out into a separate
+-- package?
+test-suite bloomfilter-fpr-calc
   import:         language, warnings
-  scope:          private
+  type:           exitcode-stdio-1.0
   hs-source-dirs: bloomfilter/tests
   main-is:        fpr-calc.hs
   build-depends:
@@ -707,9 +712,14 @@ executable bloomfilter-fpr-calc
 
   ghc-options:    -threaded
 
-executable bloomfilter-spell
+-- TODO: ideally this should be an executable because it's not really testing
+-- anything, but if we make it an executable component then the solver takes the
+-- build-depends into account when building the public library, which is not
+-- desirable. Maybe these executables should be moved out into a separate
+-- package?
+test-suite bloomfilter-spell
   import:         language
-  scope:          private
+  type:           exitcode-stdio-1.0
   hs-source-dirs: bloomfilter/examples
   main-is:        spell.hs
   build-depends: