commit 5435b900e4fef4a6d84acbcd5fb7773a16ffb98b
Author: Kornel Benko <[email protected]>
Date: Thu Jan 17 12:27:12 2019 +0100
Cmake build: Add format V2.0 to export tests
---
development/autotests/ExportTests.cmake | 2 +-
development/autotests/export.cmake | 6 +++---
development/autotests/ignoredTests | 8 ++++----
development/autotests/invertedTests | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/development/autotests/ExportTests.cmake
b/development/autotests/ExportTests.cmake
index e2172a1..694ec81 100644
--- a/development/autotests/ExportTests.cmake
+++ b/development/autotests/ExportTests.cmake
@@ -332,7 +332,7 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples
lib/templates autote
foreach(f ${nolang_lyx_files} ${lang_lyx_files})
# Strip extension
string(REGEX REPLACE "\\.lyx$" "" f ${f})
- foreach(_lyx_format_num 16 21 22 23)
+ foreach(_lyx_format_num 16 20 21 22 23)
set(TestName "export/${libsubfolder}/${f}_lyx${_lyx_format_num}")
set(mytestlabel ${testlabel} "lyx2lyx" "load")
maketestname(TestName inverted invertedTests ignoredTests
unreliableTests mytestlabel)
diff --git a/development/autotests/export.cmake
b/development/autotests/export.cmake
index 833231b..5b193df 100755
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -7,8 +7,8 @@
# LYX_ROOT = ${TOP_SRC_DIR}/lib/{doc,examples,templates}
# LYX_USERDIR_VER = Name of environment variable for the user directory
# lyx =
-# format = lyx16x|lyx21x|lyx22x|xhtml
-# extension = 16.lyx|21.lyx|22.lyx|xhtml
+# format = lyx16x|lyx20x|lyx21x|lyx22x|xhtml
+# extension = 16.lyx|20.lyx|21.lyx|22.lyx|xhtml
# file = xxx
#
# Script should be called like:
@@ -76,7 +76,7 @@ else()
message(FATAL_ERROR "Export failed while converting")
endif()
if(extension MATCHES "\\.lyx$")
- # Font-type not relevant for lyx16/lyx21 exports
+ # Font-type not relevant for lyx16/lyx2[0123] exports
set(result_file_base "${TempDir}/${file}")
else()
set(result_file_name ${file}.${extension})
diff --git a/development/autotests/ignoredTests
b/development/autotests/ignoredTests
index a2a96c5..6995695 100644
--- a/development/autotests/ignoredTests
+++ b/development/autotests/ignoredTests
@@ -45,7 +45,7 @@ export/templates/copernicus_(dvi3|pdf4|pdf5)_(texF|systemF)
export/examples/instant_preview_(dvi3|pdf4)_systemF
export/examples/instant_preview_pdf[25].*
export/examples/(chessgame|chess-article|powerdot)_pdf[25].*
-export/examples/chessboard-article_(lyx(16|21|22|23)|(pdf3|pdf5|dvi3)_texF)
+export/examples/chessboard-article_(lyx(16|20|21|22|23)|(pdf3|pdf5|dvi3)_texF)
export/examples/fr/powerdot_pdf[25].*
# requires jss.cls (not on CTAN)
@@ -97,8 +97,8 @@ export/examples/docbook_article_(dvi3|pdf[245]).*
export/templates/DocBook_article_(dvi3|pdf[245]).*
# `acmart` and `copernicus` are not supported by LyX < 2.3
-export/templates/acmart_lyx(16|21|22)
-export/templates/copernicus_lyx(16|21|22)
+export/templates/acmart_lyx(16|20|21|22)
+export/templates/copernicus_lyx(16|20|21|22)
# ============================================================
@@ -113,7 +113,7 @@ export/templates/attic/latex8_(dvi|dvi3_.*|lyx(22|23))
# aastex.cls is obsolete and replaced by aastex6.cls
# aastex6.cls is obsolete and replaced by aastex62.cls
-export/doc/attic/aastex6_sample_(dvi|pdf|lyx(16|21|22|23)).*
+export/doc/attic/aastex6_sample_(dvi|pdf|lyx(16|20|21|22|23)).*
export/templates/aastex6_.*
export/templates/aastex62_lyx16
export/examples/aas_sample_.*
diff --git a/development/autotests/invertedTests
b/development/autotests/invertedTests
index 4c5b599..e4b79fb 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -127,7 +127,7 @@ export/templates/kluwer_.*_systemF
# lyx2lyx tests:
# back-conversion fails for rotated float inset in a list
-export/export/lyx2lyx/lyx_2_3_test_lyx(16|21|22)
+export/export/lyx2lyx/lyx_2_3_test_lyx(16|20|21|22)
# ================================================
Sublabel: lyxbugs
