texinfo/tp/tests Makefile.am long_tests.sh pars...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/01/29 12:39:34

Modified files:
        tp/tests       : Makefile.am long_tests.sh parser_base_tests 
        tp/tests/many_input_files: Makefile.am indices.sh tex_l2h.sh 
                                   tex_t4ht.sh 
Removed files:
        tp/tests/many_input_files: long_tests.sh 

Log message:
        Use environment variables to select tests to run.  Suggestion from
        Stefano Lattarini.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/Makefile.am?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/long_tests.sh?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/parser_base_tests?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/Makefile.am?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/indices.sh?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.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/tex_t4ht.sh?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/many_input_files/long_tests.sh?cvsroot=texinfo&r1=1.1&r2=0

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Makefile.am 27 Jan 2012 23:38:05 -0000      1.2
+++ Makefile.am 29 Jan 2012 12:39:14 -0000      1.3
@@ -24,13 +24,13 @@
 clean-tests:
        $(srcdir)/parser_tests.sh -clean $(base_tests) $(long_tests)
 
-TESTS = parser_base_tests
-long_TESTS = long_tests.sh
+TESTS = parser_base_tests long_tests.sh
 
 long-check: all
-       $(MAKE) $(AM_MAKEFLAGS) TESTS='$(long_TESTS)' check
+       $(MAKE) $(AM_MAKEFLAGS) check LONG_TESTS=yes
 
-all-checks: check long-check
+all-checks: all
+       $(MAKE) $(AM_MAKEFLAGS) check ALL_TESTS=yes
 
 # this is in order to have the files in .texinfo in the build dir
 all-local:

Index: long_tests.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/long_tests.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- long_tests.sh       14 Jan 2012 18:57:29 -0000      1.1
+++ long_tests.sh       29 Jan 2012 12:39:15 -0000      1.2
@@ -9,5 +9,10 @@
   srcdir=.
 fi
 
+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"
+  exit 77
+fi
+
 "$srcdir"/parser_tests.sh "$@" \
  sectioning coverage indices nested_formats contents layout

Index: parser_base_tests
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/parser_base_tests,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- parser_base_tests   27 Jan 2012 23:38:05 -0000      1.2
+++ parser_base_tests   29 Jan 2012 12:39:17 -0000      1.3
@@ -9,6 +9,11 @@
   srcdir=.
 fi
 
+if test "z$LONG_TESTS" = z'yes'; then
+  echo "Skipping short tests because we are only doing long tests"
+  exit 77
+fi
+
 "$srcdir"/parser_tests.sh "$@" \
  formatting \
  htmlxref htmlxref-only_mono htmlxref-only_split

Index: many_input_files/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- many_input_files/Makefile.am        14 Jan 2012 19:04:26 -0000      1.1
+++ many_input_files/Makefile.am        29 Jan 2012 12:39:18 -0000      1.2
@@ -1,13 +1,15 @@
 EXTRA_DIST = $(TESTS) $(long_TESTS) \
   indices_res index_split_res tex_l2h_res tex_t4ht_res
 
-TESTS = indices.sh
-long_TESTS = tex_l2h.sh tex_t4ht.sh
+TESTS = indices.sh tex_l2h.sh tex_t4ht.sh
 
 test_dirs = indices index_split tex_l2h tex_t4ht
 
 long-check: all
-       $(MAKE) $(AM_MAKEFLAGS) TESTS='$(long_TESTS)' check
+       $(MAKE) $(AM_MAKEFLAGS) check LONG_TESTS=yes
+
+all-checks: all
+       $(MAKE) $(AM_MAKEFLAGS) check ALL_TESTS=yes
 
 copy-tests:
        for dir in $(test_dirs); do \

Index: many_input_files/indices.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/indices.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- many_input_files/indices.sh 24 Jan 2012 23:59:38 -0000      1.2
+++ many_input_files/indices.sh 29 Jan 2012 12:39:31 -0000      1.3
@@ -1,5 +1,10 @@
 #! /bin/sh
 
+if test "z$LONG_TESTS" = z'yes'; then
+  echo "Skipping short tests because we are only doing long tests"
+  exit 77
+fi
+
 basename=indices
 diffs_dir=diffs
 logfile=$basename.log

Index: many_input_files/tex_l2h.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/tex_l2h.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- many_input_files/tex_l2h.sh 24 Jan 2012 23:59:38 -0000      1.2
+++ many_input_files/tex_l2h.sh 29 Jan 2012 12:39:33 -0000      1.3
@@ -1,5 +1,10 @@
 #! /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"
+  exit 77
+fi
+
 basename=tex_l2h
 diffs_dir=diffs
 logfile=$basename.log

Index: many_input_files/tex_t4ht.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/many_input_files/tex_t4ht.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- many_input_files/tex_t4ht.sh        24 Jan 2012 23:59:38 -0000      1.2
+++ many_input_files/tex_t4ht.sh        29 Jan 2012 12:39:34 -0000      1.3
@@ -1,5 +1,10 @@
 #! /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"
+  exit 77
+fi
+
 basename=tex_t4ht
 diffs_dir=diffs
 logfile=$basename.log

Index: many_input_files/long_tests.sh
===================================================================
RCS file: many_input_files/long_tests.sh
diff -N many_input_files/long_tests.sh
--- many_input_files/long_tests.sh      14 Jan 2012 19:04:26 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-#! /bin/sh
-# this wrapper is needed because, when doing long-check in the parent directory
-# TESTS is set to that file name
-
-make long-check