Revert "Revert "Cmake export tests: Add epub-format to be tested""

Rather than revert the added epub tests, it makes more sense to
ignore them. That way it is easier to flip the switch to enable
them.

Thanks to Kornel.

This reverts commit 894977b62e66e9993694b8469e40716876ec1c46.

diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake
index 18b98fd6c57a6eefbccc7f7e8df0b15a78e7ee40..60d813b48d7db39d6e2cdf7a8b68316d81c00dfd 100644 (file)
--- a/development/autotests/ExportTests.cmake
+++ b/development/autotests/ExportTests.cmake
@@ -59,24 +59,26 @@ macro(getoutputformats filepath varname format_set)
   file(STRINGS "${filepath}" lines)
   # What should we test, if default_output_format is not defined?
   # For now we test everything ...
-  set(out_formats "xhtml" "docbook5" ${DVI_FORMATS} ${PDF_FORMATS})
+  set(out_formats "xhtml" "docbook5" "epub" ${DVI_FORMATS} ${PDF_FORMATS})
   foreach(_l IN LISTS lines)
     if(_l MATCHES "^\\\\default_output_format +\([^ ]+\)")
       set(_format ${CMAKE_MATCH_1})
       if(_format STREQUAL "default")
-        set(out_formats "xhtml" "docbook5" ${DVI_FORMATS} ${PDF_FORMATS})
+        set(out_formats "xhtml" "docbook5" "epub" ${DVI_FORMATS} ${PDF_FORMATS})
       else()
         set(${format_set} ${_format})
         if(_format STREQUAL "pdf2" AND "${filepath}" MATCHES "/doc/")
-          set(out_formats "xhtml" "docbook5" ${DVI_FORMATS} ${PDF_FORMATS})
+          set(out_formats "xhtml" "docbook5" "epub" ${DVI_FORMATS} ${PDF_FORMATS})
         elseif(_format MATCHES "pdf$")
-          set(out_formats "xhtml" "docbook5" ${PDF_FORMATS})
+          set(out_formats "xhtml" "docbook5" "epub" ${PDF_FORMATS})
         elseif(_format MATCHES "dvi$")
-          set(out_formats "xhtml" "docbook5" ${DVI_FORMATS})
+          set(out_formats "xhtml" "docbook5" "epub" ${DVI_FORMATS})
         elseif(_format MATCHES "docbook5")
           set(out_formats "docbook5")
         elseif(_format MATCHES "xhtml")
           set(out_formats "xhtml")
+        elseif(_format MATCHES "epub")
+          set(out_formats "epub")
         else()
           # Respect all other output formats
           # like "eps3"

diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake
index 4337ea6b9593275dd4cd488d510e9e4564893106..43d6df8166b4eabfd644a3b4e68d86299e50b187 100755 (executable)
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -7,8 +7,8 @@
 # LYX_ROOT  = ${TOP_SRC_DIR}/lib/{doc,examples,templates,tabletemplates}
 # LYX_USERDIR_VER = Name of environment variable for the user directory
 # lyx       =
-# format    = lyx16x|lyx20x|lyx21x|lyx22x|xhtml|docbook5
-# extension = 16.lyx|20.lyx|21.lyx|22.lyx|xhtml|xml
+# format    = lyx16x|lyx20x|lyx21x|lyx22x|xhtml|docbook5|epub
+# extension = 16.lyx|20.lyx|21.lyx|22.lyx|xhtml|xml|epub
 # file      = xxx
 #
 # Script should be called like:

diff --git a/development/autotests/useSystemFonts.pl b/development/autotests/useSystemFonts.pl
index c3e6a802748bff29b569fe994dd2218282a435b4..1265d2003a7f0e8f4f4e9256b456d9c8359e1934 100644 (file)
--- a/development/autotests/useSystemFonts.pl
+++ b/development/autotests/useSystemFonts.pl
@@ -203,7 +203,7 @@ sub interpretedCopy($$$$)
            my $ext = $isrel[1];
            if ($rStatus->{"filetype"} eq "prefix_only") {
              $f = getNewNameOf("$sourcedir/$f", $rFiles);
-             if ($format eq "docbook5") {
+             if ($format =~ /^(docbook5|epub)$/) {
                $rF->[1] = join(',', @{$filelist});
                $l =  join('', @$rF);
              }