| author | Tom Tromey <tom@tromey.com> | 2023年01月29日 20:35:24 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2023年01月29日 20:58:41 -0700 |
| commit | c35ae13e6f834e85325e705e122b8807bca84a40 (patch) | |
| tree | efbfc852360d5cf8acb25d18d4010fb90f1d98a1 | |
| parent | 247ddee861e5d3ce7a7ae1e1bf427527396bb8b0 (diff) | |
| download | src-highlite-c35ae13e6f834e85325e705e122b8807bca84a40.tar.gz | |
| -rw-r--r-- | tests/Makefile.am | 1004 | ||||
| -rwxr-xr-x | tests/diff-for-test | 15 |
diff --git a/tests/Makefile.am b/tests/Makefile.am index e59f00a..609f9e6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -25,7 +25,7 @@ PROGEXE = $(top_builddir)/src/$(PACKAGE)$(EXEEXT) --binary-output # use --strip-trailing-cr since if run on windows, it may # add \r to output files, while the reference files distributed # are built on linux -DIFF = diff +DIFF = $(srcdir)/diff-for-test # we disable the generation of the version of source-highlight # so that the version does not interfere with the diffing @@ -397,7 +397,6 @@ if MAINTAINER_MODE check: check-produced-output \ check_wrong check_missing \ check_wrong_lineranges \ -check_wrong_regexranges \ check_wrong_syntaxmode else check: check-produced-output @@ -501,429 +500,367 @@ remove_css_doc_files: test.css.java.html test.nf_css.java.html test.css_doc.java.html: remove_css_html_files remove_css_doc_files check_java2html: test.css.java.html test.nf_css.java.html test.css_doc.java.html - $(JAVA2HTML) -i $(srcdir)/test.java -o test.java.out.html - $(JAVA2HTMLDOC) -i $(srcdir)/test.java -o test.java.doc.out.html - $(JAVA2HTMLNOTFIXED) < $(srcdir)/test.java > test_notfixed.out.html - tr -d '\r' < test_notfixed.out.html > temp.output && cp -f temp.output test_notfixed.out.html - $(JAVA2HTMLCSS) < $(srcdir)/test.java > test_css.out.html - tr -d '\r' < test_css.out.html > temp.output && cp -f temp.output test_css.out.html - $(JAVA2HTMLCSSNODOC) < $(srcdir)/test.java > test_css_nodoc.out.html - tr -d '\r' < test_css_nodoc.out.html > temp.output && cp -f temp.output test_css_nodoc.out.html - $(JAVA2HTML) -i $(srcdir)/test_comments.java -o test_comments.java.out.html - $(JAVA2HTML) -n --line-number-ref -i $(srcdir)/test.java -o test_java_lines.out.html - $(JAVA2HTML) -n -i $(srcdir)/test_no_line_at_the_end.java -o test_no_line_at_the_end.java.out.html - $(JAVA2ESC) -n -i $(srcdir)/test.java -o test.java.out.txt - $(JAVA2TEX) --line-number=" " -i $(srcdir)/test.java -o test.java.out.tex - $(JAVA2TEXINFO) -n -i $(srcdir)/test.java -o test.java.out.texinfo - $(JAVA2ODF) --line-number=" " -i $(srcdir)/test.java -o test.java.out.fodt - $(JAVA2ODFDOC) --line-number=" " -i $(srcdir)/test.java -o test.java.out.doc.fodt - $(JAVA2GROFF_MAN) --line-number=" " -i $(srcdir)/test.java -o test.java.out.groff - $(JAVA2MEDIAWIKI) -i $(srcdir)/test.java -o test.java.out.mediawiki - @echo expect no output from diff - $(DIFF) $(srcdir)/test.java.html test.java.out.html - $(DIFF) $(srcdir)/test.java.doc.html test.java.doc.out.html - $(DIFF) $(srcdir)/test_notfixed.html test_notfixed.out.html - $(DIFF) $(srcdir)/test_css.html test_css.out.html - $(DIFF) $(srcdir)/test_css_nodoc.html test_css_nodoc.out.html - $(DIFF) $(srcdir)/test_comments.java.html test_comments.java.out.html - $(DIFF) $(srcdir)/test_java_lines.html test_java_lines.out.html - $(DIFF) $(srcdir)/test_no_line_at_the_end.java.html test_no_line_at_the_end.java.out.html - $(DIFF) $(srcdir)/test.java.txt test.java.out.txt - $(DIFF) $(srcdir)/test.java.tex test.java.out.tex - $(DIFF) $(srcdir)/test.java.texinfo test.java.out.texinfo - $(DIFF) $(srcdir)/test.java.fodt test.java.out.fodt - $(DIFF) $(srcdir)/test.java.doc.fodt test.java.out.doc.fodt - $(DIFF) $(srcdir)/test.java.groff test.java.out.groff - $(DIFF) $(srcdir)/test.java.mediawiki test.java.out.mediawiki - $(DIFF) $(srcdir)/test.java.html test.css.java.html - $(DIFF) $(srcdir)/test_notfixed.html test.nf_css.java.html - $(DIFF) $(srcdir)/test.java.doc.html test.css_doc.java.html + temp=temp.output.$$$$ \ + && $(JAVA2HTML) -i $(srcdir)/test.java -o test.java.out.html \ + && $(JAVA2HTMLDOC) -i $(srcdir)/test.java -o test.java.doc.out.html \ + && $(JAVA2HTMLNOTFIXED) < $(srcdir)/test.java > test_notfixed.out.html \ + && tr -d '\r' < test_notfixed.out.html > $$temp && cp -f $$temp test_notfixed.out.html \ + && $(JAVA2HTMLCSS) < $(srcdir)/test.java > test_css.out.html \ + && tr -d '\r' < test_css.out.html > $$temp && cp -f $$temp test_css.out.html \ + && $(JAVA2HTMLCSSNODOC) < $(srcdir)/test.java > test_css_nodoc.out.html \ + && tr -d '\r' < test_css_nodoc.out.html > $$temp && cp -f $$temp test_css_nodoc.out.html \ + && $(JAVA2HTML) -i $(srcdir)/test_comments.java -o test_comments.java.out.html \ + && $(JAVA2HTML) -n --line-number-ref -i $(srcdir)/test.java -o test_java_lines.out.html \ + && $(JAVA2HTML) -n -i $(srcdir)/test_no_line_at_the_end.java -o test_no_line_at_the_end.java.out.html \ + && $(JAVA2ESC) -n -i $(srcdir)/test.java -o test.java.out.txt \ + && $(JAVA2TEX) --line-number=" " -i $(srcdir)/test.java -o test.java.out.tex \ + && $(JAVA2TEXINFO) -n -i $(srcdir)/test.java -o test.java.out.texinfo \ + && $(JAVA2ODF) --line-number=" " -i $(srcdir)/test.java -o test.java.out.fodt \ + && $(JAVA2ODFDOC) --line-number=" " -i $(srcdir)/test.java -o test.java.out.doc.fodt \ + && $(JAVA2GROFF_MAN) --line-number=" " -i $(srcdir)/test.java -o test.java.out.groff \ + && $(JAVA2MEDIAWIKI) -i $(srcdir)/test.java -o test.java.out.mediawiki \ + && $(DIFF) $(srcdir)/test.java.html test.java.out.html \ + && $(DIFF) $(srcdir)/test.java.doc.html test.java.doc.out.html \ + && $(DIFF) $(srcdir)/test_notfixed.html test_notfixed.out.html \ + && $(DIFF) $(srcdir)/test_css.html test_css.out.html \ + && $(DIFF) $(srcdir)/test_css_nodoc.html test_css_nodoc.out.html \ + && $(DIFF) $(srcdir)/test_comments.java.html test_comments.java.out.html \ + && $(DIFF) $(srcdir)/test_java_lines.html test_java_lines.out.html \ + && $(DIFF) $(srcdir)/test_no_line_at_the_end.java.html test_no_line_at_the_end.java.out.html \ + && $(DIFF) $(srcdir)/test.java.txt test.java.out.txt \ + && $(DIFF) $(srcdir)/test.java.tex test.java.out.tex \ + && $(DIFF) $(srcdir)/test.java.texinfo test.java.out.texinfo \ + && $(DIFF) $(srcdir)/test.java.fodt test.java.out.fodt \ + && $(DIFF) $(srcdir)/test.java.doc.fodt test.java.out.doc.fodt \ + && $(DIFF) $(srcdir)/test.java.groff test.java.out.groff \ + && $(DIFF) $(srcdir)/test.java.mediawiki test.java.out.mediawiki \ + && $(DIFF) $(srcdir)/test.java.html test.css.java.html \ + && $(DIFF) $(srcdir)/test_notfixed.html test.nf_css.java.html \ + && $(DIFF) $(srcdir)/test.java.doc.html test.css_doc.java.html \ + && rm -f $$temp check_javascript: - $(JS2HTML) < $(srcdir)/test.js -o test.js.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.js.html test.js.out.html + $(JS2HTML) < $(srcdir)/test.js -o test.js.out.html \ + && $(DIFF) $(srcdir)/test.js.html test.js.out.html test.css_xhtml.java.html: remove_css_xhtml_files check_java2xhtml: test.css_xhtml.java.html - $(JAVA2XHTML) < $(srcdir)/test.java -o test_xhtml.out.html - $(JAVA2XHTMLNOTFIXED) < $(srcdir)/test.java -o test_xhtml_notfixed.out.html - $(JAVA2XHTMLDOC) < $(srcdir)/test.java -o test_xhtml_doc.out.html - sed -itesttmp -f $(srcdir)/erasedir_inputlang.sed test_xhtml_doc.out.html - $(JAVA2XHTMLCSS) < $(srcdir)/test.java -o test_xhtml_css.out.html - $(JAVA2XHTMLCSSDOC) < $(srcdir)/test.java -o test_xhtml_css_doc.out.html - sed -itesttmp -f $(srcdir)/erasedir_inputlang.sed test_xhtml_css_doc.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test_xhtml.html test_xhtml.out.html - $(DIFF) $(srcdir)/test_xhtml_notfixed.html test_xhtml_notfixed.out.html - $(DIFF) $(srcdir)/test_xhtml_doc.html test_xhtml_doc.out.html - $(DIFF) $(srcdir)/test_xhtml_css.html test_xhtml_css.out.html - $(DIFF) $(srcdir)/test_xhtml_css_doc.html test_xhtml_css_doc.out.html - $(DIFF) $(srcdir)/test_xhtml.html test.css_xhtml.java.html + $(JAVA2XHTML) < $(srcdir)/test.java -o test_xhtml.out.html \ + && $(JAVA2XHTMLNOTFIXED) < $(srcdir)/test.java -o test_xhtml_notfixed.out.html \ + && $(JAVA2XHTMLDOC) < $(srcdir)/test.java -o test_xhtml_doc.out.html \ + && sed -itesttmp -f $(srcdir)/erasedir_inputlang.sed test_xhtml_doc.out.html \ + && $(JAVA2XHTMLCSS) < $(srcdir)/test.java -o test_xhtml_css.out.html \ + && $(JAVA2XHTMLCSSDOC) < $(srcdir)/test.java -o test_xhtml_css_doc.out.html \ + && sed -itesttmp -f $(srcdir)/erasedir_inputlang.sed test_xhtml_css_doc.out.html \ + && $(DIFF) $(srcdir)/test_xhtml.html test_xhtml.out.html \ + && $(DIFF) $(srcdir)/test_xhtml_notfixed.html test_xhtml_notfixed.out.html \ + && $(DIFF) $(srcdir)/test_xhtml_doc.html test_xhtml_doc.out.html \ + && $(DIFF) $(srcdir)/test_xhtml_css.html test_xhtml_css.out.html \ + && $(DIFF) $(srcdir)/test_xhtml_css_doc.html test_xhtml_css_doc.out.html \ + && $(DIFF) $(srcdir)/test_xhtml.html test.css_xhtml.java.html check_cpp2html: - $(CPP2HTML) -i $(srcdir)/test.h -o test.h.out.html - $(CPP2HTML) -i $(srcdir)/test_comments.cc -o test_comments.cc.out.html - $(CPP2HTML) -i $(srcdir)/test_template.cc -o test_template.cc.out.html - $(CPP2HTML_WHEADERS) -i $(srcdir)/test.h -o test_header.out.html - $(CPP2HTML) -n -i $(srcdir)/test.h -o test_cpp_lines.out.html - $(CPP2HTML) -n -i $(srcdir)/test_no_line_at_the_end.c -o test_no_line_at_the_end.c.out.html - $(CPP2HTML) -n -i $(srcdir)/test_line_at_the_end.c -o test_line_at_the_end.c.out.html - $(C2HTML) -i $(srcdir)/test_c.c -o test_c.c.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.h.html test.h.out.html - $(DIFF) $(srcdir)/test_comments.cc.html test_comments.cc.out.html - $(DIFF) $(srcdir)/test_template.cc.html test_template.cc.out.html - $(DIFF) $(srcdir)/test_header.html test_header.out.html - $(DIFF) $(srcdir)/test_cpp_lines.html test_cpp_lines.out.html - $(DIFF) $(srcdir)/test_no_line_at_the_end.c.html test_no_line_at_the_end.c.out.html - $(DIFF) $(srcdir)/test_line_at_the_end.c.html test_line_at_the_end.c.out.html - $(DIFF) $(srcdir)/test_c.c.html test_c.c.out.html + $(CPP2HTML) -i $(srcdir)/test.h -o test.h.out.html \ + && $(CPP2HTML) -i $(srcdir)/test_comments.cc -o test_comments.cc.out.html \ + && $(CPP2HTML) -i $(srcdir)/test_template.cc -o test_template.cc.out.html \ + && $(CPP2HTML_WHEADERS) -i $(srcdir)/test.h -o test_header.out.html \ + && $(CPP2HTML) -n -i $(srcdir)/test.h -o test_cpp_lines.out.html \ + && $(CPP2HTML) -n -i $(srcdir)/test_no_line_at_the_end.c -o test_no_line_at_the_end.c.out.html \ + && $(CPP2HTML) -n -i $(srcdir)/test_line_at_the_end.c -o test_line_at_the_end.c.out.html \ + && $(C2HTML) -i $(srcdir)/test_c.c -o test_c.c.out.html \ + && $(DIFF) $(srcdir)/test.h.html test.h.out.html \ + && $(DIFF) $(srcdir)/test_comments.cc.html test_comments.cc.out.html \ + && $(DIFF) $(srcdir)/test_template.cc.html test_template.cc.out.html \ + && $(DIFF) $(srcdir)/test_header.html test_header.out.html \ + && $(DIFF) $(srcdir)/test_cpp_lines.html test_cpp_lines.out.html \ + && $(DIFF) $(srcdir)/test_no_line_at_the_end.c.html test_no_line_at_the_end.c.out.html \ + && $(DIFF) $(srcdir)/test_line_at_the_end.c.html test_line_at_the_end.c.out.html \ + && $(DIFF) $(srcdir)/test_c.c.html test_c.c.out.html check_csharp2html: - $(CSHARP2HTML) -i $(srcdir)/test.cs -o test.cs.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.cs.html test.cs.out.html + $(CSHARP2HTML) -i $(srcdir)/test.cs -o test.cs.out.html \ + && $(DIFF) $(srcdir)/test.cs.html test.cs.out.html check_prolog2html: - $(PROLOG2HTML) < $(srcdir)/test.pl -o test.pl.out.html - $(PROLOG2HTML) -n -i $(srcdir)/test.pl -o test_pl_lines.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.pl.html test.pl.out.html - $(DIFF) $(srcdir)/test_pl_lines.html test_pl_lines.out.html + $(PROLOG2HTML) < $(srcdir)/test.pl -o test.pl.out.html \ + && $(PROLOG2HTML) -n -i $(srcdir)/test.pl -o test_pl_lines.out.html \ + && $(DIFF) $(srcdir)/test.pl.html test.pl.out.html \ + && $(DIFF) $(srcdir)/test_pl_lines.html test_pl_lines.out.html check_logtalk2html: - $(LOGTALK2HTML) < $(srcdir)/test.lgt -o test.lgt.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.lgt.html test.lgt.out.html + $(LOGTALK2HTML) < $(srcdir)/test.lgt -o test.lgt.out.html \ + && $(DIFF) $(srcdir)/test.lgt.html test.lgt.out.html check_perl2html: - $(PERL2HTML) < $(srcdir)/test.pm -o test.pm.out.html - $(PERL2HTML) < $(srcdir)/test_comments.pm -o test_comments.pm.out.html - $(PERL2HTML) -n -i $(srcdir)/test.pm -o test_perl_lines.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.pm.html test.pm.out.html - $(DIFF) $(srcdir)/test_comments.pm.html test_comments.pm.out.html - $(DIFF) $(srcdir)/test_perl_lines.html test_perl_lines.out.html + $(PERL2HTML) < $(srcdir)/test.pm -o test.pm.out.html \ + && $(PERL2HTML) < $(srcdir)/test_comments.pm -o test_comments.pm.out.html \ + && $(PERL2HTML) -n -i $(srcdir)/test.pm -o test_perl_lines.out.html \ + && $(DIFF) $(srcdir)/test.pm.html test.pm.out.html \ + && $(DIFF) $(srcdir)/test_comments.pm.html test_comments.pm.out.html \ + && $(DIFF) $(srcdir)/test_perl_lines.html test_perl_lines.out.html check_php32html: - $(PHP2HTML) < $(srcdir)/test.php3 -o test.php3.out.html - $(PHP2HTML) < $(srcdir)/test_with_html.php -o test_with_html.php.out.html - $(PHP2HTML) -n -i $(srcdir)/test.php3 -o test_php3_lines.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.php3.html test.php3.out.html - $(DIFF) $(srcdir)/test_with_html.php.html test_with_html.php.out.html - $(DIFF) $(srcdir)/test_php3_lines.html test_php3_lines.out.html + $(PHP2HTML) < $(srcdir)/test.php3 -o test.php3.out.html \ + && $(PHP2HTML) < $(srcdir)/test_with_html.php -o test_with_html.php.out.html \ + && $(PHP2HTML) -n -i $(srcdir)/test.php3 -o test_php3_lines.out.html \ + && $(DIFF) $(srcdir)/test.php3.html test.php3.out.html \ + && $(DIFF) $(srcdir)/test_with_html.php.html test_with_html.php.out.html \ + && $(DIFF) $(srcdir)/test_php3_lines.html test_php3_lines.out.html check_python2html: - $(PYTHON2HTML) < $(srcdir)/test.py -o test.py.out.html - $(PYTHON2HTML) < $(srcdir)/test_comments.py -o test_comments.py.out.html - $(PYTHON2HTML) -n -i $(srcdir)/test.py -o test_python_lines.out.html - $(PYTHON2HTML) -n -i $(srcdir)/test_comments.py -o test_py_comments_lines.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.py.html test.py.out.html - $(DIFF) $(srcdir)/test_comments.py.html test_comments.py.out.html - $(DIFF) $(srcdir)/test_python_lines.html test_python_lines.out.html - $(DIFF) $(srcdir)/test_py_comments_lines.html test_py_comments_lines.out.html + $(PYTHON2HTML) < $(srcdir)/test.py -o test.py.out.html \ + && $(PYTHON2HTML) < $(srcdir)/test_comments.py -o test_comments.py.out.html \ + && $(PYTHON2HTML) -n -i $(srcdir)/test.py -o test_python_lines.out.html \ + && $(PYTHON2HTML) -n -i $(srcdir)/test_comments.py -o test_py_comments_lines.out.html \ + && $(DIFF) $(srcdir)/test.py.html test.py.out.html \ + && $(DIFF) $(srcdir)/test_comments.py.html test_comments.py.out.html \ + && $(DIFF) $(srcdir)/test_python_lines.html test_python_lines.out.html \ + && $(DIFF) $(srcdir)/test_py_comments_lines.html test_py_comments_lines.out.html check_changelog: - $(CHANGELOG2HTML) < $(srcdir)/test.chlog -o test.chlog.out.html - $(CHANGELOG2HTMLCSS) -i $(srcdir)/test.chlog -o test.chlog_css.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.chlog.html test.chlog.out.html - $(DIFF) $(srcdir)/test.chlog_css.html test.chlog_css.out.html + $(CHANGELOG2HTML) < $(srcdir)/test.chlog -o test.chlog.out.html \ + && $(CHANGELOG2HTMLCSS) -i $(srcdir)/test.chlog -o test.chlog_css.out.html \ + && $(DIFF) $(srcdir)/test.chlog.html test.chlog.out.html \ + && $(DIFF) $(srcdir)/test.chlog_css.html test.chlog_css.out.html check_flex: - $(FLEX2HTML) < $(srcdir)/test.l -o test.l.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.l.html test.l.out.html + $(FLEX2HTML) < $(srcdir)/test.l -o test.l.out.html \ + && $(DIFF) $(srcdir)/test.l.html test.l.out.html check_bison: - $(BISON2HTML) < $(srcdir)/test.y -o test.y.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.y.html test.y.out.html + $(BISON2HTML) < $(srcdir)/test.y -o test.y.out.html \ + && $(DIFF) $(srcdir)/test.y.html test.y.out.html check_ruby: - $(RUBY2HTML) < $(srcdir)/test.rb -o test.rb.out.html - $(RUBY2HTML) < $(srcdir)/test_comments.rb -o test_comments.rb.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.rb.html test.rb.out.html - $(DIFF) $(srcdir)/test_comments.rb.html test_comments.rb.out.html + $(RUBY2HTML) < $(srcdir)/test.rb -o test.rb.out.html \ + && $(RUBY2HTML) < $(srcdir)/test_comments.rb -o test_comments.rb.out.html \ + && $(DIFF) $(srcdir)/test.rb.html test.rb.out.html \ + && $(DIFF) $(srcdir)/test_comments.rb.html test_comments.rb.out.html check_lua: - $(LUA2HTML) < $(srcdir)/test.lua -o test.lua.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.lua.html test.lua.out.html + $(LUA2HTML) < $(srcdir)/test.lua -o test.lua.out.html \ + && $(DIFF) $(srcdir)/test.lua.html test.lua.out.html check_ml: - $(CAML2HTML) < $(srcdir)/test.ml -o test.ml.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.ml.html test.ml.out.html + $(CAML2HTML) < $(srcdir)/test.ml -o test.ml.out.html \ + && $(DIFF) $(srcdir)/test.ml.html test.ml.out.html check_sml: - $(SML2HTML) < $(srcdir)/test.sml -o test.sml.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.sml.html test.sml.out.html + $(SML2HTML) < $(srcdir)/test.sml -o test.sml.out.html \ + && $(DIFF) $(srcdir)/test.sml.html test.sml.out.html check_log: - $(LOG2HTML) < $(srcdir)/test.log -o test.log.out.html - $(LOG2HTML) < $(srcdir)/access.log -o access.log.out.html - $(LOG2HTML) < $(srcdir)/auth.log -o auth.log.out.html - $(LOG2HTML) < $(srcdir)/error.log -o error.log.out.html - $(LOG2HTML) < $(srcdir)/syslog.log -o syslog.log.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.log.html test.log.out.html - $(DIFF) $(srcdir)/access.log.html access.log.out.html - $(DIFF) $(srcdir)/auth.log.html auth.log.out.html - $(DIFF) $(srcdir)/error.log.html error.log.out.html - $(DIFF) $(srcdir)/syslog.log.html syslog.log.out.html + $(LOG2HTML) < $(srcdir)/test.log -o test.log.out.html \ + && $(LOG2HTML) < $(srcdir)/access.log -o access.log.out.html \ + && $(LOG2HTML) < $(srcdir)/auth.log -o auth.log.out.html \ + && $(LOG2HTML) < $(srcdir)/error.log -o error.log.out.html \ + && $(LOG2HTML) < $(srcdir)/syslog.log -o syslog.log.out.html \ + && $(DIFF) $(srcdir)/test.log.html test.log.out.html \ + && $(DIFF) $(srcdir)/access.log.html access.log.out.html \ + && $(DIFF) $(srcdir)/auth.log.html auth.log.out.html \ + && $(DIFF) $(srcdir)/error.log.html error.log.out.html \ + && $(DIFF) $(srcdir)/syslog.log.html syslog.log.out.html check_diff: - $(DIFF2HTML) < $(srcdir)/test.diff -o test.diff.out.html - $(DIFF2HTML) < $(srcdir)/test2.diff -o test2.diff.out.html - $(DIFF2HTML) < $(srcdir)/test3.diff -o test3.diff.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.diff.html test.diff.out.html - $(DIFF) $(srcdir)/test2.diff.html test2.diff.out.html - $(DIFF) $(srcdir)/test3.diff.html test3.diff.out.html + $(DIFF2HTML) < $(srcdir)/test.diff -o test.diff.out.html \ + && $(DIFF2HTML) < $(srcdir)/test2.diff -o test2.diff.out.html \ + && $(DIFF2HTML) < $(srcdir)/test3.diff -o test3.diff.out.html \ + && $(DIFF) $(srcdir)/test.diff.html test.diff.out.html \ + && $(DIFF) $(srcdir)/test2.diff.html test2.diff.out.html \ + && $(DIFF) $(srcdir)/test3.diff.html test3.diff.out.html check_pascal: - $(PROGNAME) -i $(srcdir)/test.pas -o test.pas.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.pas.html test.pas.out.html + $(PROGNAME) -i $(srcdir)/test.pas -o test.pas.out.html \ + && $(DIFF) $(srcdir)/test.pas.html test.pas.out.html check_html: - $(PROGNAME) -i $(srcdir)/test.htm --title="html output formatted in html" -o test.htm.out.html - $(PROGNAME) -i $(srcdir)/test2.htm --title="html output formatted in html" -o test2.htm.out.html - $(PROGNAME) -i $(srcdir)/test_html5.htm --title="html output formatted in html" -o test_html5.htm.out.html - $(PROGNAME) -i $(srcdir)/test_with_embed.htm --title="html output formatted in html" -o test_with_embed.htm.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.htm.html test.htm.out.html - $(DIFF) $(srcdir)/test2.htm.html test2.htm.out.html - $(DIFF) $(srcdir)/test_html5.htm.html test_html5.htm.out.html - $(DIFF) $(srcdir)/test_with_embed.htm.html test_with_embed.htm.out.html + $(PROGNAME) -i $(srcdir)/test.htm --title="html output formatted in html" -o test.htm.out.html \ + && $(PROGNAME) -i $(srcdir)/test2.htm --title="html output formatted in html" -o test2.htm.out.html \ + && $(PROGNAME) -i $(srcdir)/test_html5.htm --title="html output formatted in html" -o test_html5.htm.out.html \ + && $(PROGNAME) -i $(srcdir)/test_with_embed.htm --title="html output formatted in html" -o test_with_embed.htm.out.html \ + && $(DIFF) $(srcdir)/test.htm.html test.htm.out.html \ + && $(DIFF) $(srcdir)/test2.htm.html test2.htm.out.html \ + && $(DIFF) $(srcdir)/test_html5.htm.html test_html5.htm.out.html \ + && $(DIFF) $(srcdir)/test_with_embed.htm.html test_with_embed.htm.out.html check_xml: - $(PROGNAME) -i $(srcdir)/test.xml --title="xml formatted in html" -o test.xml.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.xml.html test.xml.out.html + $(PROGNAME) -i $(srcdir)/test.xml --title="xml formatted in html" -o test.xml.out.html \ + && $(DIFF) $(srcdir)/test.xml.html test.xml.out.html check_sh: - $(PROGNAME) -i $(srcdir)/test.sh -o test.sh.out.html - $(PROGNAME) -i $(srcdir)/test2.sh -o test2.sh.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.sh.html test.sh.out.html - $(DIFF) $(srcdir)/test2.sh.html test2.sh.out.html + $(PROGNAME) -i $(srcdir)/test.sh -o test.sh.out.html \ + && $(PROGNAME) -i $(srcdir)/test2.sh -o test2.sh.out.html \ + && $(DIFF) $(srcdir)/test.sh.html test.sh.out.html \ + && $(DIFF) $(srcdir)/test2.sh.html test2.sh.out.html check_slang: - $(PROGNAME) -i $(srcdir)/test.sl -o test.sl.out.html --title="S-LANG test" - @echo expect no output from diff - $(DIFF) $(srcdir)/test.sl.html test.sl.out.html + $(PROGNAME) -i $(srcdir)/test.sl -o test.sl.out.html --title="S-LANG test" \ + && $(DIFF) $(srcdir)/test.sl.html test.sl.out.html check_url: - $(URL2HTML) -i $(srcdir)/test.url -o test.url.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.url.html test.url.out.html + $(URL2HTML) -i $(srcdir)/test.url -o test.url.out.html \ + && $(DIFF) $(srcdir)/test.url.html test.url.out.html check_properties: - $(PROPERTIES2HTML) -i $(srcdir)/test.properties -o test.properties.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.properties.html test.properties.out.html + $(PROPERTIES2HTML) -i $(srcdir)/test.properties -o test.properties.out.html \ + && $(DIFF) $(srcdir)/test.properties.html test.properties.out.html check_desktop: - $(DESKTOP2HTML) -i $(srcdir)/test.desktop -o test.desktop.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.desktop.html test.desktop.out.html + $(DESKTOP2HTML) -i $(srcdir)/test.desktop -o test.desktop.out.html \ + && $(DIFF) $(srcdir)/test.desktop.html test.desktop.out.html check_lsm: - $(LSM2HTML) -i $(srcdir)/test.lsm -o test.lsm.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.lsm.html test.lsm.out.html + $(LSM2HTML) -i $(srcdir)/test.lsm -o test.lsm.out.html \ + && $(DIFF) $(srcdir)/test.lsm.html test.lsm.out.html check_haxe: - $(HAXE2HTML) -i $(srcdir)/test.hx -o test.hx.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.hx.html test.hx.out.html + $(HAXE2HTML) -i $(srcdir)/test.hx -o test.hx.out.html \ + && $(DIFF) $(srcdir)/test.hx.html test.hx.out.html check_ldap: - $(PROGNAME_STD) -i $(srcdir)/test.ldap -o test.ldap.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.ldap.html test.ldap.out.html + $(PROGNAME_STD) -i $(srcdir)/test.ldap -o test.ldap.out.html \ + && $(DIFF) $(srcdir)/test.ldap.html test.ldap.out.html check_m4: - $(PROGNAME_STD) -i $(srcdir)/test.m4 -o test.m4.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.m4.html test.m4.out.html + $(PROGNAME_STD) -i $(srcdir)/test.m4 -o test.m4.out.html \ + && $(DIFF) $(srcdir)/test.m4.html test.m4.out.html check_glsl: - $(PROGNAME_STD) -i $(srcdir)/test.glsl -o test.glsl.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.glsl.html test.glsl.out.html + $(PROGNAME_STD) -i $(srcdir)/test.glsl -o test.glsl.out.html \ + && $(DIFF) $(srcdir)/test.glsl.html test.glsl.out.html check_xorg: - $(PROGNAME_STD) -i $(srcdir)/test.xorg -s xorg -o test.xorg.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.xorg.html test.xorg.out.html + $(PROGNAME_STD) -i $(srcdir)/test.xorg -s xorg -o test.xorg.out.html \ + && $(DIFF) $(srcdir)/test.xorg.html test.xorg.out.html check_conf: - $(PROGNAME_STD) -i $(srcdir)/test.conf -s conf -o test.conf.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.conf.html test.conf.out.html + $(PROGNAME_STD) -i $(srcdir)/test.conf -s conf -o test.conf.out.html \ + && $(DIFF) $(srcdir)/test.conf.html test.conf.out.html check_scala: - $(PROGNAME_STD) -i $(srcdir)/test.scala -s scala -o test.scala.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.scala.html test.scala.out.html + $(PROGNAME_STD) -i $(srcdir)/test.scala -s scala -o test.scala.out.html \ + && $(DIFF) $(srcdir)/test.scala.html test.scala.out.html check_ada: - $(PROGNAME_STD) -i $(srcdir)/test.adb -s ada -o test.adb.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.adb.html test.adb.out.html + $(PROGNAME_STD) -i $(srcdir)/test.adb -s ada -o test.adb.out.html \ + && $(DIFF) $(srcdir)/test.adb.html test.adb.out.html check_pkgconfig: - $(PROGNAME_STD) -i $(srcdir)/test.pc -s pc -o test.pc.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.pc.html test.pc.out.html + $(PROGNAME_STD) -i $(srcdir)/test.pc -s pc -o test.pc.out.html \ + && $(DIFF) $(srcdir)/test.pc.html test.pc.out.html check_texinfo: - $(PROGNAME_STD) -i $(srcdir)/test.texinfo -o test.texinfo.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.texinfo.html test.texinfo.out.html + $(PROGNAME_STD) -i $(srcdir)/test.texinfo -o test.texinfo.out.html \ + && $(DIFF) $(srcdir)/test.texinfo.html test.texinfo.out.html check_haskell: - $(PROGNAME_STD) -i $(srcdir)/test.hs -o test.hs.out.html - $(PROGNAME) $(STD_STYLE) -f xhtml -i $(srcdir)/test.lhs -o test.lhs.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.hs.html test.hs.out.html - $(DIFF) $(srcdir)/test.lhs.html test.lhs.out.html + $(PROGNAME_STD) -i $(srcdir)/test.hs -o test.hs.out.html \ + && $(PROGNAME) $(STD_STYLE) -f xhtml -i $(srcdir)/test.lhs -o test.lhs.out.html \ + && $(DIFF) $(srcdir)/test.hs.html test.hs.out.html \ + && $(DIFF) $(srcdir)/test.lhs.html test.lhs.out.html check_manifest: - $(PROGNAME_STD) -i $(srcdir)/test.MF -o test.MF.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.MF.html test.MF.out.html + $(PROGNAME_STD) -i $(srcdir)/test.MF -o test.MF.out.html \ + && $(DIFF) $(srcdir)/test.MF.html test.MF.out.html check_asm: - $(PROGNAME_STD) -i $(srcdir)/test.asm -o test.asm.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.asm.html test.asm.out.html + $(PROGNAME_STD) -i $(srcdir)/test.asm -o test.asm.out.html \ + && $(DIFF) $(srcdir)/test.asm.html test.asm.out.html check_applescript: - $(PROGNAME_STD) -i $(srcdir)/test.scpt -o test.scpt.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.scpt.html test.scpt.out.html + $(PROGNAME_STD) -i $(srcdir)/test.scpt -o test.scpt.out.html \ + && $(DIFF) $(srcdir)/test.scpt.html test.scpt.out.html check_vbscript: - $(PROGNAME_STD) -i $(srcdir)/test.vbs -o test.vbs.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.vbs.html test.vbs.out.html + $(PROGNAME_STD) -i $(srcdir)/test.vbs -o test.vbs.out.html \ + && $(DIFF) $(srcdir)/test.vbs.html test.vbs.out.html check_awk: - $(PROGNAME_STD) -i $(srcdir)/test.awk -o test.awk.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.awk.html test.awk.out.html + $(PROGNAME_STD) -i $(srcdir)/test.awk -o test.awk.out.html \ + && $(DIFF) $(srcdir)/test.awk.html test.awk.out.html check_bat: - $(PROGNAME_STD) -i $(srcdir)/test.bat -o test.bat.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.bat.html test.bat.out.html + $(PROGNAME_STD) -i $(srcdir)/test.bat -o test.bat.out.html \ + && $(DIFF) $(srcdir)/test.bat.html test.bat.out.html check_clipper: - $(PROGNAME_STD) -i $(srcdir)/test.clipper -o test.clipper.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.clipper.html test.clipper.out.html + $(PROGNAME_STD) -i $(srcdir)/test.clipper -o test.clipper.out.html \ + && $(DIFF) $(srcdir)/test.clipper.html test.clipper.out.html check_cobol: - $(PROGNAME_STD) -i $(srcdir)/test.cobol -o test.cobol.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.cobol.html test.cobol.out.html + $(PROGNAME_STD) -i $(srcdir)/test.cobol -o test.cobol.out.html \ + && $(DIFF) $(srcdir)/test.cobol.html test.cobol.out.html check_d: - $(PROGNAME_STD) -i $(srcdir)/test.d -o test.d.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.d.html test.d.out.html + $(PROGNAME_STD) -i $(srcdir)/test.d -o test.d.out.html \ + && $(DIFF) $(srcdir)/test.d.html test.d.out.html check_errors: - $(PROGNAME_STD) -i $(srcdir)/test.errors -o test.errors.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.errors.html test.errors.out.html + $(PROGNAME_STD) -i $(srcdir)/test.errors -o test.errors.out.html \ + && $(DIFF) $(srcdir)/test.errors.html test.errors.out.html check_erlang: - $(PROGNAME_STD) -i $(srcdir)/test.erl -o test.erl.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.erl.html test.erl.out.html + $(PROGNAME_STD) -i $(srcdir)/test.erl -o test.erl.out.html \ + && $(DIFF) $(srcdir)/test.erl.html test.erl.out.html check_fortran: - $(FORTRAN2HTML) -i $(srcdir)/test.fortran -o test.fortran.out.html - $(FORTRAN2HTML) -i $(srcdir)/test.fortran -s fixed-fortran -o test.fixed-fortran.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.fortran.html test.fortran.out.html - $(DIFF) $(srcdir)/test.fixed-fortran.html test.fixed-fortran.out.html + $(FORTRAN2HTML) -i $(srcdir)/test.fortran -o test.fortran.out.html \ + && $(FORTRAN2HTML) -i $(srcdir)/test.fortran -s fixed-fortran -o test.fixed-fortran.out.html \ + && $(DIFF) $(srcdir)/test.fortran.html test.fortran.out.html \ + && $(DIFF) $(srcdir)/test.fixed-fortran.html test.fixed-fortran.out.html check_proto: - $(PROGNAME_STD) -i $(srcdir)/test.proto -o test.proto.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.proto.html test.proto.out.html + $(PROGNAME_STD) -i $(srcdir)/test.proto -o test.proto.out.html \ + && $(DIFF) $(srcdir)/test.proto.html test.proto.out.html check_vala: - $(PROGNAME_STD) -i $(srcdir)/test.vala -o test.vala.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.vala.html test.vala.out.html + $(PROGNAME_STD) -i $(srcdir)/test.vala -o test.vala.out.html \ + && $(DIFF) $(srcdir)/test.vala.html test.vala.out.html check_lisp: - $(PROGNAME_STD) -i $(srcdir)/test.lisp -o test.lisp.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.lisp.html test.lisp.out.html + $(PROGNAME_STD) -i $(srcdir)/test.lisp -o test.lisp.out.html \ + && $(DIFF) $(srcdir)/test.lisp.html test.lisp.out.html check_scheme: - $(PROGNAME_STD) -i $(srcdir)/test.scm -o test.scm.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.scm.html test.scm.out.html + $(PROGNAME_STD) -i $(srcdir)/test.scm -o test.scm.out.html \ + && $(DIFF) $(srcdir)/test.scm.html test.scm.out.html check_po: - $(PROGNAME_STD) -i $(srcdir)/test.po -o test.po.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.po.html test.po.out.html + $(PROGNAME_STD) -i $(srcdir)/test.po -o test.po.out.html \ + && $(DIFF) $(srcdir)/test.po.html test.po.out.html check_opa: - $(PROGNAME_STD) -i $(srcdir)/test.opa -o test.opa.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.opa.html test.opa.out.html + $(PROGNAME_STD) -i $(srcdir)/test.opa -o test.opa.out.html \ + && $(DIFF) $(srcdir)/test.opa.html test.opa.out.html check_javalog: - $(PROGNAME) --style-file $(top_srcdir)/src/javalog.style -i $(srcdir)/test.javalog -o test.javalog.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.javalog.html test.javalog.out.html + $(PROGNAME) --style-file $(top_srcdir)/src/javalog.style -i $(srcdir)/test.javalog -o test.javalog.out.html \ + && $(DIFF) $(srcdir)/test.javalog.html test.javalog.out.html check_upc: - $(PROGNAME_STD) -i $(srcdir)/test.upc -o test.upc.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.upc.html test.upc.out.html + $(PROGNAME_STD) -i $(srcdir)/test.upc -o test.upc.out.html \ + && $(DIFF) $(srcdir)/test.upc.html test.upc.out.html check_lilypond: - $(PROGNAME) --style-file $(top_srcdir)/src/lilypond.style -i $(srcdir)/test.ly -o test.ly.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.ly.html test.ly.out.html + $(PROGNAME) --style-file $(top_srcdir)/src/lilypond.style -i $(srcdir)/test.ly -o test.ly.out.html \ + && $(DIFF) $(srcdir)/test.ly.html test.ly.out.html check_coffeescript: - $(PROGNAME_STD) -i $(srcdir)/test.coffee -o test.coffee.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.coffee.html test.coffee.out.html + $(PROGNAME_STD) -i $(srcdir)/test.coffee -o test.coffee.out.html \ + && $(DIFF) $(srcdir)/test.coffee.html test.coffee.out.html check_tml: - $(PROGNAME_STD) -i $(srcdir)/test.tml -o test.tml.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.tml.html test.tml.out.html + $(PROGNAME_STD) -i $(srcdir)/test.tml -o test.tml.out.html \ + && $(DIFF) $(srcdir)/test.tml.html test.tml.out.html check_spec: - $(SPEC2HTML) -i $(srcdir)/test.spec -o test.spec.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.spec.html test.spec.out.html + $(SPEC2HTML) -i $(srcdir)/test.spec -o test.spec.out.html \ + && $(DIFF) $(srcdir)/test.spec.html test.spec.out.html check_txt: - $(TXT2HTML) -i $(srcdir)/test.txt -o test.txt.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.txt.html test.txt.out.html + $(TXT2HTML) -i $(srcdir)/test.txt -o test.txt.out.html \ + && $(DIFF) $(srcdir)/test.txt.html test.txt.out.html myscript: test.sh cp $(srcdir)/test.sh $@ @@ -935,263 +872,198 @@ myimplicitphp.foo: test.php3 cp $(srcdir)/test.php3 $@ check_infer: myscript myimplicitxml.foo myimplicitphp.foo - rm -f myscript.html - rm -f myimplicitxml.foo.html - $(INFER) -i $(srcdir)/test2.pl -o test2.pl.out.html - $(INFER) -i $(srcdir)/test.tcl -o test.tcl.out.html - $(INFERIMPLICIT) -i myscript -o myscript.html - $(INFERIMPLICIT) -i $(srcdir)/test.ecore -o test.ecore.out.html - $(INFERIMPLICIT) --title="xml formatted in html" -i myimplicitxml.foo -o myimplicitxml.foo.html - $(INFERIMPLICIT) -i myimplicitphp.foo -o myimplicitphp.foo.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test2.pl.html test2.pl.out.html - $(DIFF) $(srcdir)/test.tcl.html test.tcl.out.html - $(DIFF) $(srcdir)/test.sh.html myscript.html - $(DIFF) $(srcdir)/test.ecore.html test.ecore.out.html - $(DIFF) $(srcdir)/test.xml.html myimplicitxml.foo.html - $(DIFF) $(srcdir)/test.php3.html myimplicitphp.foo.html + $(INFER) -i $(srcdir)/test2.pl -o test2.pl.out.html \ + && $(INFER) -i $(srcdir)/test.tcl -o test.tcl.out.html \ + && $(INFERIMPLICIT) -i myscript -o myscript.html \ + && $(INFERIMPLICIT) -i $(srcdir)/test.ecore -o test.ecore.out.html \ + && $(INFERIMPLICIT) --title="xml formatted in html" -i myimplicitxml.foo -o myimplicitxml.foo.html \ + && $(INFERIMPLICIT) -i myimplicitphp.foo -o myimplicitphp.foo.html \ + && $(DIFF) $(srcdir)/test2.pl.html test2.pl.out.html \ + && $(DIFF) $(srcdir)/test.tcl.html test.tcl.out.html \ + && $(DIFF) $(srcdir)/test.sh.html myscript.html \ + && $(DIFF) $(srcdir)/test.ecore.html test.ecore.out.html \ + && $(DIFF) $(srcdir)/test.xml.html myimplicitxml.foo.html \ + && $(DIFF) $(srcdir)/test.php3.html myimplicitphp.foo.html check_latex: - $(PROGNAME) -i $(srcdir)/test.tex -o test.tex.out.html - $(PROGNAME) -i $(srcdir)/test.java.tex -o test.java.tex.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.tex.html test.tex.out.html - $(DIFF) $(srcdir)/test.java.tex.html test.java.tex.out.html + $(PROGNAME) -i $(srcdir)/test.tex -o test.tex.out.html \ + && $(PROGNAME) -i $(srcdir)/test.java.tex -o test.java.tex.out.html \ + && $(DIFF) $(srcdir)/test.tex.html test.tex.out.html \ + && $(DIFF) $(srcdir)/test.java.tex.html test.java.tex.out.html check_docbook: - $(PROGNAME_DOCBOOK) -i $(srcdir)/test.h --line-number -o test.h.out.docbook - @echo expect no output from diff - $(DIFF) $(srcdir)/test.h.docbook test.h.out.docbook + $(PROGNAME_DOCBOOK) -i $(srcdir)/test.h --line-number -o test.h.out.docbook \ + && $(DIFF) $(srcdir)/test.h.docbook test.h.out.docbook check_sql: - $(PROGNAME) -i $(srcdir)/test.sql -o test.sql.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.sql.html test.sql.out.html + $(PROGNAME) -i $(srcdir)/test.sql -o test.sql.out.html \ + && $(DIFF) $(srcdir)/test.sql.html test.sql.out.html check_bib: - $(PROGNAME) -i $(srcdir)/test.bib -o test.bib.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.bib.html test.bib.out.html + $(PROGNAME) -i $(srcdir)/test.bib -o test.bib.out.html \ + && $(DIFF) $(srcdir)/test.bib.html test.bib.out.html check_makefile: - $(PROGNAME) -i $(srcdir)/test.makefile -o test.makefile.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.makefile.html test.makefile.out.html + $(PROGNAME) -i $(srcdir)/test.makefile -o test.makefile.out.html \ + && $(DIFF) $(srcdir)/test.makefile.html test.makefile.out.html check_css: - $(PROGNAME) -i $(srcdir)/test.css -o test.css.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.css.html test.css.out.html + $(PROGNAME) -i $(srcdir)/test.css -o test.css.out.html \ + && $(DIFF) $(srcdir)/test.css.html test.css.out.html check_ps: - $(PROGNAME) -i $(srcdir)/test.ps -o test.ps.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.ps.html test.ps.out.html + $(PROGNAME) -i $(srcdir)/test.ps -o test.ps.out.html \ + && $(DIFF) $(srcdir)/test.ps.html test.ps.out.html check_go: - $(PROGNAME) -i $(srcdir)/test.go -o test.go.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.go.html test.go.out.html + $(PROGNAME) -i $(srcdir)/test.go -o test.go.out.html \ + && $(DIFF) $(srcdir)/test.go.html test.go.out.html check_groovy: - $(PROGNAME) -i $(srcdir)/test.groovy -o test.groovy.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.groovy.html test.groovy.out.html + $(PROGNAME) -i $(srcdir)/test.groovy -o test.groovy.out.html \ + && $(DIFF) $(srcdir)/test.groovy.html test.groovy.out.html check_json: - $(PROGNAME) --style-file=json.style -i $(srcdir)/test.json -o test.json.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.json.html test.json.out.html + $(PROGNAME) --style-file=json.style -i $(srcdir)/test.json -o test.json.out.html \ + && $(DIFF) $(srcdir)/test.json.html test.json.out.html check_feature: - $(PROGNAME) -i $(srcdir)/test.feature -o test.feature.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.feature.html test.feature.out.html + $(PROGNAME) -i $(srcdir)/test.feature -o test.feature.out.html \ + && $(DIFF) $(srcdir)/test.feature.html test.feature.out.html check_ipxe: - $(PROGNAME) -i $(srcdir)/test.ipxe -o test.ipxe.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.ipxe.html test.ipxe.out.html + $(PROGNAME) -i $(srcdir)/test.ipxe -o test.ipxe.out.html \ + && $(DIFF) $(srcdir)/test.ipxe.html test.ipxe.out.html check_lang: - $(LANG2HTML) -i $(top_srcdir)/src/log.lang -o log.lang.out.html - $(LANG2HTML) -i $(top_srcdir)/src/c.lang -o c.lang.out.html - $(STYLE2HTML) -i $(top_srcdir)/src/default.style -o default.style.out.html - $(STYLE2HTML) -i $(srcdir)/syslog.style -o syslog.style.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/log.lang.html log.lang.out.html - $(DIFF) $(srcdir)/c.lang.html c.lang.out.html - $(DIFF) $(srcdir)/default.style.html default.style.out.html - $(DIFF) $(srcdir)/syslog.style.html syslog.style.out.html + $(LANG2HTML) -i $(top_srcdir)/src/log.lang -o log.lang.out.html \ + && $(LANG2HTML) -i $(top_srcdir)/src/c.lang -o c.lang.out.html \ + && $(STYLE2HTML) -i $(top_srcdir)/src/default.style -o default.style.out.html \ + && $(STYLE2HTML) -i $(srcdir)/syslog.style -o syslog.style.out.html \ + && $(DIFF) $(srcdir)/log.lang.html log.lang.out.html \ + && $(DIFF) $(srcdir)/c.lang.html c.lang.out.html \ + && $(DIFF) $(srcdir)/default.style.html default.style.out.html \ + && $(DIFF) $(srcdir)/syslog.style.html syslog.style.out.html check_simple: - $(SIMPLE) -i $(srcdir)/test.simple -o test.simple.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.simple.html test.simple.out.html + $(SIMPLE) -i $(srcdir)/test.simple -o test.simple.out.html \ + && $(DIFF) $(srcdir)/test.simple.html test.simple.out.html check_isolate: - $(TESTISOLATE) -i $(srcdir)/test.isolate -o test.isolate.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.isolate.html test.isolate.out.html + $(TESTISOLATE) -i $(srcdir)/test.isolate -o test.isolate.out.html \ + && $(DIFF) $(srcdir)/test.isolate.html test.isolate.out.html check_backref: - $(TESTBACKREF) -i $(srcdir)/test.backref -o test.backref.out.html - $(TESTBACKREF) -i $(srcdir)/test2.backref -o test2.backref.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.backref.html test.backref.out.html - $(DIFF) $(srcdir)/test2.backref.html test2.backref.out.html + $(TESTBACKREF) -i $(srcdir)/test.backref -o test.backref.out.html \ + && $(TESTBACKREF) -i $(srcdir)/test2.backref -o test2.backref.out.html \ + && $(DIFF) $(srcdir)/test.backref.html test.backref.out.html \ + && $(DIFF) $(srcdir)/test2.backref.html test2.backref.out.html check_namedgroups: - $(NAMEDGROUPS) -i $(srcdir)/test.ngroups -o test.ngroups.out.html - $(NAMEDGROUPS_STATE) -i $(srcdir)/test_state.ngroups -o test_state.ngroups.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.ngroups.html test.ngroups.out.html - $(DIFF) $(srcdir)/test_state.ngroups.html test_state.ngroups.out.html + $(NAMEDGROUPS) -i $(srcdir)/test.ngroups -o test.ngroups.out.html \ + && $(NAMEDGROUPS_STATE) -i $(srcdir)/test_state.ngroups -o test_state.ngroups.out.html \ + && $(DIFF) $(srcdir)/test.ngroups.html test.ngroups.out.html \ + && $(DIFF) $(srcdir)/test_state.ngroups.html test_state.ngroups.out.html check_zsh: - $(PROGNAME) -s zsh -f esc --style-file=$(top_srcdir)/src/esc.style --doc --lang-def=$(srcdir)/../src/zsh.lang -n -i $(srcdir)/test.zsh -o test.zsh.out.txt - @echo expect no output from diff - $(DIFF) $(srcdir)/test.zsh.txt test.zsh.out.txt + $(PROGNAME) -s zsh -f esc --style-file=$(top_srcdir)/src/esc.style --doc --lang-def=$(srcdir)/../src/zsh.lang -n -i $(srcdir)/test.zsh -o test.zsh.out.txt \ + && $(DIFF) $(srcdir)/test.zsh.txt test.zsh.out.txt .lang.err_out: - $(CHECKLANG) ./$< 2> $@ || true; - sed -itesttmp -f $(srcdir)/erasedir.sed $@ && rm -f *testtmp + $(CHECKLANG) ./$< 2> $@ || true + sed -itesttmp -f $(srcdir)/erasedir.sed $@ .outlang.err_out: - $(CHECKOUTLANG) ./$< 2> $@ || true; - sed -itesttmp -f $(srcdir)/erasedir.sed $@ && rm -f *testtmp + $(CHECKOUTLANG) ./$< 2> $@ || true + sed -itesttmp -f $(srcdir)/erasedir.sed $@ .style.err_out: - $(PROGEXE) --lang-def=$(srcdir)/simple.lang --style-file=./$< --data-dir=$(top_srcdir)/src < $(srcdir)/test.java > /dev/null 2> $@ || true; - sed -itesttmp -f $(srcdir)/erasedir.sed $@ && rm -f *testtmp + $(PROGEXE) --lang-def=$(srcdir)/simple.lang --style-file=./$< --data-dir=$(top_srcdir)/src < $(srcdir)/test.java > /dev/null 2> $@ || true + sed -itesttmp -f $(srcdir)/erasedir.sed $@ .css.err_out: - $(PROGEXE) --lang-def=$(srcdir)/simple.lang --style-css=./$< --data-dir=$(top_srcdir)/src < $(srcdir)/test.java > /dev/null 2> $@ || true; - sed -itesttmp -f $(srcdir)/erasedir.sed $@ && rm -f *testtmp + $(PROGEXE) --lang-def=$(srcdir)/simple.lang --style-css=./$< --data-dir=$(top_srcdir)/src < $(srcdir)/test.java > /dev/null 2> $@ || true + sed -itesttmp -f $(srcdir)/erasedir.sed $@ + +ERR_FILES = wrong_exp.err wrong_syntax.err \ + wrong_syntax_include.err wrong_var.err \ + wrong_trans.err wrong_dircolor.err \ + wrong_already_defined.err \ + wrong_already_defined_css.err wrong_namedgroups.err \ + wrong_namedgroups_subexps.err \ + wrong_namedgroups_subexps2.err wrong_backref.err \ + wrong_backref2.err wrong_dyn_backref.err \ + wrong_dyn_backref2.err wrong_include.err \ + wrong_outlang_include.err check_wrong: - rm -f *.err_out - $(MAKE) wrong_exp.err_out - $(MAKE) wrong_syntax.err_out - $(MAKE) wrong_syntax_include.err_out - $(MAKE) wrong_var.err_out - $(MAKE) wrong_trans.err_out - $(MAKE) wrong_dircolor.err_out - $(MAKE) wrong_already_defined.err_out - $(MAKE) wrong_already_defined_css.err_out - $(MAKE) wrong_namedgroups.err_out - $(MAKE) wrong_namedgroups_subexps.err_out - $(MAKE) wrong_namedgroups_subexps2.err_out - $(MAKE) wrong_backref.err_out - $(MAKE) wrong_backref2.err_out - $(MAKE) wrong_dyn_backref.err_out - $(MAKE) wrong_dyn_backref2.err_out - $(MAKE) wrong_include.err_out - $(MAKE) wrong_outlang_include.err_out - @echo expect no output from diff - $(DIFF) $(srcdir)/wrong_exp.err wrong_exp.err_out - $(DIFF) $(srcdir)/wrong_syntax.err wrong_syntax.err_out - $(DIFF) $(srcdir)/wrong_syntax_include.err wrong_syntax_include.err_out - $(DIFF) $(srcdir)/wrong_var.err wrong_var.err_out - $(DIFF) $(srcdir)/wrong_trans.err wrong_trans.err_out - $(DIFF) $(srcdir)/wrong_dircolor.err wrong_dircolor.err_out - $(DIFF) $(srcdir)/wrong_already_defined.err wrong_already_defined.err_out - $(DIFF) $(srcdir)/wrong_already_defined_css.err wrong_already_defined_css.err_out - $(DIFF) $(srcdir)/wrong_namedgroups.err wrong_namedgroups.err_out - $(DIFF) $(srcdir)/wrong_namedgroups_subexps.err wrong_namedgroups_subexps.err_out - $(DIFF) $(srcdir)/wrong_namedgroups_subexps2.err wrong_namedgroups_subexps2.err_out - $(DIFF) $(srcdir)/wrong_backref.err wrong_backref.err_out - $(DIFF) $(srcdir)/wrong_backref2.err wrong_backref2.err_out - $(DIFF) $(srcdir)/wrong_dyn_backref.err wrong_dyn_backref.err_out - $(DIFF) $(srcdir)/wrong_dyn_backref2.err wrong_dyn_backref2.err_out - $(DIFF) $(srcdir)/wrong_include.err wrong_include.err_out - $(DIFF) $(srcdir)/wrong_outlang_include.err wrong_outlang_include.err_out + for file in $(ERR_FILES); do \ + rm -f $$file \ + && $(MAKE) $${file}_out \ + && $(DIFF) $(srcdir)/$$file $${file}_out || exit 1; \ + done check_wrong_lineranges: - rm -f *.err_out - $(WRONGLINERANGEEXE) 2> wrong_line_range.err_out || true - @echo expect no output from diff - $(DIFF) $(srcdir)/wrong_line_range.err wrong_line_range.err_out - -# this is not wrong anymore -# https://savannah.gnu.org/bugs/index.php?41786 -check_wrong_regexranges: -# rm -f *.err_out -# $(WRONGREGEXRANGEEXE) 2> wrong_regex_range.err_out || true -# @echo expect no output from diff -# $(DIFF) $(srcdir)/wrong_regex_range.err wrong_regex_range.err_out + $(WRONGLINERANGEEXE) 2> wrong_line_range.err_out \ + ; $(DIFF) $(srcdir)/wrong_line_range.err wrong_line_range.err_out check_wrong_syntaxmode: - rm -f *.err_out - $(WRONGSYNTAXMODEEXE) 2> wrong_syntax_mode.err_out || true - @echo expect no output from diff - $(DIFF) $(srcdir)/wrong_syntax_mode.err wrong_syntax_mode.err_out + $(WRONGSYNTAXMODEEXE) 2> wrong_syntax_mode.err_out \ + ; $(DIFF) $(srcdir)/wrong_syntax_mode.err wrong_syntax_mode.err_out check_lineranges: - $(LINERANGE1EXE) < $(srcdir)/test.java -o test_linerange1.out.html - $(LINERANGE2EXE) < $(srcdir)/test.java -o test_linerange2.out.html - $(LINERANGESEPEXE) < $(srcdir)/test.java -o test_linerange_sep.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test_linerange1.html test_linerange1.out.html - $(DIFF) $(srcdir)/test_linerange2.html test_linerange2.out.html - $(DIFF) $(srcdir)/test_linerange_sep.html test_linerange_sep.out.html + $(LINERANGE1EXE) < $(srcdir)/test.java -o test_linerange1.out.html \ + && $(LINERANGE2EXE) < $(srcdir)/test.java -o test_linerange2.out.html \ + && $(LINERANGESEPEXE) < $(srcdir)/test.java -o test_linerange_sep.out.html \ + && $(DIFF) $(srcdir)/test_linerange1.html test_linerange1.out.html \ + && $(DIFF) $(srcdir)/test_linerange2.html test_linerange2.out.html \ + && $(DIFF) $(srcdir)/test_linerange_sep.html test_linerange_sep.out.html check_regexranges: - $(REGEXRANGE1EXE) < $(srcdir)/test.java -o test_regexrange1.out.html - $(REGEXRANGE2EXE) < $(srcdir)/test.java -o test_regexrange2.out.html - $(REGEXRANGE3EXE) < $(srcdir)/test.java -o test_regexrange3.out.html - $(REGEXRANGE4EXE) < $(srcdir)/test.java -o test_regexrange4.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test_regexrange1.html test_regexrange1.out.html - $(DIFF) $(srcdir)/test_regexrange2.html test_regexrange2.out.html - $(DIFF) $(srcdir)/test_regexrange3.html test_regexrange3.out.html - $(DIFF) $(srcdir)/test_regexrange4.html test_regexrange4.out.html + $(REGEXRANGE1EXE) < $(srcdir)/test.java -o test_regexrange1.out.html \ + && $(REGEXRANGE2EXE) < $(srcdir)/test.java -o test_regexrange2.out.html \ + && $(REGEXRANGE3EXE) < $(srcdir)/test.java -o test_regexrange3.out.html \ + && $(REGEXRANGE4EXE) < $(srcdir)/test.java -o test_regexrange4.out.html \ + && $(DIFF) $(srcdir)/test_regexrange1.html test_regexrange1.out.html \ + && $(DIFF) $(srcdir)/test_regexrange2.html test_regexrange2.out.html \ + && $(DIFF) $(srcdir)/test_regexrange3.html test_regexrange3.out.html \ + && $(DIFF) $(srcdir)/test_regexrange4.html test_regexrange4.out.html check_nobgcolor: - $(PROGNAME) --style-file=texinfo.style --doc --title="source file" -i $(srcdir)/test_nobgcolor.cpp -o test_nobgcolor.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test_nobgcolor.html test_nobgcolor.out.html + $(PROGNAME) --style-file=texinfo.style --doc --title="source file" -i $(srcdir)/test_nobgcolor.cpp -o test_nobgcolor.out.html \ + && $(DIFF) $(srcdir)/test_nobgcolor.html test_nobgcolor.out.html check_tabs: - $(JAVA2HTML) --tab=4 -i $(srcdir)/test.java -o test_tabs.java.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test_tabs.java.html test_tabs.java.out.html + $(JAVA2HTML) --tab=4 -i $(srcdir)/test.java -o test_tabs.java.out.html \ + && $(DIFF) $(srcdir)/test_tabs.java.html test_tabs.java.out.html -#$(PROG_NOOUTLANGDEF) -i $(srcdir)/test.simple -o test.err_out --data-dir=/tmp 2-o missing_langmap2.err_out || true -#sed -r -i -f $(srcdir)/erasedir2.sed missing_langmap2.err_out -#diff $(srcdir)/missing_langmap2.err missing_langmap2.err_out - check_missing: - rm -f *.err_out - $(PROG_NOLANGDEF) -i $(srcdir)/test.simple -o test.err_out 2> missing_langmap.err_out || true - $(PROG_NOOUTLANGDEF) --outlang-def=$(srcdir)/simple.outlang $(srcdir)/test.simple 2> missing_extension.err_out || true - @echo expect no output from diff - sed -itesttmp -f $(srcdir)/erasedir2.sed missing_langmap.err_out - sed -itesttmp -f $(srcdir)/erasedir2.sed missing_extension.err_out - $(DIFF) $(srcdir)/missing_langmap.err missing_langmap.err_out - $(DIFF) $(srcdir)/missing_extension.err missing_extension.err_out - rm -f *testtmp + rm -f missing_langmap.err_out missing_extension.err_out test.err_out \ + && $(PROG_NOLANGDEF) -i $(srcdir)/test.simple -o test.err_out 2> missing_langmap.err_out \ + ; $(PROG_NOOUTLANGDEF) --outlang-def=$(srcdir)/simple.outlang $(srcdir)/test.simple 2> missing_extension.err_out \ + ; sed -itesttmp -f $(srcdir)/erasedir2.sed missing_langmap.err_out \ + && sed -itesttmp -f $(srcdir)/erasedir2.sed missing_extension.err_out \ + && $(DIFF) $(srcdir)/missing_langmap.err missing_langmap.err_out \ + && $(DIFF) $(srcdir)/missing_extension.err missing_extension.err_out check_failsafe: - $(FAILSAFE) -i $(srcdir)/test.unknown -o test.unknown.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.unknown.html test.unknown.out.html + $(FAILSAFE) -i $(srcdir)/test.unknown -o test.unknown.out.html \ + && $(DIFF) $(srcdir)/test.unknown.html test.unknown.out.html check_debug: - rm -f *.out.debug - $(DEBUGLANG) -i $(srcdir)/debug.java -o debug.java.out.html > debug.out.debug - tr -d '\r' < debug.out.debug > temp.output && cp -f temp.output debug.out.debug - @echo expect no output from diff - $(DIFF) $(srcdir)/debug.debug debug.out.debug - $(DIFF) $(srcdir)/debug.java.html debug.java.out.html + temp=temp.output.$$$$ \ + && $(DEBUGLANG) -i $(srcdir)/debug.java -o debug.java.out.html > debug.out.debug \ + && tr -d '\r' < debug.out.debug > $$temp && cp -f $$temp debug.out.debug \ + && $(DIFF) $(srcdir)/debug.debug debug.out.debug \ + && $(DIFF) $(srcdir)/debug.java.html debug.java.out.html \ + && rm -f $$temp check_defaults: - $(TESTWDEFAULTS) -i $(srcdir)/test.wdefault -o test.wdefault.out.html - $(TESTWODEFAULTS) -i $(srcdir)/test.wodefault -o test.wodefault.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test.wdefault.html test.wdefault.out.html - $(DIFF) $(srcdir)/test.wodefault.html test.wodefault.out.html + $(TESTWDEFAULTS) -i $(srcdir)/test.wdefault -o test.wdefault.out.html \ + && $(TESTWODEFAULTS) -i $(srcdir)/test.wodefault -o test.wodefault.out.html \ + && $(DIFF) $(srcdir)/test.wdefault.html test.wdefault.out.html \ + && $(DIFF) $(srcdir)/test.wodefault.html test.wodefault.out.html TEMP_TAGFILE=temp_test_refs.tags @@ -1203,81 +1075,99 @@ check_ref: else # sed -i -r 's/([.\/[:alnum:]]+)\/(test\.h\:[[:alnum:]\._]+)/2円/g' test_ref.out.html # eliminate leading paths check_ref: - $(CPP2HTML_WREFS) -i $(srcdir)/test.h -o test_ref.out.html $(CTAGS_COMMAND_TMP) - sed -itesttmp -e 's/test\_ref\.out\.html/test\_ref\.html/g' test_ref.out.html - sed -itesttmp -f $(srcdir)/erasedir3.sed test_ref.out.html # eliminate leading paths - rm -f test_refs_tmp.* *testtmp - cp -f $(srcdir)/test_refs.h test_refs_tmp.h - cp -f $(srcdir)/test_refs.cpp test_refs_tmp.cpp - $(CTAGS_CMD) -o $(TEMP_TAGFILE) test_refs_tmp.h test_refs_tmp.cpp - $(CPP2HTML_WREFS) --ctags-file=$(TEMP_TAGFILE) --line-number test_refs_tmp.h test_refs_tmp.cpp --verbose - sed -itesttmp -e 's/\_tmp\.h/\.h/g' test_refs_tmp.h.html test_refs_tmp.cpp.html - sed -itesttmp -e 's/\_tmp\.cpp/\.cpp/g' test_refs_tmp.h.html test_refs_tmp.cpp.html - $(CPP2LATEX_WREFS) -i $(srcdir)/test.h -o test_ref.out.tex $(CTAGS_COMMAND_TMP) - sed -itesttmp -r 's/([.\/[:alnum:]]+)\/(test\.h\:[[:alnum:]\._]+)/2円/g' test_ref.out.tex # eliminate leading paths - $(CPP2LATEX_WREFSPOST) -i $(srcdir)/test.h -o test_ref_post.out.tex $(CTAGS_COMMAND_TMP) - sed -itesttmp -f $(srcdir)/erasedir3.sed test_ref_post.out.tex # eliminate leading paths - $(CPP2TEXINFO_WREFS) -i $(srcdir)/test.h -o test_ref.out.texinfo $(CTAGS_COMMAND_TMP) - sed -itesttmp -f $(srcdir)/erasedir3.sed test_ref.out.texinfo # eliminate leading paths - $(CPP2DOCBOOK_WREFS) -i $(srcdir)/test.h -o test_ref.out.docbook $(CTAGS_COMMAND_TMP) - $(CPP2XHTML_WREFS) -i $(srcdir)/test.h -o test_ref.out.xhtml $(CTAGS_COMMAND_TMP) - sed -itesttmp -e 's/test\_ref\.out\.xhtml/test\_ref\.xhtml/g' test_ref.out.xhtml - sed -itesttmp -f $(srcdir)/erasedir3.sed test_ref.out.xhtml # eliminate leading paths - @echo expect no output from diff - $(DIFF) $(srcdir)/test_ref.html test_ref.out.html - $(DIFF) $(srcdir)/test_refs.h.html test_refs_tmp.h.html - $(DIFF) $(srcdir)/test_refs.cpp.html test_refs_tmp.cpp.html - $(DIFF) $(srcdir)/test_ref.tex test_ref.out.tex - $(DIFF) $(srcdir)/test_ref.texinfo test_ref.out.texinfo - $(DIFF) $(srcdir)/test_ref_post.tex test_ref_post.out.tex - $(DIFF) $(srcdir)/test_ref.docbook test_ref.out.docbook - $(DIFF) $(srcdir)/test_ref.xhtml test_ref.out.xhtml - rm -f test_refs_tmp.* *testtmp $(TEMP_TAGFILE) + $(CPP2HTML_WREFS) -i $(srcdir)/test.h -o test_ref.out.html $(CTAGS_COMMAND_TMP) \ + && sed -itesttmp -e 's/test\_ref\.out\.html/test\_ref\.html/g' test_ref.out.html \ + && sed -itesttmp -f $(srcdir)/erasedir3.sed test_ref.out.html \ + && cp -f $(srcdir)/test_refs.h test_refs_tmp.h \ + && cp -f $(srcdir)/test_refs.cpp test_refs_tmp.cpp \ + && $(CTAGS_CMD) -o $(TEMP_TAGFILE) test_refs_tmp.h test_refs_tmp.cpp \ + && $(CPP2HTML_WREFS) --ctags-file=$(TEMP_TAGFILE) --line-number test_refs_tmp.h test_refs_tmp.cpp --verbose \ + && sed -itesttmp -e 's/\_tmp\.h/\.h/g' test_refs_tmp.h.html test_refs_tmp.cpp.html \ + && sed -itesttmp -e 's/\_tmp\.cpp/\.cpp/g' test_refs_tmp.h.html test_refs_tmp.cpp.html \ + && $(CPP2LATEX_WREFS) -i $(srcdir)/test.h -o test_ref.out.tex $(CTAGS_COMMAND_TMP) \ + && sed -itesttmp -r 's/([.\/[:alnum:]]+)\/(test\.h\:[[:alnum:]\._]+)/2円/g' test_ref.out.tex \ + && $(CPP2LATEX_WREFSPOST) -i $(srcdir)/test.h -o test_ref_post.out.tex $(CTAGS_COMMAND_TMP) \ + && sed -itesttmp -f $(srcdir)/erasedir3.sed test_ref_post.out.tex \ + && $(CPP2TEXINFO_WREFS) -i $(srcdir)/test.h -o test_ref.out.texinfo $(CTAGS_COMMAND_TMP) \ + && sed -itesttmp -f $(srcdir)/erasedir3.sed test_ref.out.texinfo \ + && $(CPP2DOCBOOK_WREFS) -i $(srcdir)/test.h -o test_ref.out.docbook $(CTAGS_COMMAND_TMP) \ + && $(CPP2XHTML_WREFS) -i $(srcdir)/test.h -o test_ref.out.xhtml $(CTAGS_COMMAND_TMP) \ + && sed -itesttmp -e 's/test\_ref\.out\.xhtml/test\_ref\.xhtml/g' test_ref.out.xhtml \ + && sed -itesttmp -f $(srcdir)/erasedir3.sed test_ref.out.xhtml \ + && $(DIFF) $(srcdir)/test_ref.html test_ref.out.html \ + && $(DIFF) $(srcdir)/test_refs.h.html test_refs_tmp.h.html \ + && $(DIFF) $(srcdir)/test_refs.cpp.html test_refs_tmp.cpp.html \ + && $(DIFF) $(srcdir)/test_ref.tex test_ref.out.tex \ + && $(DIFF) $(srcdir)/test_ref.texinfo test_ref.out.texinfo \ + && $(DIFF) $(srcdir)/test_ref_post.tex test_ref_post.out.tex \ + && $(DIFF) $(srcdir)/test_ref.docbook test_ref.out.docbook \ + && $(DIFF) $(srcdir)/test_ref.xhtml test_ref.out.xhtml \ + && rm -f test_refs_tmp.* $(TEMP_TAGFILE) endif -check_show: - $(PROGEXE) --show-regex=$(top_srcdir)/src/c_comment.lang > c_comment.out.show - tr -d '\r' < c_comment.out.show > temp.output && cp -f temp.output c_comment.out.show - $(PROGEXE) --show-regex=$(srcdir)/namedgroups_state.lang > namedgroups_state.out.show - tr -d '\r' < namedgroups_state.out.show > temp.output && cp -f temp.output namedgroups_state.out.show - @echo expect no output from diff - $(DIFF) $(srcdir)/c_comment.show c_comment.out.show - $(DIFF) $(srcdir)/namedgroups_state.show namedgroups_state.out.show +check_show: check_show_c check_show_named + +check_show_c: + temp=temp.output.$$$$ \ + && $(PROGEXE) --show-regex=$(top_srcdir)/src/c_comment.lang > c_comment.out.show \ + && tr -d '\r' < c_comment.out.show > $$temp && cp -f $$temp c_comment.out.show \ + && $(DIFF) $(srcdir)/c_comment.show c_comment.out.show \ + && rm -f $$temp + +check_show_named: + temp=temp.output.$$$$ \ + && $(PROGEXE) --show-regex=$(srcdir)/namedgroups_state.lang > namedgroups_state.out.show \ + && tr -d '\r' < namedgroups_state.out.show > $$temp && cp -f $$temp namedgroups_state.out.show \ + && $(DIFF) $(srcdir)/namedgroups_state.show namedgroups_state.out.show \ + && rm -f $$temp check_langelems: - $(PROGEXE) $(DATADIROPTION) --show-lang-elements=$(top_srcdir)/src/cpp.lang > cpp.out.langelems - tr -d '\r' < cpp.out.langelems > temp.output && cp -f temp.output cpp.out.langelems - @echo expect no output from diff - $(DIFF) $(srcdir)/cpp.langelems cpp.out.langelems - -check_list: - $(PROGEXE) $(DATADIROPTION) --lang-list > lang.out.list - tr -d '\r' < lang.out.list > temp.output && cp -f temp.output lang.out.list - $(PROGEXE) $(DATADIROPTION) --outlang-list > outlang.out.list - tr -d '\r' < outlang.out.list > temp.output && cp -f temp.output outlang.out.list - @echo expect no output from diff - $(DIFF) $(srcdir)/lang.list lang.out.list - $(DIFF) $(srcdir)/outlang.list outlang.out.list - -check_stop: - $(PROGNAME) --lang-def=$(srcdir)/test_string_stop.lang -i $(srcdir)/test_string_stop.java -o test_string_stop.java.out.html - $(JAVA2HTML) -i $(srcdir)/test_java_stop.java -o test_java_stop.java.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test_string_stop.java.html test_string_stop.java.out.html - $(DIFF) $(srcdir)/test_java_stop.java.html test_java_stop.java.out.html - -check_vardecl: - $(JAVA2HTML) -i $(srcdir)/test_vardecl.java -o test_vardecl.java.out.html - $(CPP2HTML) -i $(srcdir)/test_vardecl.cc -o test_vardecl.cc.out.html - @echo expect no output from diff - $(DIFF) $(srcdir)/test_vardecl.java.html test_vardecl.java.out.html - $(DIFF) $(srcdir)/test_vardecl.cc.html test_vardecl.cc.out.html + temp=temp.output.$$$$ \ + && $(PROGEXE) $(DATADIROPTION) --show-lang-elements=$(top_srcdir)/src/cpp.lang > cpp.out.langelems \ + && tr -d '\r' < cpp.out.langelems > $$temp && cp -f $$temp cpp.out.langelems \ + && $(DIFF) $(srcdir)/cpp.langelems cpp.out.langelems \ + && rm -f $$temp + +check_list: check_list_lang check_list_outlang + +check_list_lang: + temp=temp.output.$$$$ \ + && $(PROGEXE) $(DATADIROPTION) --lang-list > lang.out.list \ + && tr -d '\r' < lang.out.list > $$temp && cp -f $$temp lang.out.list \ + && $(DIFF) $(srcdir)/lang.list lang.out.list \ + && rm -f $$temp + +check_list_outlang: + temp=temp.output.$$$$ \ + && $(PROGEXE) $(DATADIROPTION) --outlang-list > outlang.out.list \ + && tr -d '\r' < outlang.out.list > $$temp && cp -f $$temp outlang.out.list \ + && $(DIFF) $(srcdir)/outlang.list outlang.out.list \ + && rm -f $$temp + +check_stop: check_stop_java check_stop_string + +check_stop_string: + $(PROGNAME) --lang-def=$(srcdir)/test_string_stop.lang -i $(srcdir)/test_string_stop.java -o test_string_stop.java.out.html \ + && $(DIFF) $(srcdir)/test_string_stop.java.html test_string_stop.java.out.html + +check_stop_java: + $(JAVA2HTML) -i $(srcdir)/test_java_stop.java -o test_java_stop.java.out.html \ + && $(DIFF) $(srcdir)/test_java_stop.java.html test_java_stop.java.out.html + +check_vardecl: check_vardecl_java check_vardecl_cc + +check_vardecl_java: + $(JAVA2HTML) -i $(srcdir)/test_vardecl.java -o test_vardecl.java.out.html \ + && $(DIFF) $(srcdir)/test_vardecl.java.html test_vardecl.java.out.html + +check_vardecl_cc: + $(CPP2HTML) -i $(srcdir)/test_vardecl.cc -o test_vardecl.cc.out.html \ + && $(DIFF) $(srcdir)/test_vardecl.cc.html test_vardecl.cc.out.html check_newlines: - $(PROGEXE) --show-regex=$(srcdir)/test_newlines.lang > test_newlines.out - $(PROGEXE) --show-regex=$(srcdir)/test_nonewlines.lang > test_nonewlines.out - @echo expect no output from diff - $(DIFF) test_newlines.out test_nonewlines.out + $(PROGEXE) --show-regex=$(srcdir)/test_newlines.lang > test_newlines.out \ + && $(PROGEXE) --show-regex=$(srcdir)/test_nonewlines.lang > test_nonewlines.out \ + && $(DIFF) test_newlines.out test_nonewlines.out clean_ref: @@ -1322,7 +1212,7 @@ check-valgrind: $(VALGRINDTEST) $(CPP2HTML) --gen-references=inline --ctags-file=my_test_ref.tags --line-number test_refs_tmp.h test_refs_tmp.cpp rm -f test_refs_tmp.* -CLEANFILES = *.out.html *.out.txt *.out.tex *.err_out *.unknown_out *.out.debug *.out.texinfo *_tmp.* *.out.show myscript* myimplicitxml* myimplicitphp* *.css.java.html *.nf_css.java.html *.css_xhtml.java.html *.css_doc.java.html *.out.docbook *.out.xhtml *.out.langelems *.out.list test_newlines.out test_nonewlines.out temp.output *.out.fodt *.out.doc.fodt *.out.mediawiki *.out.groff +CLEANFILES = *.out.html *.out.txt *.out.tex *.err_out *.unknown_out *.out.debug *.out.texinfo *_tmp.* *.out.show myscript* myimplicitxml* myimplicitphp* *.css.java.html *.nf_css.java.html *.css_xhtml.java.html *.css_doc.java.html *.out.docbook *.out.xhtml *.out.langelems *.out.list test_newlines.out test_nonewlines.out temp.output.* *.out.fodt *.out.doc.fodt *.out.mediawiki *.out.groff clean_html: rm -f *.h.html *.java.html *.cc.html *.pas.html *.pl.html *.pm.html *.php3.html *.py.html *.chlog.html *.chlog_css.html *.l.html test_xhtml*.html test_notfixed.html test_css.html test_css_nodoc.html test_header.html *.rb.html *.js.html *.java.txt *.java.tex *.h.docbook *.java.texinfo *.lua.html *.ml.html *.sml.html test_*_lines.html *.log.html *.y.html *.simple.html *.ngroups.html *.tex.html *.lgt.html *.diff.html *.lang.html *.htm.html *.style.html *.cs.html *.xml.html *.sh.html *.url.html *.txt.html *.unknown.html *.tcl.html *.bib.html *.makefile.html *.css.html *.ps.html *.sl.html *.isolate.html *.backref.html *.c.html *.wdefault.html *.wodefault.html *.properties.html *.desktop.html *.lsm.html *.spec.html *.hx.html *.fortran.html *.fixed-fortran.html *.hx.html *.m4.html *.scala.html *.adb.html *.conf.html *.xorg.html diff --git a/tests/diff-for-test b/tests/diff-for-test new file mode 100755 index 0000000..e29667b --- /dev/null +++ b/tests/diff-for-test @@ -0,0 +1,15 @@ +#!/bin/sh + +# Compare two files. Exit with 0 if they are the same, otherwise show +# the diff and exit with status 1. + +f1="1ドル" +f2="2ドル" + +if cmp -s "$f1" "$f2"; then + # Yay. + exit 0 +fi + +diff "1ドル" "$f2" +exit 1 |