From 89e5b22376cc915eacf40a82a5202aaf93c17d4c Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 13 Jan 2016 12:18:20 -0400
Subject: fix build with old ghc

And add missing (unused) mappend instance
---
 Types/Test.hs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Types/Test.hs')

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 = ()
-- 
cgit v1.2.3