diff options
| author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2007-01-02 21:30:07 +0000 |
|---|---|---|
| committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2007-01-02 21:30:07 +0000 |
| commit | bd31474d980fabfb6f00bc14558593b6cf5d7d64 (patch) | |
| tree | 458aedb2ce81e26a79d14163bc5333e998baa18a | |
| parent | b9eeba9aa2c8bc5c24f9c1fa5d05ba29e358276b (diff) | |
| download | pandoc-bd31474d980fabfb6f00bc14558593b6cf5d7d64.tar.gz | |
Improved test-markdown target in Makefile:
+ Use 'hsmarkdown' instead of building 'pandoc-strict' (which was a hack,
and didn't work on Windows machines, anyway, due to the line ending problem)
+ Put top-level directory in path before running the test script, so that
hsmarkdown can find 'pandoc' even if it hasn't been installed.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@406 788f1e2b-df1e-0410-8736-df70ead52e1b
| -rw-r--r-- | Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -296,13 +296,11 @@ $(win_pkg_name): $(THIS).exe $(win_docs) .PHONY: test test-markdown test: $(MAIN) @cd $(TESTDIR) && perl runtests.pl -s $(PWD)/$(MAIN) -strict:=$(MAIN)-strict -cleanup_files+=$(strict) -$(strict): $(MAIN) - echo "#!/bin/sh -e\n$(PWD)/$(MAIN) --strict \"\$$@\"" > $@; \ - chmod +x $(strict) -test-markdown: $(strict) - @cd $(TESTDIR)/MarkdownTest_1.0.3 && perl MarkdownTest.pl -s $(PWD)/$(strict) -tidy +compat:=$(PWD)/hsmarkdown +test-markdown: $(MAIN) $(compat) + @# set path so that wrapper can be run even if pandoc not installed + @PATH=$(PWD):$$PATH; export PATH; cd $(TESTDIR)/MarkdownTest_1.0.3 && \ + perl MarkdownTest.pl -s $(compat) -tidy \ # Stolen and slightly improved from a GPLed Makefile. Credits to John Meacham. src_all:=$(shell find $(SRCDIR) -type f -name '*hs' | egrep -v '^\./(_darcs|lib|test)/') |