branch master updated: * tp/tests/run_parser_all.sh (check_strxfrm_ok): skip test if TEXINFO_XS_CONVERT is not set or 0 and XS_STRXFRM_COLLATION_LOCALE is set. Change in spacing.

[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 510f6da483 * tp/tests/run_parser_all.sh (check_strxfrm_ok): skip test 
if TEXINFO_XS_CONVERT is not set or 0 and XS_STRXFRM_COLLATION_LOCALE is set. 
Change in spacing.
510f6da483 is described below

commit 510f6da4834df8cbb4b78db274232d538aa03d32
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Feb 14 15:35:51 2024 +0100

    * tp/tests/run_parser_all.sh (check_strxfrm_ok): skip test if
    TEXINFO_XS_CONVERT is not set or 0 and XS_STRXFRM_COLLATION_LOCALE
    is set.
    Change in spacing.
---
 ChangeLog                    |  7 +++++++
 tp/tests/other/list-of-tests |  1 -
 tp/tests/run_parser_all.sh   | 28 ++++++++++++++++++++--------
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e7e5a0114..4615b83842 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-02-14  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/tests/run_parser_all.sh (check_strxfrm_ok): skip test if
+       TEXINFO_XS_CONVERT is not set or 0 and XS_STRXFRM_COLLATION_LOCALE
+       is set.
+       Change in spacing.
+
 2024-02-14  Patrice Dumas  <pertusus@free.fr>
 
        * doc/texi2any_api.texi (Conversion General Information),
diff --git a/tp/tests/other/list-of-tests b/tp/tests/other/list-of-tests
index 8a940b660e..05b0fd3e50 100644
--- a/tp/tests/other/list-of-tests
+++ b/tp/tests/other/list-of-tests
@@ -17,7 +17,6 @@ index_collation_test_collation_language 
index_collation_test.texi --plaintext -c
 
 index_collation_test_collation_locale_en index_collation_test.texi --plaintext 
-c XS_STRXFRM_COLLATION_LOCALE='en.utf-8'
 
-# does not work as expected, no specific sv collation on Debian testing
 index_collation_test_collation_locale_sv index_collation_test.texi --plaintext 
-c XS_STRXFRM_COLLATION_LOCALE='sv_SE.utf8'
 
 index_collation_test_documentlanguage_collation index_collation_test.texi 
--plaintext -c DOCUMENTLANGUAGE_COLLATION=1
diff --git a/tp/tests/run_parser_all.sh b/tp/tests/run_parser_all.sh
index 93e86a7cb8..16e8bb900a 100755
--- a/tp/tests/run_parser_all.sh
+++ b/tp/tests/run_parser_all.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Run all Texinfo tests.
-# 
+#
 # Copyright 2010-2024 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
@@ -37,13 +37,24 @@ check_need_command_line_unicode ()
 }
 
 check_unicode_collate_ok ()
-{        
+{
   if echo "$remaining" | grep 'Need collation compatibility' >/dev/null; then
     if test "z$PERL_UNICODE_COLLATE_OK" = 'zno' ; then
       echo "S: (no compatible unicode collation) $current"
      return 1
     fi
-  fi 
+  fi
+  return 0
+}
+
+check_strxfrm_ok ()
+{
+  if echo "$remaining" | grep XS_STRXFRM_COLLATION_LOCALE >/dev/null; then
+    if test "z$TEXINFO_XS_CONVERT" = "z" -o "z$TEXINFO_XS_CONVERT" = "z0" ; 
then
+      echo "S: (Need TEXINFO_XS_CONVERT set) $current"
+     return 1
+    fi
+  fi
   return 0
 }
 
@@ -142,7 +153,7 @@ post_process_output ()
     #for file in "${raw_outdir}$dir/"*.htm* "${raw_outdir}$dir/"*-l2h_cache.pm 
"${raw_outdir}$dir/"*_l2h_images.pl; do
     for file in "${raw_outdir}$dir/"*.htm* "${raw_outdir}$dir/"*-l2h_cache.pm; 
do
      if test -f "$file" ; then
-     # width and height changed because of different rounding on 
+     # width and height changed because of different rounding on
      # different computers.  Also remove version information.
       filename=`basename "$file"`
       sed -e 's/WIDTH="\([0-9]*\)\([0-9]\)"/WIDTH="100"/' \
@@ -198,7 +209,7 @@ while [ z"$1" = 'z-clean' -o z"$1" = 'z-copy'  -o z"$1" = 
'z-dir' ]; do
     shift
   fi
   if [ z"$1" = 'z-dir' ]; then
-    shift 
+    shift
     #mydir=`echo "$1" | sed 's:/*$::'`'/'
     testdir=`echo "$1" | sed 's:/*$::'`'/'
     shift
@@ -363,14 +374,14 @@ while read line; do
   #remaining=`echo $line | sed 's/[a-zA-Z0-9_./-]*  *[a-zA-Z0-9_./-]* *//'`
   remaining=`echo $line | sed 's/[a-zA-Z0-9_é./-]*  *[a-zA-Z0-9_é./-]* *//'`
   src_file="$srcdir/$testdir/$file"
-  
+
   for command_dir in $commands; do
     format_option=
     command=`echo $command_dir | cut -d':' -f1`
     dir_suffix=`echo $command_dir | cut -d':' -f2`
     format=`echo $dir_suffix |sed 's/^_//'`
     #
-    if test -z "$command"; then 
+    if test -z "$command"; then
       command=$main_command
       if test -n "$format"; then
         format_option="--$format"
@@ -392,7 +403,7 @@ while read line; do
       echo "$0: Command $command not found" >&2
       exit 1
     fi
-    
+
     outdir="$testdir/${out_dir}${dir_suffix}/"
     results_dir="$srcdir/$testdir/${res_dir}${dir_suffix}"
     one_test_done=yes
@@ -402,6 +413,7 @@ while read line; do
     check_need_command_line_unicode || skipped_test=yes
     check_latex2html_and_tex4ht || skipped_test=yes
     check_unicode_collate_ok || skipped_test=yes
+    check_strxfrm_ok || skipped_test=yes
     if [ "$skipped_test" = 'yes' ] ; then
       if test $one_test = 'yes' ; then
         return_code=77