texinfo/tp/tests Makefile.am README long_tests....

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/05/26 10:45:04

Modified files:
        tp/tests       : Makefile.am README long_tests.sh 
        tp/tests/many_input_files: Makefile.am tex_l2h.sh tex_t4ht.sh 
Added files:
        tp/tests       : tex_html_tests.sh 

Log message:
        Improve tex html tests by adding targets/script and separating in 
        many_input_files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/Makefile.am?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/README?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/long_tests.sh?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/tex_html_tests.sh?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/Makefile.am?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/tex_l2h.sh?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/tex_t4ht.sh?cvsroot=texinfo&r1=1.4&r2=1.5

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Makefile.am 14 May 2012 23:56:12 -0000      1.7
+++ Makefile.am 26 May 2012 10:45:03 -0000      1.8
@@ -2,10 +2,10 @@
  formatting htmlxref htmlxref-only_mono htmlxref-only_split
 long_tests = \
  sectioning coverage indices nested_formats contents layout
-tex_tests = \
+tex_html_tests = \
  tex_html
 
-DIST_SUBDIRS = many_input_files $(base_tests) $(long_tests) $(tex_tests)
+DIST_SUBDIRS = many_input_files $(base_tests) $(long_tests) $(tex_html_tests)
 SUBDIRS = . many_input_files
 
 copy-tests: copy-base copy-long
@@ -17,20 +17,24 @@
 copy-long:
        $(srcdir)/parser_tests.sh -copy $(long_tests)
 
-copy-tex:
-       $(srcdir)/parser_tests.sh -copy $(tex_tests)
+copy-tex-html:
+       $(srcdir)/parser_tests.sh -copy $(tex_html_tests)
+       cd many_input_files && $(MAKE) copy-tex-html
 
 clean-tests:
-       $(srcdir)/parser_tests.sh -clean $(base_tests) $(long_tests) 
$(tex_tests)
+       $(srcdir)/parser_tests.sh -clean $(base_tests) $(long_tests) 
$(tex_html_tests)
 
-TESTS = parser_base_tests long_tests.sh
+TESTS = parser_base_tests long_tests.sh tex_html_tests.sh
 
-long-check: all
+long-checks: all
        $(MAKE) $(AM_MAKEFLAGS) check LONG_TESTS=yes
 
 all-checks: all
        $(MAKE) $(AM_MAKEFLAGS) check ALL_TESTS=yes
 
+tex-html-checks: all
+       $(MAKE) $(AM_MAKEFLAGS) check TEX_HTML_TESTS=yes LONG_TESTS=yes
+
 # this is in order to have the htmlxref.cnf files in the build dir.
 # This is done in this directory to be sure that the files are there
 # when check is done in this directory.
@@ -58,4 +62,4 @@
        ${INSTALL_DATA} $< $@
 
 EXTRA_DIST = run_parser_all.sh parser_tests.sh \
- $(TESTS) $(long_TESTS) coverage_macro.texi
+ $(TESTS) coverage_macro.texi

Index: README
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- README      18 May 2012 17:44:48 -0000      1.3
+++ README      26 May 2012 10:45:03 -0000      1.4
@@ -1,4 +1,4 @@
-$Id: README,v 1.3 2012/05/18 17:44:48 pertusus Exp $
+$Id: README,v 1.4 2012/05/26 10:45:03 pertusus Exp $
 texinfo/tp/tests/README
 
   Copyright (C) 2010, 2012 Free Software Foundation, Inc.
@@ -22,7 +22,7 @@
 =====================
 This testsuite can be run 
 
-* using the makefile rules: check for the base tests, long-check for 
+* using the makefile rules: check for the base tests, long-checks for 
   the long tests, or all-checks for both.
 
 * using ./parser_tests.sh with the list of directories in argument one 
@@ -72,9 +72,8 @@
 some test results involving latex2HTML or tex4ht depend on the setup and 
 version of these tools.
 
-To run the tex4ht and latex2HTML related tests, cd to tex_html, like
-$ cd tex_html
-$ ../run_parser_all.sh
+These tests may be run by
+  make tex-html-checks
 
 For the tests that use latex2html, to avoid the test failing if there is 
 a dot in the cwd, mktemp is used to create a temporary directory, hopefully

Index: long_tests.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/long_tests.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- long_tests.sh       14 May 2012 23:56:12 -0000      1.4
+++ long_tests.sh       26 May 2012 10:45:03 -0000      1.5
@@ -14,5 +14,10 @@
   exit 77
 fi
 
