From fa43e364493a1cba94f431d78b17c5651bf32a8d Mon Sep 17 00:00:00 2001 From: Or Neeman Date: Sat, 25 Feb 2017 03:31:40 -0600 Subject: Fix stale references to `tests` directory (#3469) Some of the benchmarks were failing due to references to files in the `tests` directory, which is now called `test`. A search found other references to it also. This commit updates all these references. --- CONTRIBUTING.md | 4 ++-- COPYRIGHT | 2 +- INSTALL.md | 8 ++++---- benchmark/benchmark-pandoc.hs | 6 +++--- benchmark/weigh-pandoc.hs | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c011faeb9..5a6d744a1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -161,7 +161,7 @@ or, if you're using [stack], stack setup stack test -The test program is `tests/test-pandoc.hs`. +The test program is `test/test-pandoc.hs`. Benchmarks ---------- @@ -242,7 +242,7 @@ github: . To get a local copy of the source: The source for the main pandoc program is `pandoc.hs`. The source for the pandoc library is in `src/`, the source for the tests is in -`tests/`, and the source for the benchmarks is in `benchmark/`. +`test/`, and the source for the benchmarks is in `benchmark/`. The modules `Text.Pandoc.Definition`, `Text.Pandoc.Builder`, and `Text.Pandoc.Generic` are in a separate library `pandoc-types`. The code can diff --git a/COPYRIGHT b/COPYRIGHT index 70781a2de..b52c4267e 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -57,7 +57,7 @@ Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Readers/Org.hs -tests/Tests/Readers/Org.hs +test/Tests/Readers/Org.hs Copyright (C) 2014-2015 Albert Krewinkel Released under the GNU General Public License version 2 or later. diff --git a/INSTALL.md b/INSTALL.md index 9d03e14f3..ed34a95c9 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -281,10 +281,10 @@ the `-t` option: If you add a new feature to pandoc, please add tests as well, following the pattern of the existing tests. The test suite code is in -`tests/test-pandoc.hs`. If you are adding a new reader or writer, it is -probably easiest to add some data files to the `tests` directory, and -modify `tests/Tests/Old.hs`. Otherwise, it is better to modify the module -under the `tests/Tests` hierarchy corresponding to the pandoc module you +`test/test-pandoc.hs`. If you are adding a new reader or writer, it is +probably easiest to add some data files to the `test` directory, and +modify `test/Tests/Old.hs`. Otherwise, it is better to modify the module +under the `test/Tests` hierarchy corresponding to the pandoc module you are changing. ### Running benchmarks diff --git a/benchmark/benchmark-pandoc.hs b/benchmark/benchmark-pandoc.hs index c01750b6e..7294c74a4 100644 --- a/benchmark/benchmark-pandoc.hs +++ b/benchmark/benchmark-pandoc.hs @@ -61,9 +61,9 @@ main = do matchWriter (_, _) = False let matchedReaders = filter matchReader readers let matchedWriters = filter matchWriter writers - inp <- readFile "tests/testsuite.txt" - lalune <- B.readFile "tests/lalune.jpg" - movie <- B.readFile "tests/movie.jpg" + inp <- readFile "test/testsuite.txt" + lalune <- B.readFile "test/lalune.jpg" + movie <- B.readFile "test/movie.jpg" time <- getCurrentTime let setupFakeFiles = modifyPureState $ \st -> st{ stFiles = FileTree $ Map.fromList [ diff --git a/benchmark/weigh-pandoc.hs b/benchmark/weigh-pandoc.hs index cf4099721..bbb92445a 100644 --- a/benchmark/weigh-pandoc.hs +++ b/benchmark/weigh-pandoc.hs @@ -3,7 +3,7 @@ import Text.Pandoc main :: IO () main = do - doc <- read <$> readFile "tests/testsuite.native" + doc <- read <$> readFile "test/testsuite.native" mainWith $ do func "Pandoc document" id doc mapM_ -- cgit v1.2.3