refactored config

Author: zohl

.travis.yml

@@ -40,7 +40,7 @@ before_script:
   - psql -U postgres -c "create role test_role with password 'TEST' login;"
 
 script:
-  - cabal configure --enable-tests --enable-coverage -v2 -f dev -f db-tests -f -older-call-syntax
+  - cabal configure --enable-tests --enable-coverage -v2 -f dev -f build-examples
   - cabal build
   - cabal test --show-details=always
   - cabal sdist

examples/Main.hs

@@ -1,6 +1,3 @@
-{-# LANGUAGE CPP #-}
-
-#ifdef DBTests
 import Common (withDB, withRollback)
 import Data.Text ()
 import Database.PostgreSQL.Simple (Connection, ConnectInfo(..))
@@ -27,7 +24,4 @@ spec conn = mapM_ ($ conn) [
   , specUsers
   , specMessages
   ]
-#else
-main :: IO ()
-main = return ()
-#endif
+

postgresql-simple-bind.cabal

@@ -19,8 +19,8 @@ flag dev
   manual:      True
   default:     False
 
-flag db-tests
-  description: Turn on tests with database.
+flag build-examples
+  description: Whether to build (and test) examples.
   manual:      False
   default:     False
 
@@ -84,35 +84,36 @@ test-suite tests
   default-language:    Haskell2010
 
   if flag(dev)
-    ghc-options:      -Wall -Werror
+    ghc-options: -Werror
   else
-    ghc-options:      -O2 -Wall
+    ghc-options: -O2
 
 
 test-suite examples
   type:           exitcode-stdio-1.0
 
-  hs-source-dirs: examples
-  main-is:        Main.hs
+  hs-source-dirs:   examples
+  main-is:          Main.hs
+  default-language: Haskell2010
 
-  ghc-options: -Wall
+  ghc-options: -Wall -Wno-redundant-constraints
 
-  build-depends: base >= 4.7 && < 5.0
-               , attoparsec >= 0.13.0 && < 0.14
-               , bytestring >= 0.10.8 && < 0.11
-               , case-conversion
-               , data-default
-               , hspec
-               , postgresql-simple >= 0.5.2 && < 0.6
-               , postgresql-simple-bind
-               , text >= 1.2.2 && < 1.3
+  if flag(build-examples)
+    build-depends: base >= 4.7 && < 5.0
+                 , attoparsec >= 0.13.0 && < 0.14
+                 , bytestring >= 0.10.8 && < 0.11
+                 , case-conversion
+                 , data-default
+                 , hspec
+                 , postgresql-simple >= 0.5.2 && < 0.6
+                 , postgresql-simple-bind
+                 , text >= 1.2.2 && < 1.3
 
-  default-language:    Haskell2010
+    if flag(dev)
+      ghc-options: -Werror
+    else
+      ghc-options: -O2
 
-  if flag(dev)
-    ghc-options:      -Wall -Wno-redundant-constraints -Werror
   else
-    ghc-options:      -O2 -Wall -Wno-redundant-constraints
+    buildable: False
 
-  if flag(db-tests)
-    cpp-options: -DDBTests