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".
The branch, master has been updated
via 7dda19bcf9f8df5325c3a6503f493ab1435000a5 (commit)
from 0f3d29bb2438fff4b6de2400846c8e8f1c6551ff (commit)
Summary of changes:
.gitignore | 1 +
test/suite/Snap/TestCommon.hs | 12 +++++++++++-
2 files changed, 12 insertions(+), 1 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 7dda19bcf9f8df5325c3a6503f493ab1435000a5
Author: Gregory Collins <[email protected]>
Date: Sat Jun 18 15:38:48 2011 -0400
Switch snap testsuite to cabal-dev
diff --git a/.gitignore b/.gitignore
index 539f86b..f34d3ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ dist/
**/.DS_Store
docs/templates/out
cabal-dev/
+test/cabal-dev
diff --git a/test/suite/Snap/TestCommon.hs b/test/suite/Snap/TestCommon.hs
index 810e551..537c807 100644
--- a/test/suite/Snap/TestCommon.hs
+++ b/test/suite/Snap/TestCommon.hs
@@ -26,7 +26,13 @@ testGeneratedProject projName snapInitArgs cabalInstallArgs
httpPort
makeWorkDirectory projectPath
setCurrentDirectory projectPath
systemOrDie $ "snap init " ++ snapInitArgs
- systemOrDie $ "cabal install " ++ cabalInstallArgs
+ systemOrDie $ "cabal-dev " ++ cabalDevArgs
+ ++ " add-source ../../../snap-core"
+ systemOrDie $ "cabal-dev " ++ cabalDevArgs
+ ++ " add-source ../../../snap-server"
+ systemOrDie $ "cabal-dev " ++ cabalDevArgs
+ ++ " add-source ../.."
+ systemOrDie $ "cabal-dev install " ++ args
let cmd = ("." </> "dist" </> "build" </> projName </> projName)
++ " -p " ++ show httpPort
putStrLn $ "Running \"" ++ cmd ++ "\""
@@ -42,6 +48,10 @@ testGeneratedProject projName snapInitArgs cabalInstallArgs
httpPort
waitABit = threadDelay $ 2*10^(6::Int)
+ cabalDevArgs = "-s ../cabal-dev" </> projName
+
+ args = cabalDevArgs ++ " " ++ cabalInstallArgs
+
systemOrDie :: String -> IO ()
systemOrDie s = do
putStrLn $ "Running \"" ++ s ++ "\""
-----------------------------------------------------------------------
hooks/post-receive
--
snap
_______________________________________________
Snap mailing list
[email protected]
https://mailman-mail5.webfaction.com/listinfo/snap
