haddock-test: Be more explicit which packages to pass

We now pass `-hide-all-packages` to haddock when invoking the
testsuite. This ensures we don't accidentally pick up any dependencies
up through ghc.env files.

4 files changed, 34 insertions, 7 deletions

diff --git a/haddock-test/src/Test/Haddock/Config.hs b/haddock-test/src/Test/Haddock/Config.hs
index 2d16fa63..8b395b6c 100644
--- a/haddock-test/src/Test/Haddock/Config.hs
+++ b/haddock-test/src/Test/Haddock/Config.hs
@@ -197,6 +197,7 @@ loadConfig ccfg dcfg flags files = do
         [ pure ["--no-warnings"]
         , pure ["--odir=" ++ dcfgOutDir dcfg]
         , pure ["--optghc=-w"]
+        , pure ["--optghc=-hide-all-packages"]
         , pure $ flagsHaddockOptions flags
         , baseDependencies ghcPath
         ]
@@ -244,13 +245,21 @@ baseDependencies ghcPath = do
 #else
     pkgIndex <- getInstalledPackages normal [GlobalPackageDB] cfg
 #endif
-    mapM (getDependency pkgIndex) ["base", "process", "ghc-prim"]
+    let
+      pkgs =
+        [ "array"
+        , "base"
+        , "ghc-prim"
+        , "process"
+        , "template-haskell"
+        ]
+    concat `fmap` mapM (getDependency pkgIndex) pkgs
   where
     getDependency pkgIndex name = case ifaces pkgIndex name of
         [] -> do
             hPutStrLn stderr $ "Couldn't find base test dependency: " ++ name
             exitFailure
-        (ifArg:_) -> pure ifArg
+        (ifArg:_) -> pure ["--optghc=-package" ++ name, ifArg]
     ifaces pkgIndex name = do
         pkg <- join $ snd <$> lookupPackageName pkgIndex (mkPackageName name)
         iface <$> haddockInterfaces pkg <*> haddockHTMLs pkg
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index 66e31ec7..062ebb8d 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -301,7 +301,9 @@
 	><p class="src"
 	  ><a id="v:expr" class="def"
 	    >expr</a
-	    > :: QuasiQuoter <a href="#" class="selflink"
+	    > :: <a href="#" title="Language.Haskell.TH.Quote"
+	    >QuasiQuoter</a
+	    > <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -311,7 +313,11 @@
 	    >parseExprExp</a
 	    > :: <a href="#" title="Data.String"
 	    >String</a
-	    > -&gt; Q Exp <a href="#" class="selflink"
+	    > -&gt; <a href="#" title="Language.Haskell.TH.Syntax"
+	    >Q</a
+	    > <a href="#" title="Language.Haskell.TH.Syntax"
+	    >Exp</a
+	    > <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
diff --git a/html-test/ref/TH.html b/html-test/ref/TH.html
index 403abe62..a35204ff 100644
--- a/html-test/ref/TH.html
+++ b/html-test/ref/TH.html
@@ -45,7 +45,11 @@
 	><p class="src"
 	  ><a id="v:decl" class="def"
 	    >decl</a
-	    > :: Q [Dec] <a href="#" class="selflink"
+	    > :: <a href="#" title="Language.Haskell.TH.Syntax"
+	    >Q</a
+	    > [<a href="#" title="Language.Haskell.TH.Syntax"
+	    >Dec</a
+	    >] <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
diff --git a/html-test/ref/Threaded_TH.html b/html-test/ref/Threaded_TH.html
index 7f80b127..14ebe8a9 100644
--- a/html-test/ref/Threaded_TH.html
+++ b/html-test/ref/Threaded_TH.html
@@ -57,7 +57,11 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >forkTH</a
-	      > :: Q Exp</li
+	      > :: <a href="#" title="Language.Haskell.TH.Syntax"
+	      >Q</a
+	      > <a href="#" title="Language.Haskell.TH.Syntax"
+	      >Exp</a
+	      ></li
 	    ></ul
 	  ></details
 	></div
@@ -68,7 +72,11 @@
 	><p class="src"
 	  ><a id="v:forkTH" class="def"
 	    >forkTH</a
-	    > :: Q Exp <a href="#" class="selflink"
+	    > :: <a href="#" title="Language.Haskell.TH.Syntax"
+	    >Q</a
+	    > <a href="#" title="Language.Haskell.TH.Syntax"
+	    >Exp</a
+	    > <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"