diff options
Diffstat (limited to 'Types/Test.hs')
| -rw-r--r-- | Types/Test.hs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Types/Test.hs b/Types/Test.hs index eadf6d29a..66f263c2e 100644 --- a/Types/Test.hs +++ b/Types/Test.hs @@ -1,6 +1,6 @@ {- git-annex test data types. - - - Copyright 2011-2015 Joey Hess <id@joeyh.name> + - Copyright 2011-2017 Joey Hess <id@joeyh.name> - - Licensed under the GNU GPL version 3 or higher. -} @@ -13,19 +13,24 @@ module Types.Test where import Test.Tasty.Options import Data.Monoid import Prelude +import Types.Command #endif #ifdef WITH_TESTSUITE data TestOptions = TestOptions { tastyOptionSet :: OptionSet , keepFailuresOption :: Bool + , fakeSsh :: Bool + , internalData :: CmdParams } instance Monoid TestOptions where - mempty = TestOptions mempty False + mempty = TestOptions mempty False False mempty mappend a b = TestOptions (tastyOptionSet a <> tastyOptionSet b) (keepFailuresOption a || keepFailuresOption b) + (fakeSsh a || fakeSsh b) + (internalData a <> internalData b) #else type TestOptions = () |