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

Cmake export tests: Remove label 'reverted' from suspended tests.

Browse Source 
LyXMacros.cmake: Overseen the macro 'setmarkedtestlabel()' which added it automatically
  if the test was to invert the test result.
ExportTests.cmake: Correct label handling
This commit is contained in:
Kornel Benko 2015-12-02 13:28:16 +01:00
parent d879599cec
commit e39025797e
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
development/autotests/ExportTests.cmake
View File

@ -139,8 +139,8 @@ macro(maketestname testname reverted listsuspicious listignored listunreliable l
findexpr(foundsuspended ${testname} ${listsuspendedx} sublabel3) findexpr(foundsuspended ${testname} ${listsuspendedx} sublabel3)
set(${reverted} 1) set(${reverted} 1)
if (foundsuspended) if (foundsuspended)
set(sublabel "reverted" "suspended" ${sublabel} ${sublabel2} ${sublabel3}) set(sublabel "suspended" ${sublabel} ${sublabel2} ${sublabel3})
list(REMOVE_ITEM sublabel "export") list(REMOVE_ITEM sublabel "export" "reverted" )
else() else()
set(sublabel "reverted" ${sublabel} ${sublabel2} ${sublabel3}) set(sublabel "reverted" ${sublabel} ${sublabel2} ${sublabel3})
endif() endif()

6
development/cmake/modules/LyXMacros.cmake
View File

@ -322,11 +322,7 @@ macro(settestlabel testname)
endmacro() endmacro()
macro(setmarkedtestlabel testname reverted) macro(setmarkedtestlabel testname reverted)
if(${reverted}) settestlabel(${testname} ${ARGN})
settestlabel(${testname} "reverted" ${ARGN})
else()
settestlabel(${testname} ${ARGN})
endif()
endmacro() endmacro()