[commit: haddock] ghc-7.6: Adapt output directory for HTML tests (410d8a4)

Repository : ssh://darcs.haskell.org//srv/darcs/haddock

On branch  : ghc-7.6

http://hackage.haskell.org/trac/ghc/changeset/410d8a4f7cfe3b45b98719f75bffc9ac06626fbc

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

commit 410d8a4f7cfe3b45b98719f75bffc9ac06626fbc
Author: Simon Hengel <[email protected]>
Date:   Mon Oct 15 20:34:40 2012 +0200

    Adapt output directory for HTML tests

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

 .gitignore           |    2 +-
 html-test/accept.lhs |    6 +++---
 html-test/run.lhs    |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3d24202..b516bcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /dist/
-/html-test/output/
+/html-test/out/
 
 /doc/haddock
 /doc/autom4te.cache/
diff --git a/html-test/accept.lhs b/html-test/accept.lhs
index ea55c35..f6dfc4c 100755
--- a/html-test/accept.lhs
+++ b/html-test/accept.lhs
@@ -12,12 +12,12 @@ baseDir = takeDirectory __FILE__
 
 main :: IO ()
 main = do
-  contents <- filter (not . ignore) <$> getDirectoryContents (baseDir </> "output")
+  contents <- filter (not . ignore) <$> getDirectoryContents (baseDir </> "out")
   args <- getArgs
   if not $ null args then
-    mapM_ copy [ baseDir </> "output" </> file | file <- contents, ".html" `isSuffixOf` file, takeBaseName file `elem` args  ]
+    mapM_ copy [ baseDir </> "out" </> file | file <- contents, ".html" `isSuffixOf` file, takeBaseName file `elem` args  ]
   else
-    mapM_ copy [ baseDir </> "output" </> file | file <- contents]
+    mapM_ copy [ baseDir </> "out" </> file | file <- contents]
   where
     ignore =
       foldr (liftA2 (||)) (const False) [
diff --git a/html-test/run.lhs b/html-test/run.lhs
index c543e02..7d3b805 100755
--- a/html-test/run.lhs
+++ b/html-test/run.lhs
@@ -27,7 +27,7 @@ packageRoot, dataDir, haddockPath, baseDir, testDir, outDir :: FilePath
 baseDir = takeDirectory __FILE__
 testDir       = baseDir </> "src"
 refDir        = baseDir </> "ref"
-outDir        = baseDir </> "output"
+outDir        = baseDir </> "out"
 packageRoot   = baseDir </> ".."
 dataDir       = packageRoot </> "resources"
 haddockPath   = packageRoot </> "dist" </> "build" </> "haddock" </> "haddock"