+if test "z$TEX_HTML_TESTS" = z'yes'; then
+  echo "Skipping long tests, only doing HTML TeX tests"
+  exit 77
+fi
+
 "$srcdir"/parser_tests.sh "$@" \
  sectioning coverage indices nested_formats contents layout

Index: many_input_files/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- many_input_files/Makefile.am        29 Jan 2012 12:39:18 -0000      1.2
+++ many_input_files/Makefile.am        26 May 2012 10:45:03 -0000      1.3
@@ -1,15 +1,16 @@
-EXTRA_DIST = $(TESTS) $(long_TESTS) \
+EXTRA_DIST = $(TESTS) \
   indices_res index_split_res tex_l2h_res tex_t4ht_res
 
 TESTS = indices.sh tex_l2h.sh tex_t4ht.sh
 
-test_dirs = indices index_split tex_l2h tex_t4ht
+test_dirs = indices index_split
+tex_html_dirs = tex_l2h tex_t4ht
 
-long-check: all
+long-checks: all
        $(MAKE) $(AM_MAKEFLAGS) check LONG_TESTS=yes
 
-all-checks: all
-       $(MAKE) $(AM_MAKEFLAGS) check ALL_TESTS=yes
+tex-html-checks: all
+       $(MAKE) $(AM_MAKEFLAGS) check LONG_TESTS=yes TEX_HTML_TESTS=yes
 
 copy-tests:
        for dir in $(test_dirs); do \
@@ -26,12 +27,27 @@
                fi; \
        done
 
+copy-tex-html:
+       for dir in $(tex_html_dirs); do \
+               if [ -d "$$dir" ]; then \
+                       if [ -d "$${dir}_res" ]; then \
+                               rm -f "$${dir}_res/"*.* ;\
+                       else \
+                               mkdir "$${dir}_res/" ; \
+                       fi ;\
+                       cp -p "$$dir/"*.* "$${dir}_res/"; \
+                       rm -f "$${dir}_res/"*.png "$${dir}_res/"*_l2h.css; \
+               else \
+                       echo "No dir $$dir/"; \
+               fi; \
+       done
+
 DISTCLEANFILES = *.log *.out
 
 distclean-local:
-       rm -rf diffs $(test_dirs)
+       rm -rf diffs $(test_dirs) $(tex_html_dirs)
 
 dist-hook:
-       for dir in $(test_dirs); do \
+       for dir in $(test_dirs) $(tex_html_dirs); do \
                rm -rf `find "$(distdir)/$${dir}_res" -name CVS` ;\
        done

Index: many_input_files/tex_l2h.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/tex_l2h.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- many_input_files/tex_l2h.sh 26 May 2012 09:43:34 -0000      1.4
+++ many_input_files/tex_l2h.sh 26 May 2012 10:45:04 -0000      1.5
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-if test "z$LONG_TESTS" != z'yes' -a "z$ALL_TESTS" != z'yes'; then
-  echo "Skipping long tests that take a lot of time to run"
+if test "z$TEX_HTML_TESTS" != z'yes'; then
+  echo "Skipping HTML TeX tests that are not easily reproducible"
   exit 77
 fi
 

Index: many_input_files/tex_t4ht.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- many_input_files/tex_t4ht.sh        26 May 2012 09:43:34 -0000      1.4
+++ many_input_files/tex_t4ht.sh        26 May 2012 10:45:04 -0000      1.5
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-if test "z$LONG_TESTS" != z'yes' -a "z$ALL_TESTS" != z'yes'; then
-  echo "Skipping long tests that take a lot of time to run"
+if test "z$TEX_HTML_TESTS" != z'yes'; then
+  echo "Skipping HTML TeX tests that are not easily reproducible"
   exit 77
 fi
 

Index: tex_html_tests.sh
===================================================================
RCS file: tex_html_tests.sh
diff -N tex_html_tests.sh
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tex_html_tests.sh   26 May 2012 10:45:03 -0000      1.1
@@ -0,0 +1,18 @@
+#! /bin/sh
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+
+if [ z"$srcdir" = 'z' ]; then
+  srcdir=.
+fi
+
+if test "z$TEX_HTML_TESTS" != z'yes'; then
+  echo "Skipping HTML TeX tests that are not easily reproducible"
+  exit 77
+fi
+
+"$srcdir"/parser_tests.sh "$@" \
+ tex_html