Updated "make check" makefile to make it usable in a downstream

release install (that is, outside of the release build environment)

diff --git a/xsl/Makefile.tests b/xsl/Makefile.tests
index 623dab8868d8a8a31c916acf032dc1aed7519a4c..56277516abb64f7227caf553ca62f60b33f8920e 100644 (file)
--- a/xsl/Makefile.tests
+++ b/xsl/Makefile.tests
@@ -1,41 +1,75 @@
 # $Id$
 
-check: smoketest-normal smoketest-normal-profile smoketest-chunk smoketest-chunk-profile
+XSLTPROC=xsltproc
+XSLTPROC_FLAGS=
+
+TESTFILE=tests/refentry.007.xml
+TESTFILE=tests/refentry.007.ns.xml
+
+NORMAL_STYLES=fo/docbook.xsl html/docbook.xsl xhtml/docbook.xsl
+NORMAL_PROFILE_STYLES=fo/profile-docbook.xsl html/profile-docbook.xsl xhtml/profile-docbook.xsl
+CHUNK_STYLES=html/chunk.xsl html/onechunk.xsl xhtml/chunk.xsl xhtml/onechunk.xsl
+HELP_STYLES=htmlhelp/htmlhelp.xsl javahelp/javahelp.xsl eclipse/eclipse.xsl
+MULTIFILE_STYLES=$(CHUNK_STYLES) $(HELP_STYLES)
+CHUNK_PROFILE_STYLES=html/profile-chunk.xsl html/profile-onechunk.xsl xhtml/profile-chunk.xsl xhtml/profile-onechunk.xsl
+HELP_PROFILE_STYLES=htmlhelp/profile-htmlhelp.xsl eclipse/profile-eclipse.xsl javahelp/profile-javahelp.xsl
+MULTIFILE_PROFILE_STYLES=$(CHUNK_PROFILE_STYLES) $(HELP_PROFILE_STYLES)
+
+MAN_STYLE=manpages/docbook.xsl
+MAN_PROFILE_STYLE=manpages/profile-docbook.xsl
+
+ROUNDTRIP_STYLES=roundtrip/dbk2ooo.xsl roundtrip/dbk2pages.xsl roundtrip/dbk2wordml.xsl
+SLIDES_STYLES=slides/html/default.xsl slides/xhtml/default.xsl slides/fo/plain.xsl
+WEBSITE_STYLES=website/website.xsl
+WEBSITE_CHUNK_STYLES=website/chunk-website.xsl
+
+# chunked output gets written to TMP_OUTPUT_DIR
+TMP_OUTPUT_DIR=/tmp/smoketest-output/
+# if you don't want TMP_OUTPUT_DIR and its contents deleted, unset
+# SMOKETEST_CLEAN_TARGET; e.g. "make check SMOKETEST_CLEAN_TARGET=''"
+SMOKETEST_CLEAN_TARGET=smoketest-clean
+
+check: smoketest-make-tmp-dir smoketest-normal smoketest-normal-profile smoketest-chunk smoketest-chunk-profile smoketest-man smoketest-man-profile $(SMOKETEST_CLEAN_TARGET)
+
+smoketest-make-tmp-dir:
+       $(RM) -r $(TMP_OUTPUT_DIR)
+       mkdir '$(TMP_OUTPUT_DIR)'
 
 smoketest-normal:
-       for file in $(NORMAL_STYLES); do \
-       echo "$(XSLT) $(DOCBOOK_SVN)/releasetools/testfile.xml $$file > /dev/null"; \
-       $(XSLT) $(DOCBOOK_SVN)/releasetools/testfile.xml $$file > /dev/null; \
-       echo "$(XSLT) $(DOCBOOK_SVN)/releasetools/testfile-ns.xml $$file > /dev/null"; \
-       $(XSLT) $(DOCBOOK_SVN)/releasetools/testfile-ns.xml $$file > /dev/null; \
+       for stylesheet in $(NORMAL_STYLES); do \
+       echo "$(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE) > /dev/null"; \
+       $(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE) > /dev/null; \
+       echo "$(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE-NS) > /dev/null"; \
+       $(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE-NS) > /dev/null; \
        done
 
 smoketest-normal-profile:
