anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake tests: make unreliable tests independent of inverted tests

Browse Source
This commit is contained in:
Kornel Benko 2016-11-30 00:53:31 +01:00
parent 3fee095a9d
commit f09cc78a9c
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
development/autotests/ExportTests.cmake
View File

@ -147,28 +147,27 @@ macro(maketestname testname inverted listinverted listignored listunreliable lis
if (foundunreliable) if (foundunreliable)
set(sublabel "unreliable" ${sublabel} ${sublabel2}) set(sublabel "unreliable" ${sublabel} ${sublabel2})
list(REMOVE_ITEM sublabel "export" "inverted" "templates" "mathmacros" "manuals" "autotests") 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() else()
string(REGEX MATCH "(^check_load|_(systemF|texF|pdf3|pdf2|pdf|dvi|lyx[0-9][0-9]|xhtml)$)" _v ${${testname}}) set(mfound OFF)
# check if test _may_ be in listinverted endif()
set(sublabel2 "") if (mfound)
if (_v) set(sublabel3 "")
findexpr(mfound ${testname} ${listinvertedx} sublabel2) findexpr(foundsuspended ${testname} ${listsuspendedx} sublabel3)
set(${inverted} 1)
if (foundsuspended)
set(sublabel "suspended" ${sublabel} ${sublabel2} ${sublabel3})
list(REMOVE_ITEM sublabel "export" "inverted" )
else() else()
set(mfound OFF) set(sublabel "inverted" ${sublabel} ${sublabel2} ${sublabel3})
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()
else()
set(${inverted} 0)
endif() endif()
else()
set(${inverted} 0)
endif() endif()
list(REMOVE_DUPLICATES sublabel) list(REMOVE_DUPLICATES sublabel)
if (NOT sublabel STREQUAL "") if (NOT sublabel STREQUAL "")
@ -383,7 +382,9 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates autote
foreach(fonttype ${fonttypes}) foreach(fonttype ${fonttypes})
if (format MATCHES "pdf2" AND f MATCHES "latex/unicodesymbols") if (format MATCHES "pdf2" AND f MATCHES "latex/unicodesymbols")
#message(STATUS "Test ${TestName} matches Unicode encodings") #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" "cp437" "cp437de" "cp850" "cp852"
"cp855" "cp862" "cp865" "cp855" "cp862" "cp865"
"cp866" "cp1250" "cp1251" "cp1252" "cp866" "cp1250" "cp1251" "cp1252"