diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2019-11-14 06:21:00 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2019-11-14 06:21:00 -0800 |
| commit | 3645f9babee2954870e54ad8a00f16c7f211c721 (patch) | |
| tree | 809328dbc8a2cf2dba3333a7d79c3bba75e3c992 | |
| parent | a1f69b1c7d6622a3bee678eb01ba36e94b99cd20 (diff) | |
| download | pandoc-3645f9babee2954870e54ad8a00f16c7f211c721.tar.gz | |
Fixed some test locations and put test data files in extra-source-files.
| -rw-r--r-- | pandoc.cabal | 6 | ||||
| -rw-r--r-- | test/command/5881.md | 2 | ||||
| -rw-r--r-- | test/command/5904.md | 2 | ||||
| -rw-r--r-- | test/command/A.txt (renamed from test/A.txt) | 0 | ||||
| -rw-r--r-- | test/command/B.txt (renamed from test/B.txt) | 0 | ||||
| -rw-r--r-- | test/command/C.txt (renamed from test/C.txt) | 0 | ||||
| -rw-r--r-- | test/command/D.txt (renamed from test/D.txt) | 0 | ||||
| -rw-r--r-- | test/command/defaults1.yaml | 1 | ||||
| -rw-r--r-- | test/command/defaults2.yaml | 4 | ||||
| -rw-r--r-- | test/defaults1.yaml | 1 | ||||
| -rw-r--r-- | test/defaults2.yaml | 4 |
11 files changed, 13 insertions, 7 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index d25446779..329724c24 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -196,6 +196,12 @@ extra-source-files: test/bodybg.gif test/*.native test/command/*.md + test/command/A.txt + test/command/B.txt + test/command/C.txt + test/command/D.txt + test/command/defaults1.yaml + test/command/defaults2.yaml test/command/3533-rst-csv-tables.csv test/command/3880.txt test/command/5182.txt diff --git a/test/command/5881.md b/test/command/5881.md index 3c3970a89..e29166959 100644 --- a/test/command/5881.md +++ b/test/command/5881.md @@ -1,5 +1,5 @@ ``` -% pandoc -t markdown -s -H D.txt -d defaults1.yaml -d defaults2.yaml +% pandoc -t markdown -s -H command/D.txt -d command/defaults1.yaml -d command/defaults2.yaml Ok ^D here's d diff --git a/test/command/5904.md b/test/command/5904.md index fdc29407d..326a0f622 100644 --- a/test/command/5904.md +++ b/test/command/5904.md @@ -1,5 +1,5 @@ ``` -% pandoc -s -t markdown -H test/B.txt --variable header-includes:foo +% pandoc -s -t markdown -H command/B.txt --variable header-includes:foo Hi ^D foo diff --git a/test/A.txt b/test/command/A.txt index 9e365c806..9e365c806 100644 --- a/test/A.txt +++ b/test/command/A.txt diff --git a/test/B.txt b/test/command/B.txt index 15e82baab..15e82baab 100644 --- a/test/B.txt +++ b/test/command/B.txt diff --git a/test/C.txt b/test/command/C.txt index ffe50d0ab..ffe50d0ab 100644 --- a/test/C.txt +++ b/test/command/C.txt diff --git a/test/D.txt b/test/command/D.txt index 6a06fd34c..6a06fd34c 100644 --- a/test/D.txt +++ b/test/command/D.txt diff --git a/test/command/defaults1.yaml b/test/command/defaults1.yaml new file mode 100644 index 000000000..22b18b3c4 --- /dev/null +++ b/test/command/defaults1.yaml @@ -0,0 +1 @@ +include-in-header: command/A.txt diff --git a/test/command/defaults2.yaml b/test/command/defaults2.yaml new file mode 100644 index 000000000..4b728fa74 --- /dev/null +++ b/test/command/defaults2.yaml @@ -0,0 +1,4 @@ +include-in-header: +- command/B.txt +- command/C.txt + diff --git a/test/defaults1.yaml b/test/defaults1.yaml deleted file mode 100644 index b99caa46a..000000000 --- a/test/defaults1.yaml +++ /dev/null @@ -1 +0,0 @@ -include-in-header: A.txt diff --git a/test/defaults2.yaml b/test/defaults2.yaml deleted file mode 100644 index 93f41896a..000000000 --- a/test/defaults2.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include-in-header: -- B.txt -- C.txt - |