branch master updated: * tp/t/test_utils.pl (convert_to_plaintext): If not outputting to a file, set OUTPUT_PERL_ENCODING to an empty string to disable any character encoding.

[Gavin D. Smith]

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

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 83d713ef92 * tp/t/test_utils.pl (convert_to_plaintext): If not 
outputting to a file, set OUTPUT_PERL_ENCODING to an empty string to disable 
any character encoding.
83d713ef92 is described below

commit 83d713ef923957636aa3aee093d5d17e6cdfca9f
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Dec 21 19:08:32 2023 +0000

    * tp/t/test_utils.pl (convert_to_plaintext): If not outputting to
    a file, set OUTPUT_PERL_ENCODING to an empty string to disable
    any character encoding.
    
    This currently has no effect on the test suite results, but
    is needed for when Texinfo::Convert::Plaintext::convert starts
    returning an encoded string in the future.
---
 ChangeLog          | 10 ++++++++++
 tp/t/test_utils.pl |  8 ++++++++
 2 files changed, 18 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 17d226b4cc..bed81dda0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-12-21  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * tp/t/test_utils.pl (convert_to_plaintext): If not outputting to
+       a file, set OUTPUT_PERL_ENCODING to an empty string to disable
+       any character encoding.
+
+       This currently has no effect on the test suite results, but
+       is needed for when Texinfo::Convert::Plaintext::convert starts
+       returning an encoded string in the future.
+
 2023-12-20  Gavin Smith <gavinsmith0123@gmail.com>
 
        Paragraph formatter for @listoffloats output
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index 16da3da835..3a6cb1ac20 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -518,6 +518,14 @@ sub convert_to_plaintext($$$$$$;$)
     }
   }
 
+  # If not outputing to a file, do not do any encoding.  Return value from
+  # 'output' is an unencoded character string.  This will be encoded to
+  # UTF-8 in the results file.
+  if (defined($converter_options->{'OUTFILE'})
+      and $converter_options->{'OUTFILE'} eq '') {
+    $converter_options->{'OUTPUT_PERL_ENCODING'} = '';
+  }
+
   my $converter =
      Texinfo::Convert::Plaintext->converter({'DEBUG' => $self->{'DEBUG'},
                                              'document' => $document,