From 33cd8cdc5c260b3f373257ca3394e3aed047bb9a Mon Sep 17 00:00:00 2001 From: Keith Fahlgren Date: Tue, 24 Feb 2009 04:36:32 +0000 Subject: [PATCH] Fix my lack of understanding how to pass params to Perl versions of XSLTENGINEs for smoketests --- xsl/Makefile.tests | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/xsl/Makefile.tests b/xsl/Makefile.tests index 964040cea..f685acfc3 100644 --- a/xsl/Makefile.tests +++ b/xsl/Makefile.tests @@ -59,37 +59,25 @@ smoketest-normal-profile: $(XSLT) $(TESTFILE_NS) $$stylesheet > /dev/null; \ done -# The Perl versions of the processors in buildtools cannot handle multiple parameters, so we dropped the following: -# --param manifest.in.base.dir=1; \ - smoketest-chunk: for stylesheet in $(MULTIFILE_STYLES) ; do \ - $(XSLT) $(TESTFILE) $$stylesheet --stringparam base.dir=$(TMP_OUTPUT_DIR) ; \ - $(XSLT) $(TESTFILE_NS) $$stylesheet --stringparam base.dir=$(TMP_OUTPUT_DIR) ; \ + $(XSLT) $(TESTFILE) $$stylesheet manifest.in.base.dir=1 base.dir=$(TMP_OUTPUT_DIR) ; \ + $(XSLT) $(TESTFILE_NS) $$stylesheet manifest.in.base.dir=1 base.dir=$(TMP_OUTPUT_DIR) ; \ done; -# The Perl versions of the processors in buildtools cannot handle multiple parameters, so we dropped the following: -# --param manifest.in.base.dir=1; \ - smoketest-chunk-profile: for stylesheet in $(MULTIFILE_PROFILE_STYLES) ; do \ - $(XSLT) $(TESTFILE) $$stylesheet --stringparam base.dir=$(TMP_OUTPUT_DIR) ; \ - $(XSLT) $(TESTFILE_NS) $$stylesheet --stringparam base.dir=$(TMP_OUTPUT_DIR) ; \ + $(XSLT) $(TESTFILE) $$stylesheet manifest.in.base.dir=1 base.dir=$(TMP_OUTPUT_DIR) ; \ + $(XSLT) $(TESTFILE_NS) $$stylesheet manifest.in.base.dir=1 base.dir=$(TMP_OUTPUT_DIR) ; \ done; -# The Perl versions of the processors in buildtools cannot handle multiple parameters, so we dropped the following: -# --param man.output.in.separate.dir 1 \ - smoketest-man: - $(XSLT) $(TESTFILE) $(MAN_STYLE) --stringparam man.output.base.dir=$(TMP_OUTPUT_DIR) ; \ - $(XSLT) $(TESTFILE_NS) $(MAN_STYLE) --stringparam man.output.base.dir=$(TMP_OUTPUT_DIR) ; - -# The Perl versions of the processors in buildtools cannot handle multiple parameters, so we dropped the following: -# --param man.output.in.separate.dir 1 \ + $(XSLT) $(TESTFILE) $(MAN_STYLE) man.output.in.separate.dir=1 man.output.base.dir=$(TMP_OUTPUT_DIR) ; \ + $(XSLT) $(TESTFILE_NS) $(MAN_STYLE) man.output.in.separate.dir=1 man.output.base.dir=$(TMP_OUTPUT_DIR) ; smoketest-man-profile: - $(XSLT) $(TESTFILE) $(MAN_PROFILE_STYLE) --stringparam man.output.base.dir=$(TMP_OUTPUT_DIR) ; \ - $(XSLT) $(TESTFILE_NS) $(MAN_PROFILE_STYLE) --stringparam man.output.base.dir=$(TMP_OUTPUT_DIR) ; + $(XSLT) $(TESTFILE) $(MAN_PROFILE_STYLE) man.output.in.separate.dir=1 man.output.base.dir=$(TMP_OUTPUT_DIR) ; \ + $(XSLT) $(TESTFILE_NS) $(MAN_PROFILE_STYLE) man.output.in.separate.dir=1 man.output.base.dir=$(TMP_OUTPUT_DIR) ; smoketest-clean: $(RM) -r $(TMP_OUTPUT_DIR) -- 2.49.0