From d91eb24b5982be0f9a95f0ee16ec845f2dd7451d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 13 Jan 2016 12:18:20 -0400 Subject: [PATCH] fix build with old ghc And add missing (unused) mappend instance --- Types/Test.hs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Types/Test.hs b/Types/Test.hs index 2cf8dfbe2d..eadf6d29a0 100644 --- a/Types/Test.hs +++ b/Types/Test.hs @@ -11,6 +11,8 @@ module Types.Test where #ifdef WITH_TESTSUITE import Test.Tasty.Options +import Data.Monoid +import Prelude #endif #ifdef WITH_TESTSUITE @@ -21,6 +23,9 @@ data TestOptions = TestOptions instance Monoid TestOptions where mempty = TestOptions mempty False + mappend a b = TestOptions + (tastyOptionSet a <> tastyOptionSet b) + (keepFailuresOption a || keepFailuresOption b) #else type TestOptions = ()