From 4e9fe808d70a0f49d77b4664daf211e352ed425b Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Thu, 17 Dec 2015 12:57:34 +0100 Subject: [PATCH] Cmake export tests: Correct some quirks 1.) Label lyx2lyx was handled wrong (removed '2') 2.) tests were named '_lyx2lyx' instead of only 'lyx2lyx' --- development/autotests/ExportTests.cmake | 6 +++++- development/cmake/modules/LyXMacros.cmake | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake index 926fd58252..6bfa444405 100644 --- a/development/autotests/ExportTests.cmake +++ b/development/autotests/ExportTests.cmake @@ -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() diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake index 11a050cba3..a3db752f65 100644 --- a/development/cmake/modules/LyXMacros.cmake +++ b/development/cmake/modules/LyXMacros.cmake @@ -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) -- 2.39.2