cabal-install integration-tests replacement omnibus patch

.gitignore

@@ -53,10 +53,7 @@ tags
 progress.txt
 
 # test files
-dist-test
 register.sh
-/Cabal/tests/PackageTests/Configure/include/HsZlibConfig.h
-/Cabal/tests/PackageTests/Configure/zlib.buildinfo
 
 # python artifacts from documentation builds
 *.pyc

.travis.yml

@@ -24,7 +24,7 @@ matrix:
      sudo: required
    # These don't have -dyn/-prof whitelisted yet, so we have to
    # do the old-style installation
-   - env: GHCVER=7.4.2 SCRIPT=script CABAL_LIB_ONLY=YES
+   - env: GHCVER=7.4.2 SCRIPT=script CABAL_LIB_ONLY=YES TEST_OTHER_VERSIONS=YES
      os: linux
      sudo: required
    - env: GHCVER=7.6.3 SCRIPT=script
@@ -40,13 +40,13 @@ matrix:
    - env: GHCVER=7.10.3 SCRIPT=script
      os: linux
      sudo: required
-   - env: GHCVER=8.0.1 SCRIPT=script DEPLOY_DOCS=YES TEST_OTHER_VERSIONS=YES
+   - env: GHCVER=8.0.1 SCRIPT=script DEPLOY_DOCS=YES
      sudo: required
      os: linux
    - env: GHCVER=8.0.1 SCRIPT=solver-debug-flags
      sudo: required
      os: linux
-   - env: GHCVER=8.0.1 SCRIPT=script PARSEC=YES TEST_OTHER_VERSIONS=YES
+   - env: GHCVER=8.0.1 SCRIPT=script PARSEC=YES
      os: linux
      sudo: required
    - env: GHCVER=8.0.1 SCRIPT=bootstrap
@@ -56,15 +56,22 @@ matrix:
    # We axed GHC 7.6 and earlier because it's not worth the trouble to
    # make older GHC work with clang's cpp.  See
    # https://ghc.haskell.org/trac/ghc/ticket/8493
-   - env: GHCVER=7.8.4 SCRIPT=script
+   - env: GHCVER=7.8.4 SCRIPT=script CABAL_LIB_ONLY=YES
      os: osx
      osx_image: xcode6.4 # We need 10.10
+   - env: GHCVER=7.8.4 SCRIPT=script CABAL_INSTALL_ONLY=YES
+     os: osx
+     osx_image: xcode6.4
 
    # TODO: We might want to specify OSX version
    # https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version
-   - env: GHCVER=7.10.3 SCRIPT=script
+   - env: GHCVER=7.10.3 SCRIPT=script CABAL_LIB_ONLY=YES
+     os: osx
+   - env: GHCVER=7.10.3 SCRIPT=script CABAL_INSTALL_ONLY=YES
+     os: osx
+   - env: GHCVER=8.0.1 SCRIPT=script CABAL_LIB_ONLY=YES
      os: osx
-   - env: GHCVER=8.0.1 SCRIPT=script
+   - env: GHCVER=8.0.1 SCRIPT=script CABAL_INSTALL_ONLY=YES
      os: osx
    - env: GHCVER=8.0.1 SCRIPT=bootstrap
      os: osx

Cabal/Distribution/Simple/Program/Db.hs

