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

Cmake export tests: Correct some quirks

Browse Source 
1.) Label lyx2lyx was handled wrong (removed '2')
2.) tests were named '_lyx2lyx' instead of only 'lyx2lyx'
This commit is contained in:
Kornel Benko 2015-12-17 12:57:34 +01:00
parent 8876ad1035
commit 4e9fe808d7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
development/autotests/ExportTests.cmake
View File

@ -161,7 +161,11 @@ macro(maketestname testname inverted listsuspicious listignored listunreliable l
list(REMOVE_DUPLICATES sublabel)
if (NOT sublabel STREQUAL "")
join(sublabel "." tmpprefixx)
string(TOUPPER "${tmpprefixx}_" tmpprefix)
if (tmpprefixx)
string(TOUPPER "${tmpprefixx}_" tmpprefix)
else()
set(tmpprefix "")
endif()
set(${testname} "${tmpprefix}${${testname}}")
set(${listlabels} ${sublabel})
endif()

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

@ -329,7 +329,7 @@ macro(sortlabellist listout)
list(APPEND tmplist "${depth_${_lab}}${_lab}")
endforeach()
list(SORT tmplist)
string(REGEX REPLACE "[0-9]+" "" ${listout} "${tmplist}")
string(REGEX REPLACE ";[0-9]+" ";" ${listout} ";${tmplist}")
endmacro()
macro(createlabel reslabel first)