Cmake tests: make unreliable tests independent of inverted tests

This commit is contained in:
Kornel Benko 2016-11-30 00:53:31 +01:00
parent 3fee095a9d
commit f09cc78a9c

View File

@ -147,7 +147,7 @@ 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")
else()
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 "")
@ -169,7 +169,6 @@ macro(maketestname testname inverted listinverted listignored listunreliable lis
else()
set(${inverted} 0)
endif()
endif()
list(REMOVE_DUPLICATES sublabel)
if (NOT sublabel STREQUAL "")
join(sublabel "." tmpprefixx)
@ -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"