Cmake export tests: Correct some quirks

1.) Label lyx2lyx was handled wrong (removed '2')
2.) tests were named '_lyx2lyx' instead of only 'lyx2lyx'

diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake
index 926fd58252a3c7dab29060ccdb70095791a8127b..6bfa444405a3f900928f0f565e6993395b99f6e8 100644 (file)
--- 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 11a050cba34331811f83e0f3964f5703e84771b6..a3db752f658dfe221d365dcfc3e66df57e2b17d4 100644 (file)
--- 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)