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 b3aa125d6ce2180d8740bf0374ea54f63aaf5f2f (commit)
from 552c9b98ca281cf8039507dc71fdd9063ef94573 (commit)
Summary of changes:
.gitignore | 2 ++
test/runTestsAndCoverage.sh | 2 +-
test/snap-server-testsuite.cabal | 11 ++++++-----
3 files changed, 9 insertions(+), 6 deletions(-)
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 b3aa125d6ce2180d8740bf0374ea54f63aaf5f2f
Author: Gregory Collins <[email protected]>
Date: Tue Sep 7 12:06:27 2010 -0400
Attempt to solve weird hpc problem on buildbot by partitioning the .hpc
directories
diff --git a/.gitignore b/.gitignore
index 94ccd0a..b09a536 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
dist/
*.tix
.hpc
+.hpc-blackbox
+.hpc-testsuite
*.prof
*.hi
*.o
diff --git a/test/runTestsAndCoverage.sh b/test/runTestsAndCoverage.sh
index 1e0b751..fd0e425 100755
--- a/test/runTestsAndCoverage.sh
+++ b/test/runTestsAndCoverage.sh
@@ -42,7 +42,7 @@ for m in $EXCLUDES; do
EXCL="$EXCL --exclude=$m"
done
-hpc markup $EXCL --destdir=$DIR testsuite >/dev/null 2>&1
+hpc markup $EXCL --hpcdir .hpc-testsuite --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 2637fd5..77ff81f 100644
--- a/test/snap-server-testsuite.cabal
+++ b/test/snap-server-testsuite.cabal
@@ -13,7 +13,7 @@ Flag portable
Default: False
Executable testsuite
- hs-source-dirs: suite ../src
+ hs-source-dirs: suite ../src
main-is: TestSuite.hs
build-depends:
@@ -64,12 +64,13 @@ Executable testsuite
if flag(portable) || os(windows)
cpp-options: -DPORTABLE
- ghc-options: -O2 -Wall -fhpc -fwarn-tabs -funbox-strict-fields -threaded
+ ghc-options: -O2 -Wall -fhpc -hpcdir .hpc-testsuite -fwarn-tabs
+ -funbox-strict-fields -threaded
-fno-warn-unused-do-bind
Executable blackbox
- hs-source-dirs: blackbox ../src
+ hs-source-dirs: blackbox ../src
main-is: TestSuite.hs
build-depends:
@@ -270,7 +271,7 @@ Executable testserver
cpp-options: -DPORTABLE
ghc-options: -Wall -O2 -fwarn-tabs -funbox-strict-fields -threaded
- -fno-warn-unused-do-bind -fhpc
+ -fno-warn-unused-do-bind -fhpc -hpcdir .hpc-blackbox
ghc-prof-options: -prof -auto-all
@@ -281,4 +282,4 @@ Executable benchmark
base >= 4 && < 5,
network == 2.2.1.7,
HTTP >= 4000.0.9 && < 4001,
- criterion >= 0.5 && <0.6
+ criterion >= 0.5 && <0.6
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
