branch master updated: tests: add tests scripts by category/type. Only do other with other-checks.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 4348d1e40c tests: add tests scripts by category/type. Only do other 
with other-checks.
4348d1e40c is described below

commit 4348d1e40c1da66eda95608f31bdfca2b5eb6992
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Jan 21 17:37:41 2022 +0100

    tests: add tests scripts by category/type. Only do other with other-checks.
---
 ChangeLog                           |  4 ++++
 tp/maintain/regenerate_cmd_tests.sh | 21 ++++++++++++++++-----
 tp/tests/Makefile.am                |  6 ++++--
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53ea3899cc..ac80ccaf70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2022-01-21  Patrice Dumas  <pertusus@free.fr>
+
+       tests: add tests scripts by category/type. Only do other with 
other-checks.
+
 2022-01-21  Patrice Dumas  <pertusus@free.fr>
 
        * tp/init/highlight_syntax.pm (highlight_open_inline_container_type)
diff --git a/tp/maintain/regenerate_cmd_tests.sh 
b/tp/maintain/regenerate_cmd_tests.sh
index 83aa0df717..4e6f9fb558 100755
--- a/tp/maintain/regenerate_cmd_tests.sh
+++ b/tp/maintain/regenerate_cmd_tests.sh
@@ -55,9 +55,17 @@ test_driving_files_generated_list ='
 one_test_files='# List of test scripts that only run one test
 one_test_files_generated_list = '
 
+type_test_files='# Lists of test scripts by test type'
+
 gather_tests() {
-type=$1
+test_type=$1
 shift
+type_test_list_variable_name="type_${test_type}_one_test_files_generated_list"
+type_test_files="$type_test_files
+
+# list of type $test_type test files
+$type_test_list_variable_name = "
+one_test_files="$one_test_files \$($type_test_list_variable_name)"
 test_dirs=$1
 for test_dir in $test_dirs; do
   driving_file=$test_dir/list-of-tests
@@ -80,8 +88,8 @@ for test_dir in $test_dirs; do
       relative_command_dir=
     fi
     one_test_file="$test_scripts_dir/${name_prepended}$name.sh"
-    one_test_files="$one_test_files \\
-     $one_test_file"
+    type_test_files="$type_test_files \\
+    $one_test_file"
     echo '#! /bin/sh
 # This file generated by maintain/regenerate_cmd_tests.sh
 
@@ -93,14 +101,14 @@ one_test_logs_dir=test_log
 
 ' > $one_test_file
 
-    if test $type = 'tex_html'; then
+    if test $test_type = 'tex_html'; then
       echo '
 if test "z$TEX_HTML_TESTS" != z"yes"; then
   echo "Skipping HTML TeX tests that are not easily reproducible"
   exit 77
 fi
 ' >> $one_test_file
-    elif test $type = 'other'; then
+    elif test $test_type = 'other'; then
       echo '
 if test "z$OTHER_TESTS" != z"yes"; then
   echo "Skipping other tests that are not easily reproducible"
@@ -153,4 +161,7 @@ echo "$test_driving_files
 echo "$one_test_files
 " >>$outfile
 
+echo "$type_test_files
+" >>$outfile
+
 )
diff --git a/tp/tests/Makefile.am b/tp/tests/Makefile.am
index 1e88614d50..d14079b3aa 100644
--- a/tp/tests/Makefile.am
+++ b/tp/tests/Makefile.am
@@ -10,7 +10,7 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # autogenerated list of scripts that only run one test, and lists of 
-# list-of-tests files specifying the tests to run.
+# list-of-tests files specifying the tests to run, by category of test.
 include $(srcdir)/Makefile.onetst
 
 $(srcdir)/Makefile.onetst: \
@@ -52,8 +52,10 @@ all-checks all-check: all
 tex-html-checks tex-html-check: all
        $(MAKE) $(AM_MAKEFLAGS) check TEX_HTML_TESTS=yes
 
+# type_other_one_test_files_generated_list is automatically defined in
+#aMakefile.onetst
 other-checks: all
-       $(MAKE) $(AM_MAKEFLAGS) check OTHER_TESTS=yes
+       $(MAKE) $(AM_MAKEFLAGS) check OTHER_TESTS=yes 
TESTS='$(type_other_one_test_files_generated_list)' SUBDIRS=
 
 EXTRA_DIST = run_parser_all.sh parser_tests.sh \
  $(one_test_files_generated_list) coverage_macro.texi