[commit: packages/Cabal] ghc-head: Test for "vanilla" lib/exe that uses TH. (968f5cf)
git at git.haskell.org
git at git.haskell.org
Mon Aug 26 23:28:22 CEST 2013
Repository : ssh://git@git.haskell.org/Cabal
On branch : ghc-head
Link : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=968f5cfb5ab75f9340d203dc8eb3624563647889
>---------------------------------------------------------------
commit 968f5cfb5ab75f9340d203dc8eb3624563647889
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date: Thu Jul 11 23:39:50 2013 +0200
Test for "vanilla" lib/exe that uses TH.
>---------------------------------------------------------------
968f5cfb5ab75f9340d203dc8eb3624563647889
Cabal/Cabal.cabal | 4 ++++
Cabal/tests/PackageTests.hs | 2 ++
Cabal/tests/PackageTests/TemplateHaskell/Check.hs | 7 +++++++
.../PackageTests/TemplateHaskell/{dynamic => vanilla}/Exe.hs | 0
.../PackageTests/TemplateHaskell/{dynamic => vanilla}/Lib.hs | 0
.../PackageTests/TemplateHaskell/{dynamic => vanilla}/TH.hs | 0
.../PackageTests/TemplateHaskell/{dynamic => vanilla}/my.cabal | 0
7 files changed, 13 insertions(+)
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
index f31950f..0f2b6ed 100644
--- a/Cabal/Cabal.cabal
+++ b/Cabal/Cabal.cabal
@@ -91,6 +91,10 @@ extra-source-files:
tests/PackageTests/PreProcess/Foo.hsc
tests/PackageTests/PreProcess/Main.hs
tests/PackageTests/PreProcess/my.cabal
+ tests/PackageTests/TemplateHaskell/vanilla/Exe.hs
+ tests/PackageTests/TemplateHaskell/vanilla/Lib.hs
+ tests/PackageTests/TemplateHaskell/vanilla/TH.hs
+ tests/PackageTests/TemplateHaskell/vanilla/my.cabal
tests/PackageTests/TemplateHaskell/dynamic/Exe.hs
tests/PackageTests/TemplateHaskell/dynamic/Lib.hs
tests/PackageTests/TemplateHaskell/dynamic/TH.hs
diff --git a/Cabal/tests/PackageTests.hs b/Cabal/tests/PackageTests.hs
index e9fd48d..95c287c 100644
--- a/Cabal/tests/PackageTests.hs
+++ b/Cabal/tests/PackageTests.hs
@@ -71,6 +71,8 @@ tests version inplaceSpec =
, hunit "BenchmarkExeV10/Test"
PackageTests.BenchmarkExeV10.Check.checkBenchmark
, hunit "BenchmarkOptions" PackageTests.BenchmarkOptions.Check.suite
+ , hunit "TemplateHaskell/vanilla"
+ PackageTests.TemplateHaskell.Check.vanilla
, hunit "TemplateHaskell/profiling"
PackageTests.TemplateHaskell.Check.profiling
, hunit "TemplateHaskell/dynamic"
diff --git a/Cabal/tests/PackageTests/TemplateHaskell/Check.hs b/Cabal/tests/PackageTests/TemplateHaskell/Check.hs
index ddadf81..fc2cbcb 100644
--- a/Cabal/tests/PackageTests/TemplateHaskell/Check.hs
+++ b/Cabal/tests/PackageTests/TemplateHaskell/Check.hs
@@ -4,6 +4,13 @@ import PackageTests.PackageTester
import System.FilePath
import Test.HUnit
+vanilla :: Test
+vanilla = TestCase $ do
+ let spec = PackageSpec ("PackageTests" </>
+ "TemplateHaskell" </> "vanilla") []
+ result <- cabal_build spec
+ assertBuildSucceeded result
+
profiling :: Test
profiling = TestCase $ do
let flags = ["--enable-library-profiling"
diff --git a/Cabal/tests/PackageTests/TemplateHaskell/dynamic/Exe.hs b/Cabal/tests/PackageTests/TemplateHaskell/vanilla/Exe.hs
similarity index 100%
copy from Cabal/tests/PackageTests/TemplateHaskell/dynamic/Exe.hs
copy to Cabal/tests/PackageTests/TemplateHaskell/vanilla/Exe.hs
diff --git a/Cabal/tests/PackageTests/TemplateHaskell/dynamic/Lib.hs b/Cabal/tests/PackageTests/TemplateHaskell/vanilla/Lib.hs
similarity index 100%
copy from Cabal/tests/PackageTests/TemplateHaskell/dynamic/Lib.hs
copy to Cabal/tests/PackageTests/TemplateHaskell/vanilla/Lib.hs
diff --git a/Cabal/tests/PackageTests/TemplateHaskell/dynamic/TH.hs b/Cabal/tests/PackageTests/TemplateHaskell/vanilla/TH.hs
similarity index 100%
copy from Cabal/tests/PackageTests/TemplateHaskell/dynamic/TH.hs
copy to Cabal/tests/PackageTests/TemplateHaskell/vanilla/TH.hs
diff --git a/Cabal/tests/PackageTests/TemplateHaskell/dynamic/my.cabal b/Cabal/tests/PackageTests/TemplateHaskell/vanilla/my.cabal
similarity index 100%
copy from Cabal/tests/PackageTests/TemplateHaskell/dynamic/my.cabal
copy to Cabal/tests/PackageTests/TemplateHaskell/vanilla/my.cabal
More information about the ghc-commits
mailing list