From 9b1be63b8a99207ee00aedb128e592d032721cd1 Mon Sep 17 00:00:00 2001 From: Felipe Lessa Date: Mon, 1 Jun 2015 02:49:00 -0300 Subject: [PATCH] Don't test AcidStorage on local storage if on GHC < 7.10. I give up. I hope the tests finally go green on Travis. --- .../serversession-backend-acid-state.cabal | 4 +++- serversession-backend-acid-state/tests/Main.hs | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/serversession-backend-acid-state/serversession-backend-acid-state.cabal b/serversession-backend-acid-state/serversession-backend-acid-state.cabal index 7a1433a..03ca6a9 100644 --- a/serversession-backend-acid-state/serversession-backend-acid-state.cabal +++ b/serversession-backend-acid-state/serversession-backend-acid-state.cabal @@ -48,7 +48,9 @@ test-suite tests , serversession , serversession-backend-acid-state main-is: Main.hs - ghc-options: -Wall -threaded "-with-rtsopts=-N -s -M1.5G -F1.5 -c" -rtsopts + extensions: + CPP + ghc-options: -Wall -threaded "-with-rtsopts=-N -s -M1G -c" -rtsopts source-repository head diff --git a/serversession-backend-acid-state/tests/Main.hs b/serversession-backend-acid-state/tests/Main.hs index 7d345f6..b274e6f 100644 --- a/serversession-backend-acid-state/tests/Main.hs +++ b/serversession-backend-acid-state/tests/Main.hs @@ -19,4 +19,8 @@ main = describe "AcidStorage on memory only" $ allStorageTests acidMem it runIO parallel shouldBe shouldReturn shouldThrow describe "AcidStorage on local storage" $ +#if MIN_TOOL_VERSION_ghc(7,10,1) allStorageTests acidLocal it runIO parallel shouldBe shouldReturn shouldThrow +#else + pendingWith "disabled on GHC < 7.10.1, cf. ." +#endif