Am Montag, 28. November 2016 um 23:07:49, schrieb Guenter Milde <mi...@users.sf.net> > On 2016-11-28, Kornel Benko wrote: > > Am Montag, 28. November 2016 um 10:14:18, schrieb Scott Kostyshak > > <skost...@lyx.org> > >> On Mon, Nov 28, 2016 at 10:24:43AM +0100, Kornel Benko wrote: > > > > Let us wait for Günter, he may have some ideas ... > > Just my old suggestion: make unreliable independent of inversion state and > inverted/suspended tag. > > Günter
What about the attached? Scott could you try?
Kornel
signature.asc
Description: This is a digitally signed message part.
diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake
index 2e80d36..7184994 100644
--- a/development/autotests/ExportTests.cmake
+++ b/development/autotests/ExportTests.cmake
@@ -147,28 +147,27 @@ macro(maketestname testname inverted listinverted listignored listunreliable lis
if (foundunreliable)
set(sublabel "unreliable" ${sublabel} ${sublabel2})
list(REMOVE_ITEM sublabel "export" "inverted" "templates" "mathmacros" "manuals" "autotests")
+ endif()
+ string(REGEX MATCH "(^check_load|_(systemF|texF|pdf3|pdf2|pdf|dvi|lyx[0-9][0-9]|xhtml)$)" _v ${${testname}})
+ # check if test _may_ be in listinverted
+ set(sublabel2 "")
+ if (_v)
+ findexpr(mfound ${testname} ${listinvertedx} sublabel2)
else()
- string(REGEX MATCH "(^check_load|_(systemF|texF|pdf3|pdf2|pdf|dvi|lyx[0-9][0-9]|xhtml)$)" _v ${${testname}})
- # check if test _may_ be in listinverted
- set(sublabel2 "")
- if (_v)
- findexpr(mfound ${testname} ${listinvertedx} sublabel2)
- else()
- set(mfound OFF)
- endif()
- if (mfound)
- set(sublabel3 "")
- findexpr(foundsuspended ${testname} ${listsuspendedx} sublabel3)
- set(${inverted} 1)
- if (foundsuspended)
- set(sublabel "suspended" ${sublabel} ${sublabel2} ${sublabel3})
- list(REMOVE_ITEM sublabel "export" "inverted" )
- else()
- set(sublabel "inverted" ${sublabel} ${sublabel2} ${sublabel3})
- endif()
+ set(mfound OFF)
+ endif()
+ if (mfound)
+ set(sublabel3 "")
+ findexpr(foundsuspended ${testname} ${listsuspendedx} sublabel3)
+ set(${inverted} 1)
+ if (foundsuspended)
+ set(sublabel "suspended" ${sublabel} ${sublabel2} ${sublabel3})
+ list(REMOVE_ITEM sublabel "export" "inverted" )
else()
- set(${inverted} 0)
+ set(sublabel "inverted" ${sublabel} ${sublabel2} ${sublabel3})
endif()
+ else()
+ set(${inverted} 0)
endif()
list(REMOVE_DUPLICATES sublabel)
if (NOT sublabel STREQUAL "")
@@ -383,7 +382,9 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote
foreach(fonttype ${fonttypes})
if (format MATCHES "pdf2" AND f MATCHES "latex/unicodesymbols")
#message(STATUS "Test ${TestName} matches Unicode encodings")
- set(test_encodings "default" "ascii" "utf8x" "armscii8" "applemac"
+ # test_encodings does not include "default", since it should be covered
+ # by one of the supplied encodings
+ set(test_encodings "ascii" "utf8x" "armscii8" "applemac"
"cp437" "cp437de" "cp850" "cp852"
"cp855" "cp862" "cp865"
"cp866" "cp1250" "cp1251" "cp1252"
