branch master updated: * tp/Texinfo/Convert/HTML.pm (output): create empty js files for tests.

[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 f14cf9c4fb * tp/Texinfo/Convert/HTML.pm (output): create empty js 
files for tests.
f14cf9c4fb is described below

commit f14cf9c4fb6663bcde315c75d6a7ba48e1a874b7
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Nov 20 21:49:51 2022 +0100

    * tp/Texinfo/Convert/HTML.pm (output): create empty js files for
    tests.
---
 ChangeLog                                          |  5 +++
 tp/Texinfo/Convert/HTML.pm                         | 47 +++++++++++++++-------
 .../formatting_epub_package/EPUB/formatting.opf    |  3 ++
 .../formatting_epub_package/EPUB/js/info.css       |  0
 .../formatting_epub_package/EPUB/js/info.js        |  0
 .../formatting_epub_package/EPUB/js/modernizr.js   |  0
 .../EPUB/xhtml/js_licenses.xhtml                   | 17 ++++++++
 7 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5057369f34..13da456f9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-11-20  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (output): create empty js files for
+       tests.
+
 2022-11-20  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * tp/tests/layout/list-of-tests (formatting_epub_nodes):
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index e998767a3d..04e3e36471 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -10849,22 +10849,39 @@ sub output($$)
           mkdir $jsdir;
         }
       }
-      # Copy JS files.  Do not copy them for tests to keep results stable.
-      if (-d $jsdir and !$self->get_conf('TEST')) {
-        my $jssrcdir;
-        if (!$Texinfo::ModulePath::texinfo_uninstalled) {
-          $jssrcdir = File::Spec->catdir(
-            $Texinfo::ModulePath::pkgdatadir, 'js');
-        } else {
-          $jssrcdir = File::Spec->catdir(
-            $Texinfo::ModulePath::top_srcdir, 'js');
-        }
-        for my $f ('info.js', 'modernizr.js', 'info.css') {
-          my $from = File::Spec->catfile($jssrcdir, $f);
+      # Copy JS files.
+      if (-d $jsdir) {
+        if (!$self->get_conf('TEST')) {
+          my $jssrcdir;
+          if (!$Texinfo::ModulePath::texinfo_uninstalled) {
+            $jssrcdir = File::Spec->catdir(
+              $Texinfo::ModulePath::pkgdatadir, 'js');
+          } else {
+            $jssrcdir = File::Spec->catdir(
+              $Texinfo::ModulePath::top_srcdir, 'js');
+          }
+          for my $f ('info.js', 'modernizr.js', 'info.css') {
+            my $from = File::Spec->catfile($jssrcdir, $f);
 
-          if (!copy($from, $jsdir)) {
-            $self->document_error($self,
-              sprintf(__("error on copying %s into %s"), $from, $jsdir));
+            if (!copy($from, $jsdir)) {
+              $self->document_error($self,
+                sprintf(__("error on copying %s into %s"), $from, $jsdir));
+            }
+          }
+        } else {
+        # create empty files for tests to keep results stable.
+          for my $f ('info.js', 'modernizr.js', 'info.css') {
+            my $filename = File::Spec->catfile($jsdir, $f);
+            if (!open (FH, '>', $filename)) {
+              $self->document_error($self,
+                sprintf(__("error on creating empty %s: %s"),
+                        $filename, $!));
+            }
+            if (!close(FH)) {
+              $self->document_error($self,
+                sprintf(__("error on closing empty %s: %s"),
+                        $filename, $!));
+            }
           }
         }
       }
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf
index 64a97cfd1e..075d3baed5 100644
--- 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf
@@ -58,6 +58,9 @@
       <item id="image38" media-type="image/png" href="images/7-f--ile.png"/>
       <item id="image39" media-type="e--xt/image" 
href="images/8-f--ile.e--xt"/>
       <item id="image40" media-type="image/png" href="images/9-f--ile.png"/>
+      <item id="infojs1" media-type="text/css" href="js/info.css"/>
+      <item id="infojs2" media-type="text/javascript" href="js/info.js"/>
+      <item id="infojs3" media-type="text/javascript" href="js/modernizr.js"/>
    </manifest>
    <spine>
       <itemref idref="unit1"/>
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.css
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.js
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/modernizr.js
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/modernizr.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git 
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/js_licenses.xhtml
 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/js_licenses.xhtml
new file mode 100644
index 0000000000..d20d8280a9
--- /dev/null
+++ 
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/js_licenses.xhtml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml";><head><title>jslicense 
labels</title></head>
+<body>
+<table id="jslicense-labels1">
+<tr>
+<td><a href="js/info.js">js/info.js</a></td>
+<td><a href="http://www.gnu.org/licenses/gpl-3.0.html";>GNU General Public 
License 3.0 or later</a></td>
+<td><a href="js/info.js">js/info.js</a></td>
+</tr>
+<tr>
+<td><a href="js/modernizr.js">js/modernizr.js</a></td>
+<td><a href="http://www.jclark.com/xml/copying.txt";>Expat</a></td>
+<td><a href="js/modernizr.js">js/modernizr.js</a></td>
+</tr>
+</table>
+</body></html>