| version 1.4 | | version 1.5 |
|---|
| | |
| list='$(TESTS)'; \ | | list='$(TESTS)'; \ |
| dir='$(LOGDIR)'; \ | | dir='$(LOGDIR)'; \ |
| srcdir='$(top_srcdir)'; \ | | srcdir='$(top_srcdir)'; \ |
| output_menu=$${dir}/.automenu.xml; \ | | output_menu="$${dir}/.automenu.xml"; \ |
| parentfoldername=$(CHECK_PARENT_NAME); \ | | parentfoldername='$(CHECK_PARENT_NAME)'; \ |
| echo '<?xml version="1.0"?><menu>' > $$output_menu; \ | | echo '<?xml version="1.0"?><menu>' > $$output_menu; \ |
| echo '<parentMenu>$(CHECK_PARENT_NAME)</parentMenu>' >> $$output_menu;\ | | echo '<parentMenu>$(CHECK_PARENT_NAME)</parentMenu>' >> $$output_menu;\ |
| for tst in $$list; do \ | | for tst in $$list; do \ |
| tst=$${tst/check_/} ; \ | | tst="$${tst/check_/}" ; \ |
| tst=$${tst/-/_} ; \ | | tst="$${tst/-/_}" ; \ |
| xml=$(LOGDIR)/$${tst}.xml ;\ | | xml="$(LOGDIR)/$${tst}.xml" ;\ |
| if test -e "$$xml"; then \ | | if test -e "$$xml"; then \ |
| successCount=`grep -c 'result="success"' $$xml`;\ | | successCount=`grep -c 'result="success"' $$xml`;\ |
| errorCount=`grep -c 'result="error"' $$xml`;\ | | errorCount=`grep -c 'result="error"' $$xml`;\ |
| | |
| fi; \ | | fi; \ |
| done; \ | | done; \ |
| for sub in $$subdirs; do \ | | for sub in $$subdirs; do \ |
| if test -e $${dir}/$${sub}/.automenu.xml; then \ | | if test -e "$${dir}/$${sub}/.automenu.xml"; then \ |
| echo '<subDirectory name="'$${sub}'"/>' >> $$output_menu; \ | | echo '<subDirectory name="'$${sub}'"/>' >> $$output_menu; \ |
| fi; \ | | fi; \ |
| done;\ | | done;\ |
| | |
| @echo "processing logs to html..." | | @echo "processing logs to html..." |
| @list='$(TESTS)'; \ | | @list='$(TESTS)'; \ |
| srcdir='$(top_srcdir)'; \ | | srcdir='$(top_srcdir)'; \ |
| xsl=$${srcdir}/test/templates/logresult.xsl ; \ | | xsl="$${srcdir}/test/templates/logresult.xsl" ; \ |
| xsltproc='$(XSLTENGINE)';\ | | xsltproc='$(XSLTENGINE)';\ |
| xsltproc=$${xsltproc/\%2/$$xsl};\ | | xsltproc=$${xsltproc/\%2/$$xsl};\ |
| xml_siteuri='$(CHECK_ROOT)' ;\ | | xml_siteuri='$(CHECK_ROOT)' ;\ |
| | |
| runxml='.autorun.xml';\ | | runxml='.autorun.xml';\ |
| if test -n "$$list"; then \ | | if test -n "$$list"; then \ |
| for tst in $$list; do \ | | for tst in $$list; do \ |
| tst=$${tst/check_/} ; \ | | tst="$${tst/check_/}" ; \ |
| tst=$${tst/-/_} ; \ | | tst="$${tst/-/_}" ; \ |
| checkFile=$${tst}.xml ;\ | | checkFile="$${tst}.xml" ;\ |
| echo '<?xml version="1.0"?><config>' > $$runxml;\ | | echo '<?xml version="1.0"?><config>' > $$runxml;\ |
| echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\ | | echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\ |
| echo "<checkFile>$$checkFile</checkFile>" >> $$runxml;\ | | echo "<checkFile>$$checkFile</checkFile>" >> $$runxml;\ |
| echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\ | | echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\ |
| html=$(LOGDIR)/$${tst}.html ;\ | | html=$(LOGDIR)/$${tst}.html ;\ |
| if test -e "$(LOGDIR)/$$xml"; then \ | | if test -e "$(LOGDIR)/$$xml"; then \ |
| torun=$${xsltproc/\%1/$$runxml};\ | | torun="$${xsltproc/\%1/$$runxml}";\ |
| torun=$${torun/\%3/$$html};\ | | torun="$${torun/\%3/$$html}";\ |
| echo "running $$torun";\ | | echo "running $$torun";\ |
| $$torun; \ | | $$torun; \ |
| fi; \ | | fi; \ |
| | |
| echo '<?xml version="1.0"?><config>' > $$runxml;\ | | echo '<?xml version="1.0"?><config>' > $$runxml;\ |
| echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\ | | echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\ |
| echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\ | | echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\ |
| html=$(LOGDIR)/.index.html ;\ | | html='$(LOGDIR)/.index.html' ;\ |
| torun=$${xsltproc/\%1/$$runxml};\ | | torun="$${xsltproc/\%1/$$runxml}";\ |
| torun=$${torun/\%3/$$html};\ | | torun="$${torun/\%3/$$html}";\ |
| echo "running $$torun";\ | | echo "running $$torun";\ |
| $$torun; | | $$torun; |
| template-copy: $(LOGDIR) | | template-copy: $(LOGDIR) |
| @echo copying template | | @echo copying template |
| @if test -d "$(top_srcdir)/test/templates/$(CHECK_FOLDER)"; then \ | | @if test -d "$(top_srcdir)/test/templates/$(CHECK_FOLDER)"; then \ |
| cp $(top_srcdir)/test/templates/$(CHECK_FOLDER)/[^C]* $(LOGDIR)/;\ | | cp "$(top_srcdir)/test/templates/$(CHECK_FOLDER)/"[^C]* '$(LOGDIR)'/;\ |
| fi | | fi |
| textlog: | | textlog: |
| @echo "processing logs to text..." | | @echo "processing logs to text..." |
| @srcdir='$(top_srcdir)'; \ | | @srcdir='$(top_srcdir)'; \ |
| xsl=$${srcdir}/test/templates/checkTextResult.xsl ; \ | | xsl="$${srcdir}/test/templates/checkTextResult.xsl" ; \ |
| xsltproc='$(XSLTENGINE)';\ | | xsltproc='$(XSLTENGINE)';\ |
| xsltproc=$${xsltproc/\%2/$$xsl};\ | | xsltproc="$${xsltproc/\%2/$$xsl}";\ |
| xml_siteuri='$(CHECK_ROOT)' ;\ | | xml_siteuri='$(CHECK_ROOT)' ;\ |
| xml_check_folder='../logs/$(CHECK_FOLDER)' ;\ | | xml_check_folder='../logs/$(CHECK_FOLDER)' ;\ |
| runxml='.autorun.xml';\ | | runxml='.autorun.xml';\ |
| echo '<?xml version="1.0"?><config>' > $$runxml;\ | | echo '<?xml version="1.0"?><config>' > $$runxml;\ |
| echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\ | | echo "<baseSiteUri>$$xml_siteuri</baseSiteUri>" >> $$runxml;\ |
| echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\ | | echo "<checkFolder>$$xml_check_folder</checkFolder></config>" >> $$runxml;\ |
| txt=$(LOGDIR)/testlog.txt ;\ | | txt='$(LOGDIR)/testlog.txt' ;\ |
| torun=$${xsltproc/\%1/$$runxml};\ | | torun="$${xsltproc/\%1/$$runxml}";\ |
| torun=$${torun/\%3/$$txt};\ | | torun="$${torun/\%3/$$txt}";\ |
| echo "running $$torun";\ | | echo "running $$torun";\ |
| $$torun; | | $$torun; |
| | | |