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: Allow deeper label nesting.

Browse Source 
Previously all labels got the depth '7' while processing 'suspiciousTestss'.
The depth is used to sort how our labels are used to build a test-label.

Say a test gets label a, b, and c, with depth 3, 8 and 2.
The constructed test-label will be "b🅰️c"
For new (to be implemented) 'reason-labels' it is more convenient to assign them higher values.
This commit is contained in:
Kornel Benko 2015-12-05 19:25:23 +01:00
parent c9541285a5
commit 4dd77996a1
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
development/autotests/ExportTests.cmake
View File

@ -70,7 +70,7 @@ macro(findexpr found testname listname rsublabel)
if ("${_itrx}" MATCHES "^Sublabel:")
set(tmpsublabel "")
string(REGEX REPLACE "^Sublabel:[ \t]*" "" _itrlabels ${_itrx})
string(REGEX MATCHALL "([a-zA-Z]+)" _labels ${_itrlabels})
string(REGEX MATCHALL "[a-zA-Z]+" _labels ${_itrlabels})
foreach(subl ${_labels})
if (subl STREQUAL "RESET")
set(tmpsublabel "")
@ -182,7 +182,7 @@ macro(loadTestList filename resList depth)
list(APPEND ${resList} "${_newl}")
if (_newl MATCHES "^Sublabel:")
string(REGEX REPLACE "^Sublabel:[ \t]*" "" _newlabels ${_newl})
string(REGEX MATCHALL "([a-zA-Z]+)" _labels ${_newlabels})
string(REGEX MATCHALL "([0-9]*[a-zA-Z]+)" _labels ${_newlabels})
foreach(labname ${_labels})
if (NOT labname STREQUAL "RESET")
list(APPEND mylabels ${labname})
@ -212,12 +212,19 @@ macro(loadTestList filename resList depth)
endif()
endif()
endforeach()
foreach(_l ${mylabels})
foreach(_l1 ${mylabels})
if (_l1 MATCHES "^([0-9]+)([a-zA-Z]+)$")
set(_l ${CMAKE_MATCH_2})
set(depth1 ${CMAKE_MATCH_1})
else()
set(_l ${_l1})
set(depth1 "0")
endif()
list(FIND known_labels ${_l} _ff)
if (_ff GREATER -1)
message(STATUS "Label \"${_l}\" already in use. Reused in ${filename}")
else()
assignLabelDepth(${depth} ${_l})
assignLabelDepth(${depth}${depth1} ${_l})
endif()
endforeach()
foreach(_lg ${languages})

2
development/autotests/suspiciousTests
View File

@ -186,7 +186,7 @@ export/doc/(ru|uk)/splash_(dvi3|pdf[45])_texF
#
# GM: chemgreek incompatible with LuaTeX (cf. Math.lyx)
# for now inverted
Sublabel: chemgreek
Sublabel: 3chemgreek
export/doc/sk/Intro_pdf5_systemF
export/examples/(|de/|fr/)PDF-comment_pdf5_texF
export/examples/aas_sample_(dvi3|pdf5)_(texF|systemF)