anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 16:31:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake export tests: Ignore spaces after expressions in .*Tests files

Browse Source
This commit is contained in:
Kornel Benko 2015-11-28 19:08:19 +01:00
parent ad0643f4b5
commit a07f9b7119
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
development/autotests/ExportTests.cmake
View File

@ -114,10 +114,10 @@ macro(maketestname testname reverted listsuspicious listignored listunreliable l
set(listignoredx ${listignored}) set(listignoredx ${listignored})
set(listunreliablex ${listunreliable}) set(listunreliablex ${listunreliable})
endif() endif()
set(sublabel "")
findexpr(mfound ${testname} ${listignoredx} sublabel) findexpr(mfound ${testname} ${listignoredx} sublabel)
if (NOT mfound) if (NOT mfound)
string(REGEX MATCH "_(systemF|texF|pdf3|pdf2|pdf|dvi|lyx16|xhtml)$" _v ${${testname}}) string(REGEX MATCH "_(systemF|texF|pdf3|pdf2|pdf|dvi|lyx16|xhtml)$" _v ${${testname}})
set(sublabel "")
# check if test _may_ be in listsuspicious # check if test _may_ be in listsuspicious
if (_v) if (_v)
findexpr(mfound ${testname} ${listsuspiciousx} sublabel) findexpr(mfound ${testname} ${listsuspiciousx} sublabel)
@ -138,7 +138,6 @@ macro(maketestname testname reverted listsuspicious listignored listunreliable l
endif() endif()
if (nsfound2) if (nsfound2)
set(sublabel "suspended" ${sublabel}) set(sublabel "suspended" ${sublabel})
message(STATUS "found suspended test ${${testname}}")
endif() endif()
list(REMOVE_DUPLICATES sublabel) list(REMOVE_DUPLICATES sublabel)
if (nsfound OR nsfound2) if (nsfound OR nsfound2)
@ -182,6 +181,7 @@ macro(loadTestList filename resList)
message(STATUS "Reading list ${filename}") message(STATUS "Reading list ${filename}")
foreach(_l ${tempList}) foreach(_l ${tempList})
set(_newl "${_l}") set(_newl "${_l}")
string(REGEX REPLACE "[ \t]+$" "" _newl "${_l}")
string(REGEX REPLACE "[ \t]*#.*$" "" _newl "${_l}") string(REGEX REPLACE "[ \t]*#.*$" "" _newl "${_l}")
if(_newl) if(_newl)
list(APPEND ${resList} "${_newl}") list(APPEND ${resList} "${_newl}")
@ -262,7 +262,7 @@ macro(handlesuspended TestName reverted testlabel)
endmacro() endmacro()
# preparing to add e.g. development/mathmacros to the foreach() loop # preparing to add e.g. development/mathmacros to the foreach() loop
foreach(libsubfolderx lib/doc lib/examples lib/templates development/mathmacros autotests/export) foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates development/mathmacros)
set(testlabel "export") set(testlabel "export")
if (libsubfolderx MATCHES "lib/doc") if (libsubfolderx MATCHES "lib/doc")
list(APPEND testlabel "manuals") list(APPEND testlabel "manuals")