-       for file in $(NORMAL_PROFILE_STYLES); do \
-       echo "$(XSLT) $(DOCBOOK_SVN)/releasetools/testfile.xml $$file > /dev/null"; \
-       $(XSLT) $(DOCBOOK_SVN)/releasetools/testfile.xml $$file > /dev/null; \
-       echo "$(XSLT) $(DOCBOOK_SVN)/releasetools/testfile-ns.xml $$file > /dev/null"; \
-       $(XSLT) $(DOCBOOK_SVN)/releasetools/testfile-ns.xml $$file > /dev/null; \
+       for stylesheet in $(NORMAL_PROFILE_STYLES); do \
+       echo "$(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE) > /dev/null"; \
+       $(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE) > /dev/null; \
+       echo "$(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE-NS) > /dev/null"; \
+       $(XSLTPROC) $(XSLTPROC_FLAGS) $$stylesheet $(TESTFILE-NS) > /dev/null; \
        done
 
 smoketest-chunk:
-       $(RM) -r /tmp/docbook-xsl-smoketest
-       mkdir '/tmp/docbook-xsl-smoketest'
-       for file in $(CHUNK_STYLES) $(HELP_STYLES) $(MAN_STYLES) ; do \
-       echo "$(XSLT) $(DOCBOOK_SVN)/releasetools/testfile.xml $(DOCBOOK_SVN)/xsl/$$file" ; \
-       (cd /tmp/docbook-xsl-smoketest && $(XSLT) $(DOCBOOK_SVN)/releasetools/testfile.xml $(DOCBOOK_SVN)/xsl/$$file); \
-       echo "$(XSLT) $(DOCBOOK_SVN)/releasetools/testfile-ns.xml $(DOCBOOK_SVN)/xsl/$$file" ; \
-       (cd /tmp/docbook-xsl-smoketest && $(XSLT) $(DOCBOOK_SVN)/releasetools/testfile-ns.xml $(DOCBOOK_SVN)/xsl/$$file); \
+       for stylesheet in $(MULTIFILE_STYLES) ; do \
+       $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1 $$stylesheet $(TESTFILE); \
+       $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1 $$stylesheet $(TESTFILE-NS); \
        done;
-       $(RM) -r /tmp/docbook-xsl-smoketest
 
 smoketest-chunk-profile:
-       $(RM) -r /tmp/docbook-xsl-smoketest
-       mkdir '/tmp/docbook-xsl-smoketest'
-       for file in $(CHUNK_PROFILE_STYLES) $(HELP_PROFILE_STYLES) $(MAN_PROFILE_STYLES) ; do \
-       echo "$(XSLT) $(DOCBOOK_SVN)/releasetools/testfile.xml $(DOCBOOK_SVN)/xsl/$$file" ; \
-       (cd /tmp/docbook-xsl-smoketest && $(XSLT) $(DOCBOOK_SVN)/releasetools/testfile.xml $(DOCBOOK_SVN)/xsl/$$file); \
-       echo "$(XSLT) $(DOCBOOK_SVN)/releasetools/testfile-ns.xml $(DOCBOOK_SVN)/xsl/$$file" ; \
-       (cd /tmp/docbook-xsl-smoketest && $(XSLT) $(DOCBOOK_SVN)/releasetools/testfile-ns.xml $(DOCBOOK_SVN)/xsl/$$file); \
+       for stylesheet in $(MULTIFILE_PROFILE_STYLES) ; do \
+       $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1 $$stylesheet $(TESTFILE); \
+       $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam base.dir $(TMP_OUTPUT_DIR) --param manifest.in.base.dir 1 $$stylesheet $(TESTFILE-NS); \
        done;
-       $(RM) -r /tmp/docbook-xsl-smoketest
+
+smoketest-man:
+       $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 $(MAN_STYLE) $(TESTFILE); \
+       $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 $(MAN_STYLE) $(TESTFILE-NS); \
+
+smoketest-man-profile:
+       $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 $(MAN_PROFILE_STYLE) $(TESTFILE); \
+       $(XSLTPROC) $(XSLTPROC_FLAGS) --stringparam man.output.base.dir $(TMP_OUTPUT_DIR) --param man.output.in.separate.dir 1 $(MAN_PROFILE_STYLE) $(TESTFILE-NS); \
+
+smoketest-clean:
+       $(RM) -r $(TMP_OUTPUT_DIR)