[commit: haddock] 2.15,2.15.0.1,2.15.0.2,T6018-injective-type-families,adamse-D1033,clean,fix-travis,ghc-head,master,metainfo,v2.15,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/orf-reboot: Revert "Disambiguate ‘die’ in test runners." (574d3c1)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haddock

On branches: 2.15,2.15.0.1,2.15.0.2,T6018-injective-type-families,adamse-D1033,clean,fix-travis,ghc-head,master,metainfo,v2.15,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/574d3c13ff139e120e6a2601ea6cec676ab8ba16

>---------------------------------------------------------------

commit 574d3c13ff139e120e6a2601ea6cec676ab8ba16
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Thu Aug 14 20:26:03 2014 +0100

    Revert "Disambiguate ‘die’ in test runners."
    
    This reverts commit dba02d6df32534aac5d257f2d28596238d248942.


>---------------------------------------------------------------

574d3c13ff139e120e6a2601ea6cec676ab8ba16
 html-test/run.lhs  | 2 +-
 latex-test/run.lhs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html-test/run.lhs b/html-test/run.lhs
index a866436..153ab32 100755
--- a/html-test/run.lhs
+++ b/html-test/run.lhs
@@ -41,7 +41,7 @@ main = do
 test :: IO ()
 test = do
   x <- doesFileExist haddockPath
-  unless x $ System.Exit.die "you need to run 'cabal build' successfully first"
+  unless x $ die "you need to run 'cabal build' successfully first"
 
   contents <- getDirectoryContents testDir
   args <- getArgs
diff --git a/latex-test/run.lhs b/latex-test/run.lhs
index c1d48d9..423dc6f 100755
--- a/latex-test/run.lhs
+++ b/latex-test/run.lhs
@@ -41,7 +41,7 @@ main = do
 test :: IO ()
 test = do
   x <- doesFileExist haddockPath
-  unless x $ System.Exit.die "you need to run 'cabal build' successfully first"
+  unless x $ die "you need to run 'cabal build' successfully first"
 
   contents <- getDirectoryContents testDir