This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap-server".
The branch, master has been updated
via fead1586fdd5485041c549caeccca67822c4530a (commit)
from b3aa125d6ce2180d8740bf0374ea54f63aaf5f2f (commit)
Summary of changes:
src/Snap/Internal/Http/Parser.hs | 10 ---
test/blackbox/Paths_snap_server.hs | 9 ---
test/blackbox/TestSuite.hs | 8 --
test/runTestsAndCoverage.sh | 6 +-
test/snap-server-testsuite.cabal | 136 +-----------------------------------
5 files changed, 6 insertions(+), 163 deletions(-)
delete mode 100644 test/blackbox/Paths_snap_server.hs
delete mode 100644 test/blackbox/TestSuite.hs
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fead1586fdd5485041c549caeccca67822c4530a
Author: Gregory Collins <[email protected]>
Date: Tue Sep 7 16:02:29 2010 -0400
Reorg testsuite -- blackbox testing in external process is not feasible
because we can't do test coverage properly
diff --git a/src/Snap/Internal/Http/Parser.hs b/src/Snap/Internal/Http/Parser.hs
index 4eb4810..2510ae2 100644
--- a/src/Snap/Internal/Http/Parser.hs
+++ b/src/Snap/Internal/Http/Parser.hs
@@ -45,8 +45,6 @@ import Prelude hiding (take, takeWhile)
------------------------------------------------------------------------------
import Snap.Internal.Http.Types hiding (Enumerator)
import Snap.Iteratee hiding (take, foldl', filter)
-import qualified Snap.Iteratee as I
-import Snap.Internal.Iteratee.Debug
------------------------------------------------------------------------------
@@ -124,14 +122,6 @@ writeChunkedTransferEncoding it = do
return out
where
- ignoreEOF iter = IterateeG $ \s ->
- case s of
- (EOF Nothing) -> return $ Cont iter Nothing
- _ -> do
- i <- runIter iter s >>= checkIfDone return
- return $ Cont (ignoreEOF i) Nothing
-
- --wrap iter = bufIt (0,D.empty) $ ignoreEOF iter
wrap iter = bufIt (0,D.empty) iter
bufSiz = 16284
diff --git a/test/blackbox/Paths_snap_server.hs
b/test/blackbox/Paths_snap_server.hs
deleted file mode 100644
index dc7b284..0000000
--- a/test/blackbox/Paths_snap_server.hs
+++ /dev/null
@@ -1,9 +0,0 @@
-module Paths_snap_server (
- version
- ) where
-
-import Data.Version (Version(..))
-
-version :: Version
-version = Version {versionBranch = [0,0,0], versionTags = ["unknown"]}
-
diff --git a/test/blackbox/TestSuite.hs b/test/blackbox/TestSuite.hs
deleted file mode 100644
index 9c1b3e9..0000000
--- a/test/blackbox/TestSuite.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-module Main where
-
-import Test.Framework (defaultMain, testGroup)
-
-
-main :: IO ()
-main = defaultMain tests
- where tests = [ ]
diff --git a/test/runTestsAndCoverage.sh b/test/runTestsAndCoverage.sh
index fd0e425..be73ea5 100755
--- a/test/runTestsAndCoverage.sh
+++ b/test/runTestsAndCoverage.sh
@@ -26,8 +26,8 @@ mkdir -p $DIR
EXCLUDES='Main
Data.CIByteString
-Data.HashMap.Concurrent.Internal
-Data.HashMap.Concurrent.Tests
+Data.Concurrent.HashMap.Internal
+Data.Concurrent.HashMap.Tests
Paths_snap_server
Snap.Internal.Http.Parser.Tests
Snap.Internal.Http.Server.Tests
@@ -42,7 +42,7 @@ for m in $EXCLUDES; do
EXCL="$EXCL --exclude=$m"
done
-hpc markup $EXCL --hpcdir .hpc-testsuite --destdir=$DIR testsuite >/dev/null
2>&1
+hpc markup $EXCL --destdir=$DIR testsuite >/dev/null 2>&1
rm -f testsuite.tix
diff --git a/test/snap-server-testsuite.cabal b/test/snap-server-testsuite.cabal
index 77ff81f..fbe9b57 100644
--- a/test/snap-server-testsuite.cabal
+++ b/test/snap-server-testsuite.cabal
@@ -41,6 +41,7 @@ Executable testsuite
parallel > 2,
iteratee >= 0.3.1 && < 0.4,
snap-core >= 0.2.12 && <0.3,
+ template-haskell,
test-framework >= 0.3.1 && <0.4,
test-framework-hunit >= 0.2.5 && < 0.3,
test-framework-quickcheck2 >= 0.2.6 && < 0.3,
@@ -64,68 +65,11 @@ Executable testsuite
if flag(portable) || os(windows)
cpp-options: -DPORTABLE
- ghc-options: -O2 -Wall -fhpc -hpcdir .hpc-testsuite -fwarn-tabs
+ ghc-options: -O2 -Wall -fhpc -fwarn-tabs
-funbox-strict-fields -threaded
-fno-warn-unused-do-bind
-Executable blackbox
- hs-source-dirs: blackbox ../src
- main-is: TestSuite.hs
-
- build-depends:
- QuickCheck >= 2,
- array >= 0.3 && <0.4,
- attoparsec >= 0.8.1 && < 0.9,
- attoparsec-iteratee >= 0.1.1 && <0.2,
- base >= 4 && < 5,
- binary >= 0.5 && < 0.6,
- bytestring,
- bytestring-nums >= 0.3.1 && < 0.4,
- bytestring-show >= 0.3.2 && < 0.4,
- containers,
- directory-tree,
- dlist >= 0.5 && < 0.6,
- filepath,
- haskell98,
- HTTP >= 4000.0.9 && < 4001,
- HUnit >= 1.2 && < 2,
- monads-fd,
- murmur-hash >= 0.1 && < 0.2,
- network == 2.2.1.7,
- network-bytestring >= 0.1.2 && < 0.2,
- old-locale,
- parallel > 2,
- iteratee >= 0.3.1 && < 0.4,
- snap-core >= 0.2.12 && <0.3,
- test-framework >= 0.3.1 && <0.4,
- test-framework-hunit >= 0.2.5 && < 0.3,
- test-framework-quickcheck2 >= 0.2.6 && < 0.3,
- time,
- transformers,
- vector >= 0.6.0.1 && < 0.7
-
- if !os(windows)
- build-depends: unix
-
- if flag(libev)
- build-depends: hlibev >= 0.2.5 && < 0.3
- other-modules: Snap.Internal.Http.Server.LibevBackend
- cpp-options: -DLIBEV
- else
- build-depends: network-bytestring >= 0.1.2 && < 0.2,
- PSQueue >= 1.1 && <1.2
-
- other-modules: Snap.Internal.Http.Server.SimpleBackend
-
- if flag(portable) || os(windows)
- cpp-options: -DPORTABLE
-
- ghc-options: -O2 -Wall -fhpc -fwarn-tabs -funbox-strict-fields -threaded
- -fno-warn-unused-do-bind
-
-
-
Executable pongserver
hs-source-dirs: pongserver ../src
main-is: Main.hs
@@ -154,80 +98,6 @@ Executable pongserver
network == 2.2.1.7,
network-bytestring >= 0.1.2 && < 0.2,
snap-core >= 0.2.12 && <0.3,
- time,
- transformers,
- unix-compat,
- vector >= 0.6.0.1 && < 0.7
-
- if flag(portable) || os(windows)
- cpp-options: -DPORTABLE
- else
- build-depends: unix
-
- if flag(libev)
- build-depends: hlibev >= 0.2.5 && < 0.3
- other-modules: Snap.Internal.Http.Server.LibevBackend
- cpp-options: -DLIBEV
- else
- build-depends: network-bytestring >= 0.1.2 && < 0.2,
- PSQueue >= 1.1 && <1.2
-
- other-modules: Snap.Internal.Http.Server.SimpleBackend
-
- if os(linux) && !flag(portable)
- cpp-options: -DLINUX -DHAS_SENDFILE
- other-modules:
- System.SendFile,
- System.SendFile.Linux
-
- if os(darwin) && !flag(portable)
- cpp-options: -DOSX -DHAS_SENDFILE
- other-modules:
- System.SendFile,
- System.SendFile.Darwin
-
- if os(freebsd) && !flag(portable)
- cpp-options: -DFREEBSD -DHAS_SENDFILE
- other-modules:
- System.SendFile,
- System.SendFile.FreeBSD
-
- if flag(portable) || os(windows)
- cpp-options: -DPORTABLE
-
- ghc-options: -Wall -O2 -fwarn-tabs -funbox-strict-fields -threaded
- -fno-warn-unused-do-bind
- ghc-prof-options: -prof -auto-all
-
-
-Executable testserver
- hs-source-dirs: testserver ../src
- main-is: Main.hs
-
- build-depends:
- QuickCheck >= 2,
- array >= 0.3 && <0.4,
- attoparsec >= 0.8.1 && < 0.9,
- attoparsec-iteratee >= 0.1.1 && <0.2,
- base >= 4 && < 5,
- bytestring,
- bytestring-nums >= 0.3.1 && < 0.4,
- bytestring-show >= 0.3.2 && < 0.4,
- cereal >= 0.3 && < 0.4,
- containers,
- directory-tree,
- dlist >= 0.5 && < 0.6,
- filepath,
- haskell98,
- HUnit >= 1.2 && < 2,
- monads-fd,
- old-locale,
- parallel > 2,
- iteratee >= 0.3.1 && < 0.4,
- murmur-hash >= 0.1 && < 0.2,
- network == 2.2.1.7,
- network-bytestring >= 0.1.2 && < 0.2,
- snap-core >= 0.2.12 && <0.3,
template-haskell,
time,
transformers,
@@ -271,7 +141,7 @@ Executable testserver
cpp-options: -DPORTABLE
ghc-options: -Wall -O2 -fwarn-tabs -funbox-strict-fields -threaded
- -fno-warn-unused-do-bind -fhpc -hpcdir .hpc-blackbox
+ -fno-warn-unused-do-bind
ghc-prof-options: -prof -auto-all
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
