WIP: adapt remaining tests to IPI updates.

(WIP: will be squished into ‘Track build artifacts in installed packages.’.

Author: bairyn

Cabal-tests/tests/ParserTests/ipi/Includes2.expr

@@ -89,4 +89,9 @@ InstalledPackageInfo {
   haddockHTMLs =
   [
     "/home/travis/build/haskell/cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.dist/work/./dist/build/x86_64-linux/ghc-8.2.2/Includes2-0.1.0.0/l/mylib/Includes2-0.1.0.0-inplace-mylib+3gY9SyjX86dBypHcOaev1n/doc/html/Includes2"],
-  pkgRoot = Nothing}
+  pkgRoot = Nothing,
+  pkgVanillaLib = True,
+  pkgSharedLib = True,
+  pkgDynExe = True,
+  pkgProfLib = True,
+  pkgProfExe = True}

Cabal-tests/tests/ParserTests/ipi/internal-preprocessor-test.expr

@@ -73,4 +73,9 @@ InstalledPackageInfo {
     "/home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess/setup.dist/work/dist/doc/html/internal-preprocessor-test"],
   pkgRoot =
   Just
-    "/home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess/setup.dist/work/dist"}
+    "/home/ogre/Documents/other-haskell/cabal/cabal-testsuite/PackageTests/CustomPreProcess/setup.dist/work/dist",
+  pkgVanillaLib = True,
+  pkgSharedLib = True,
+  pkgDynExe = True,
+  pkgProfLib = True,
+  pkgProfExe = True}

Cabal-tests/tests/ParserTests/ipi/issue-2276-ghc-9885.expr

@@ -2181,4 +2181,9 @@ InstalledPackageInfo {
     "/opt/ghc/8.2.2/share/doc/ghc-8.2.2/html/libraries/transformers-0.5.2.0/transformers.haddock"],
   haddockHTMLs = [
     "/opt/ghc/8.2.2/share/doc/ghc-8.2.2/html/libraries/transformers-0.5.2.0"],
-  pkgRoot = Nothing}
+  pkgRoot = Nothing,
+  pkgVanillaLib = True,
+  pkgSharedLib = True,
+  pkgDynExe = True,
+  pkgProfLib = True,
+  pkgProfExe = True}

Cabal-tests/tests/ParserTests/ipi/transformers.expr

@@ -181,4 +181,9 @@ InstalledPackageInfo {
   haddockHTMLs = [
     "/opt/ghc/8.2.2/share/doc/ghc-8.2.2/html/libraries/transformers-0.5.2.0"],
   pkgRoot = Just
-    "/opt/ghc/8.2.2/lib/ghc-8.2.2"}
+    "/opt/ghc/8.2.2/lib/ghc-8.2.2",
+  pkgVanillaLib = True,
+  pkgSharedLib = True,
+  pkgDynExe = True,
+  pkgProfLib = True,
+  pkgProfExe = True}

Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs

@@ -29,7 +29,7 @@ tests = testGroup "Distribution.Utils.Structured"
     , testCase "GenericPackageDescription" $
       md5Check (Proxy :: Proxy GenericPackageDescription) 0xa3e9433662ecf0c7a3c26f6d75a53ba1
     , testCase "LocalBuildInfo" $
-      md5Check (Proxy :: Proxy LocalBuildInfo) 0x05ef40b1f97c55be526f63ea4cdacae1
+      md5Check (Proxy :: Proxy LocalBuildInfo) 0xcea241ff299da52a38f02483594627f1
 #endif
     ]
 

cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs

@@ -477,6 +477,7 @@ instance Arbitrary ProjectConfigShared where
         projectConfigStrongFlags          <- arbitrary
         projectConfigAllowBootLibInstalls <- arbitrary
         projectConfigOnlyConstrained      <- arbitrary
+        projectConfigRequireArtifacts     <- arbitrary
         projectConfigPerComponent         <- arbitrary
         projectConfigIndependentGoals     <- arbitrary
         projectConfigPreferOldest         <- arbitrary
@@ -517,6 +518,7 @@ instance Arbitrary ProjectConfigShared where
         <*> shrinker projectConfigStrongFlags
         <*> shrinker projectConfigAllowBootLibInstalls
         <*> shrinker projectConfigOnlyConstrained
+        <*> shrinker projectConfigRequireArtifacts
         <*> shrinker projectConfigPerComponent
         <*> shrinker projectConfigIndependentGoals
         <*> shrinker projectConfigPreferOldest
@@ -804,8 +806,8 @@ instance Arbitrary FineGrainedConflicts where
 instance Arbitrary MinimizeConflictSet where
     arbitrary = MinimizeConflictSet <$> arbitrary
 
-instance Arbitrary IndependentGoals where
-    arbitrary = IndependentGoals <$> arbitrary
+instance Arbitrary RequireArtifacts where
+    arbitrary = RequireArtifacts <$> arbitrary
 
 instance Arbitrary PreferOldest where
     arbitrary = PreferOldest <$> arbitrary
@@ -820,3 +822,6 @@ instance Arbitrary OnlyConstrained where
     arbitrary = oneof [ pure OnlyConstrainedAll
                       , pure OnlyConstrainedNone
                       ]
+
+instance Arbitrary IndependentGoals where
+    arbitrary = IndependentGoals <$> arbitrary

cabal-install/tests/UnitTests/Distribution/Client/TreeDiffInstances.hs

@@ -55,6 +55,7 @@ instance ToExpr PackageConfig
 instance ToExpr PackageDB
 instance ToExpr PackageProperty
 instance ToExpr PreferOldest
+instance ToExpr RequireArtifacts
 instance ToExpr PreSolver
 instance ToExpr ProjectConfig
 instance ToExpr ProjectConfigBuildOnly