diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-01 18:00:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-01 18:00:47 -0400 |
| commit | ddbf5df3c9940473663a6e562f8ee3583867046e (patch) | |
| tree | 40dc81d0c2693b5fd5fc3e5b9cd8df17e0505ec5 /CmdLine/GitAnnex.hs | |
| parent | 154cb13180fbe877d2030d83a415b30150ac7298 (diff) | |
| parent | d0a8e3d6217f2924b864393d425b6d7582370d07 (diff) | |
Merge branch 'newchunks'
I am happy enough with this to make it live!
Diffstat (limited to 'CmdLine/GitAnnex.hs')
| -rw-r--r-- | CmdLine/GitAnnex.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CmdLine/GitAnnex.hs b/CmdLine/GitAnnex.hs index 4c9377df9..80a784dd7 100644 --- a/CmdLine/GitAnnex.hs +++ b/CmdLine/GitAnnex.hs @@ -96,9 +96,10 @@ import qualified Command.XMPPGit #endif import qualified Command.RemoteDaemon #endif -import qualified Command.Test #ifdef WITH_TESTSUITE +import qualified Command.Test import qualified Command.FuzzTest +import qualified Command.TestRemote #endif #ifdef WITH_EKG import System.Remote.Monitoring @@ -187,9 +188,10 @@ cmds = concat #endif , Command.RemoteDaemon.def #endif - , Command.Test.def #ifdef WITH_TESTSUITE + , Command.Test.def , Command.FuzzTest.def + , Command.TestRemote.def #endif ] |