@@ -52,6 +52,7 @@ module Distribution.Simple.Program.Db (
     -- ** Query and manipulate the program db
     configureProgram,
     configureAllKnownPrograms,
+    unconfigureProgram,
     lookupProgramVersion,
     reconfigurePrograms,
     requireProgram,
@@ -365,6 +366,13 @@ configurePrograms verbosity progs progdb =
   foldM (flip (configureProgram verbosity)) progdb progs
 
 
+-- | Unconfigure a program.  This is basically a hack and you shouldn't
+-- use it, but it can be handy for making sure a 'requireProgram'
+-- actually reconfigures.
+unconfigureProgram :: String -> ProgramDb -> ProgramDb
+unconfigureProgram progname =
+  updateConfiguredProgs $ Map.delete progname
+
 -- | Try to configure all the known programs that have not yet been configured.
 --
 configureAllKnownPrograms :: Verbosity

Cabal/doc/nix-local-build.rst

@@ -580,6 +580,32 @@ package, and thus apply globally:
 
     The command line variant of this field is ``--keep-going``.
 
+.. option:: --builddir=DIR
+
+    Specifies the name of the directory where build products for
+    build will be stored; defaults to ``dist-newstyle``.  If a
+    relative name is specified, this directory is resolved relative
+    to the root of the project (i.e., where the ``cabal.project``
+    file lives.)
+
+    This option cannot be specified via a ``cabal.project`` file.
+
+.. option:: --project-file=FILE
+
+    Specifies the name of the project file used to specify the
+    rest of the top-level configuration; defaults to ``cabal.project``.
+    This name not only specifies the name of the main project file,
+    but also the auxiliary project files ``cabal.project.freeze``
+    and ``cabal.project.local``; for example, if you specify
+    ``--project-file=my.project``, then the other files that will
+    be probed are ``my.project.freeze`` and ``my.project.local``.
+
+    If the specified project file is a relative path, we will
+    look for the file relative to the current working directory,
+    and then for the parent directory, until the project file is
+    found or we have hit the top of the user's home directory.
+
+    This option cannot be specified via a ``cabal.project`` file.
 
 Solver configuration options
 ----------------------------
@@ -1697,5 +1723,4 @@ Most users generally won't need these.
     The command line variant of this field is
     ``--cabal-lib-version=1.24.0.1``.
 
-
 .. include:: references.inc

appveyor.yml

@@ -20,6 +20,9 @@ build_script:
   - Setup build
   - Setup test --show-details=streaming --test-option=--hide-successes
   - Setup install
+  # hackage-repo-tool doesn't build on Windows:
+  # https://github.com/well-typed/hackage-security/issues/175
+  # - echo "" | ..\cabal install hackage-repo-tool --allow-newer=Cabal,time --constraint="Cabal == 1.25.0.0"
   - cd ..\cabal-testsuite
   - ghc --make -threaded -i Setup.hs -package Cabal-1.25.0.0
   - echo "" | ..\cabal install --only-dependencies --enable-tests
@@ -45,3 +48,5 @@ build_script:
   - ..\cabal test integration-tests2 --show-details=streaming --test-option=--hide-successes
   - ..\cabal test solver-quickcheck --show-details=streaming --test-option=--hide-successes --test-option=--quickcheck-tests=1000
   - ..\cabal test memory-usage-tests --show-details=streaming
+  - cd ..\cabal-testsuite
+  - dist\build\cabal-tests\cabal-tests.exe -j3 --skip-setup-tests --with-cabal=..\cabal-install\dist\build\cabal\cabal.exe

cabal-install/Distribution/Client/CmdConfigure.hs

@@ -31,9 +31,10 @@ configureCommand = Client.installCommand {
   commandUsage        = usageAlternatives "new-configure" [ "[FLAGS]" ],
   commandDescription  = Just $ \_ -> wrapText $
         "Configures a Nix-local build project, downloading source from"
-     ++ " the network and writing out a cabal.project.local file which"
-     ++ " saves any FLAGS, to be reapplied on subsequent invocations to "
-     ++ "new-build.",
+     ++ " the network and writing out a cabal.project.local file"
+     ++ " (or $project_file.local, if --project-file is specified)"
+     ++ " which saves any FLAGS, to be reapplied on subsequent invocations to"
+     ++ " new-build.",
   commandNotes        = Just $ \pname ->
         "Examples:\n"
      ++ "  " ++ pname ++ " new-configure           "
@@ -65,7 +66,7 @@ configureAction (configFlags, configExFlags, installFlags, haddockFlags)
           hookPrePlanning = \rootDir _ cliConfig ->
             -- Write out the @cabal.project.local@ so it gets picked up by the
             -- planning phase.
-            writeProjectLocalExtraConfig rootDir cliConfig,
+            writeProjectLocalExtraConfig installFlags rootDir cliConfig,
 
           hookSelectPlanSubset = \buildSettings' elaboratedPlan -> do
             -- Select the same subset of targets as 'CmdBuild' would

cabal-install/Distribution/Client/CmdFreeze.hs

@@ -11,7 +11,7 @@ import Distribution.Client.ProjectPlanning
 import Distribution.Client.ProjectConfig
          ( ProjectConfig(..), ProjectConfigShared(..)
          , commandLineFlagsToProjectConfig, writeProjectLocalFreezeConfig
-         , findProjectRoot )
+         , findProjectRoot, getProjectFileName )
 import Distribution.Client.Targets
          ( UserConstraint(..) )
 import Distribution.Solver.Types.ConstraintSource
@@ -60,6 +60,7 @@ freezeCommand = Client.installCommand {
   commandDescription  = Just $ \_ -> wrapText $
         "Performs dependency solving on a Nix-local build project, and"
      ++ " then writes out the precise dependency configuration to cabal.project.freeze"
+     ++ " (or $project_file.freeze if --project-file is specified)"
      ++ " so that the plan is always used in subsequent builds.",
   commandNotes        = Just $ \pname ->
         "Examples:\n"
@@ -86,23 +87,23 @@ freezeAction (configFlags, configExFlags, installFlags, haddockFlags)
     cabalDir <- defaultCabalDir
     let cabalDirLayout = defaultCabalDirLayout cabalDir
 
-    projectRootDir <- findProjectRoot
-    let distDirLayout = defaultDistDirLayout projectRootDir
+    projectRootDir <- findProjectRoot installFlags
+    let distDirLayout = defaultDistDirLayout configFlags projectRootDir
 
     let cliConfig = commandLineFlagsToProjectConfig
                       globalFlags configFlags configExFlags
                       installFlags haddockFlags
 
 
     (_, elaboratedPlan, _, _) <-
-      rebuildInstallPlan verbosity
+      rebuildInstallPlan verbosity installFlags
                          projectRootDir distDirLayout cabalDirLayout
                          cliConfig
 
     let freezeConfig = projectFreezeConfig elaboratedPlan
-    writeProjectLocalFreezeConfig projectRootDir freezeConfig
+    writeProjectLocalFreezeConfig installFlags projectRootDir freezeConfig
     notice verbosity $
-      "Wrote freeze file: " ++ projectRootDir </> "cabal.project.freeze"
+      "Wrote freeze file: " ++ projectRootDir </> getProjectFileName installFlags  <.> "freeze"
 
   where
     verbosity = fromFlagOrDefault normal (configVerbosity configFlags)

cabal-install/Distribution/Client/Config.hs

@@ -260,7 +260,8 @@ instance Semigroup SavedConfig where
         installNumJobs               = combine installNumJobs,
         installKeepGoing             = combine installKeepGoing,
         installRunTests              = combine installRunTests,
-        installOfflineMode           = combine installOfflineMode
+        installOfflineMode           = combine installOfflineMode,
+        installProjectFileName       = combine installProjectFileName
         }
         where
           combine        = combine'        savedInstallFlags

cabal-install/Distribution/Client/DistDirLayout.hs

@@ -17,6 +17,7 @@ module Distribution.Client.DistDirLayout (
 ) where
 
 import System.FilePath
+import Distribution.Simple.Setup (fromFlagOrDefault, ConfigFlags, configDistPref)
 import Distribution.Package
          ( PackageId, ComponentId, UnitId )
 import Distribution.Compiler
@@ -106,12 +107,14 @@ data CabalDirLayout = CabalDirLayout {
        cabalWorldFile             :: FilePath
      }
 
-
-defaultDistDirLayout :: FilePath -> DistDirLayout
-defaultDistDirLayout projectRootDirectory =
+-- | Given the path to the root directory, create the 'DistDirLayout'
+-- associated with it.  Respects @--builddir@ setting.
+defaultDistDirLayout :: ConfigFlags -> FilePath -> DistDirLayout
+defaultDistDirLayout configFlags projectRootDirectory =
     DistDirLayout {..}
   where
-    distDirectory = projectRootDirectory </> "dist-newstyle"
+    distDirName = fromFlagOrDefault "dist-newstyle" (configDistPref configFlags)
+    distDirectory = projectRootDirectory </> distDirName
     --TODO: switch to just dist at some point, or some other new name
 
     distBuildRootDirectory   = distDirectory </> "build"