diff options
| -rw-r--r-- | Annex/Path.hs | 8 | ||||
| -rw-r--r-- | BuildInfo.hs | 6 | ||||
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | CmdLine/GitAnnex.hs | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Test.hs | 14 | ||||
| -rw-r--r-- | Types/Test.hs | 8 | ||||
| -rw-r--r-- | git-annex.cabal | 16 | ||||
| -rw-r--r-- | stack-windows.yaml | 1 | ||||
| -rw-r--r-- | stack.yaml | 1 |
10 files changed, 16 insertions, 50 deletions
diff --git a/Annex/Path.hs b/Annex/Path.hs index 8209e5ba0..0f85b11bf 100644 --- a/Annex/Path.hs +++ b/Annex/Path.hs @@ -5,8 +5,6 @@ - Licensed under the GNU GPL version 3 or higher. -} -{-# LANGUAGE CPP #-} - module Annex.Path where import Common @@ -17,7 +15,7 @@ import System.Environment (getExecutablePath) {- A fully qualified path to the currently running git-annex program. - - - getExecutablePath is available since ghc 7.4.2. On OSs it supports + - getExecutablePath is used when possible. On OSs it supports - well, it returns the complete path to the program. But, on other OSs, - it might return just the basename. Fall back to reading the programFile, - or searching for the command name in PATH. @@ -31,12 +29,8 @@ programPath = go =<< getEnv "GIT_ANNEX_PROGRAMPATH" where go (Just p) = return p go Nothing = do -#if MIN_VERSION_base(4,6,0) exe <- getExecutablePath p <- if isAbsolute exe then return exe else readProgramFile -#else - p <- readProgramFile -#endif maybe cannotFindProgram return =<< searchPath p diff --git a/BuildInfo.hs b/BuildInfo.hs index e00f27a96..271c55211 100644 --- a/BuildInfo.hs +++ b/BuildInfo.hs @@ -33,11 +33,6 @@ buildFlags = filter (not . null) #else #warning Building without local pairing. #endif -#ifdef WITH_TESTSUITE - , "Testsuite" -#else -#warning Building without the testsuite. -#endif #ifdef WITH_S3 , "S3" #if MIN_VERSION_aws(0,10,6) @@ -83,6 +78,7 @@ buildFlags = filter (not . null) -- Always enabled now, but users may be used to seeing these flags -- listed. , "Feeds" + , "Testsuite" ] -- Not a complete list, let alone a listing transitive deps, but only @@ -1,3 +1,9 @@ +git-annex (6.20171215) UNRELEASED; urgency=medium + + * Removed the testsuite build flag; test suite is always included. + + -- Joey Hess <id@joeyh.name> Wed, 20 Dec 2017 12:11:46 -0400 + git-annex (6.20171214) unstable; urgency=medium * Use youtube-dl rather than quvi to download media from web pages, diff --git a/CmdLine/GitAnnex.hs b/CmdLine/GitAnnex.hs index 1a5a13839..da4e54be3 100644 --- a/CmdLine/GitAnnex.hs +++ b/CmdLine/GitAnnex.hs @@ -116,10 +116,8 @@ import qualified Command.WebApp #endif #endif import qualified Command.Test -#ifdef WITH_TESTSUITE import qualified Command.FuzzTest import qualified Command.TestRemote -#endif #ifdef WITH_BENCHMARK import qualified Command.Benchmark #endif @@ -226,10 +224,8 @@ cmds testoptparser testrunner = #endif #endif , Command.Test.cmd testoptparser testrunner -#ifdef WITH_TESTSUITE , Command.FuzzTest.cmd , Command.TestRemote.cmd -#endif #ifdef WITH_BENCHMARK , Command.Benchmark.cmd #endif @@ -299,7 +299,7 @@ dist/caballog: git-annex.cabal # TODO should be possible to derive this from caballog. hdevtools: hdevtools --stop-server || true - hdevtools check git-annex.hs -g -cpp -g -i -g -idist/build/git-annex/git-annex-tmp -g -i. -g -idist/build/autogen -g -Idist/build/autogen -g -Idist/build/git-annex/git-annex-tmp -g -IUtility -g -DWITH_TESTSUITE -g -DWITH_S3 -g -DWITH_ASSISTANT -g -DWITH_INOTIFY -g -DWITH_DBUS -g -DWITH_PAIRING -g -g -optP-include -g -optPdist/build/autogen/cabal_macros.h -g -odir -g dist/build/git-annex/git-annex-tmp -g -hidir -g dist/build/git-annex/git-annex-tmp -g -stubdir -g dist/build/git-annex/git-annex-tmp -g -threaded -g -Wall -g -XHaskell98 -g -XPackageImports -g -XLambdaCase + hdevtools check git-annex.hs -g -cpp -g -i -g -idist/build/git-annex/git-annex-tmp -g -i. -g -idist/build/autogen -g -Idist/build/autogen -g -Idist/build/git-annex/git-annex-tmp -g -IUtility -g -DWITH_S3 -g -DWITH_ASSISTANT -g -DWITH_INOTIFY -g -DWITH_DBUS -g -DWITH_PAIRING -g -g -optP-include -g -optPdist/build/autogen/cabal_macros.h -g -odir -g dist/build/git-annex/git-annex-tmp -g -hidir -g dist/build/git-annex/git-annex-tmp -g -stubdir -g dist/build/git-annex/git-annex-tmp -g -threaded -g -Wall -g -XHaskell98 -g -XPackageImports -g -XLambdaCase distributionupdate: git pull @@ -12,18 +12,6 @@ module Test where import Types.Test import Options.Applicative.Types -#ifndef WITH_TESTSUITE - -import Options.Applicative (pure) - -optParser :: Parser () -optParser = pure () - -runner :: Maybe (() -> IO ()) -runner = Nothing - -#else - import Test.Tasty import Test.Tasty.Runners import Test.Tasty.HUnit @@ -2235,5 +2223,3 @@ getKey b f = fromJust <$> annexeval go , Types.KeySource.contentLocation = f , Types.KeySource.inodeCache = Nothing } - -#endif diff --git a/Types/Test.hs b/Types/Test.hs index 66f263c2e..50c460f50 100644 --- a/Types/Test.hs +++ b/Types/Test.hs @@ -5,18 +5,13 @@ - Licensed under the GNU GPL version 3 or higher. -} -{-# LANGUAGE CPP #-} - module Types.Test where -#ifdef WITH_TESTSUITE import Test.Tasty.Options import Data.Monoid import Prelude import Types.Command -#endif -#ifdef WITH_TESTSUITE data TestOptions = TestOptions { tastyOptionSet :: OptionSet , keepFailuresOption :: Bool @@ -32,8 +27,5 @@ instance Monoid TestOptions where (fakeSsh a || fakeSsh b) (internalData a <> internalData b) -#else -type TestOptions = () -#endif type TestRunner = TestOptions -> IO () diff --git a/git-annex.cabal b/git-annex.cabal index a030a5aa0..f2a8b47f5 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -62,6 +62,7 @@ Extra-Source-Files: doc/git-annex-enable-tor.mdwn doc/git-annex-examinekey.mdwn doc/git-annex-expire.mdwn + doc/git-annex-export.mdwn doc/git-annex-find.mdwn doc/git-annex-findref.mdwn doc/git-annex-fix.mdwn @@ -276,9 +277,6 @@ Flag AndroidSplice Description: Building to get TH splices for Android Default: False -Flag TestSuite - Description: Embed the test suite into git-annex - Flag TorrentParser Description: Use haskell torrent library to parse torrent files @@ -310,7 +308,6 @@ Executable git-annex optparse-applicative (>= 0.11.0), containers (>= 0.5.0.0), exceptions (>= 0.6), - QuickCheck (>= 2.1), stm (>= 2.3), mtl (>= 2), uuid (>= 1.2.6), @@ -358,7 +355,12 @@ Executable git-annex crypto-api, cryptonite, memory, - split + split, + QuickCheck (>= 2.1), + tasty (>= 0.7), + tasty-hunit, + tasty-quickcheck, + tasty-rerun CC-Options: -Wall GHC-Options: -Wall -fno-warn-tabs Extensions: PackageImports, LambdaCase @@ -391,10 +393,6 @@ Executable git-annex if impl(ghc <= 7.6.3) Other-Modules: Utility.Touch.Old - if flag(TestSuite) - Build-Depends: tasty (>= 0.7), tasty-hunit, tasty-quickcheck, tasty-rerun - CPP-Options: -DWITH_TESTSUITE - if flag(S3) Build-Depends: conduit, conduit-extra, aws (>= 0.9.2) CPP-Options: -DWITH_S3 diff --git a/stack-windows.yaml b/stack-windows.yaml index 82a6144e7..84edf0449 100644 --- a/stack-windows.yaml +++ b/stack-windows.yaml @@ -6,7 +6,6 @@ flags: pairing: true network-uri: true s3: true - testsuite: true webdav: true torrentparser: true webapp: true diff --git a/stack.yaml b/stack.yaml index e82bc2be3..64e1081f9 100644 --- a/stack.yaml +++ b/stack.yaml @@ -6,7 +6,6 @@ flags: pairing: true network-uri: true s3: true - testsuite: true webdav: true torrentparser: true webapp: true |