From 410d8a4f7cfe3b45b98719f75bffc9ac06626fbc Mon Sep 17 00:00:00 2001
From: Simon Hengel <sol@typeful.net>
Date: Mon, 15 Oct 2012 20:34:40 +0200
Subject: Adapt output directory for HTML tests

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

(limited to 'html-test')

diff --git a/html-test/accept.lhs b/html-test/accept.lhs
index ea55c35c..f6dfc4cd 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 c543e020..7d3b805b 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"
-- 
cgit v1.2.3