aboutsummaryrefslogtreecommitdiff
path: root/Types
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-01-13 12:18:20 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-01-13 12:18:20 -0400
commit89e5b22376cc915eacf40a82a5202aaf93c17d4c (patch)
tree627163b9ff1b4487db422176ce2de3fddd70b5e9 /Types
parent11a378801273bd33968eb9bf0184a168e2715608 (diff)
fix build with old ghc
And add missing (unused) mappend instance
Diffstat (limited to 'Types')
-rw-r--r--Types/Test.hs5
1 files changed, 5 insertions, 0 deletions
diff --git a/Types/Test.hs b/Types/Test.hs
index 2cf8dfbe2..eadf6d29a 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 = ()