aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Hengel <sol@typeful.net>2012-10-15 20:34:40 +0200
committerSimon Hengel <sol@typeful.net>2012-10-15 20:49:39 +0200
commit410d8a4f7cfe3b45b98719f75bffc9ac06626fbc (patch)
tree3a6618d5422b3377a3421a9d8ff1876adc287c14
parent7e1fed4da8bb913d25f447afd1f1e485d428e37f (diff)
Adapt output directory for HTML tests
-rw-r--r--.gitignore2
-rwxr-xr-xhtml-test/accept.lhs6
-rwxr-xr-xhtml-test/run.lhs2
3 files changed, 5 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 3d242029..b516bcf8 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 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"