diff --git a/tests/xmlspec/Makefile.am b/tests/xmlspec/Makefile.am index 123d02e..c831a85 100644 --- a/tests/xmlspec/Makefile.am +++ b/tests/xmlspec/Makefile.am @@ -20,27 +20,25 @@ test tests: $(top_builddir)/xsltproc/xsltproc $(srcdir)/REC-xml-2e.xsl $(srcdir)/REC-xml-20001006.xml \ > REC-xml-20001006.out 2> debug ; \ diff $(srcdir)/REC-xml-20001006.html REC-xml-20001006.out | \ - grep -v 'id[0-9]' | grep -v -- '---' | grep -v 100 | grep -v 3866 ; \ + grep -v 'id[mp0-9][0-9]' | grep -v -- '---' | grep -v '^[0-9]*c[0-9]*$$' ; \ grep implemented debug | sort | uniq -c || true; \ - grep " ms$$" debug || true; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true` - @if [ -n "$$log" ] ; then \ + grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`; \ + if [ -n "$$log" ] ; then \ echo REC-xml-20001006 result ; \ echo "$$log" ; \ - fi + fi @rm -f REC-xml-20001006.out @log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ -timing --param show.diff.markup 1 \ $(srcdir)/REC-xml-2e.xsl $(srcdir)/REC-xml-20001006.xml \ > REC-xml-20001006-review.out 2> debug ; \ diff $(srcdir)/REC-xml-20001006-review.html REC-xml-20001006-review.out | \ - grep -v 'id[0-9]' | grep -v -- '---' | grep -v 117 | grep -v 4066 ; \ + grep -v 'id[mp0-9][0-9]' | grep -v -- '---' | grep -v '^[0-9]*c[0-9]*$$' ; \ grep implemented debug | sort | uniq -c || true; \ - grep " ms$$" debug || true; \ - grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true` - @if [ -n "$$log" ] ; then \ + grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`; \ + if [ -n "$$log" ] ; then \ echo "REC-xml-20001006 (show.diff.markup) result" ; \ echo "$$log" ; \ - fi + fi @rm -f REC-xml-20001006-review.out