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

LyXMacros.cmake: Overseen the macro 'setmarkedtestlabel()' which added it automatically
  if the test was to invert the test result.
ExportTests.cmake: Correct label handling

diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake
index b0e7595c9ca04e4b76f8cc155e7f669f13df0f9f..f99646e89e6648283006dbe363d5d4dc8aa7bf0e 100644 (file)
--- a/development/autotests/ExportTests.cmake
+++ b/development/autotests/ExportTests.cmake
@@ -139,8 +139,8 @@ macro(maketestname testname reverted listsuspicious listignored listunreliable l
        findexpr(foundsuspended ${testname} ${listsuspendedx} sublabel3)
        set(${reverted} 1)
        if (foundsuspended)
-         set(sublabel "reverted" "suspended" ${sublabel} ${sublabel2} ${sublabel3})
-         list(REMOVE_ITEM sublabel "export")
+         set(sublabel "suspended" ${sublabel} ${sublabel2} ${sublabel3})
+         list(REMOVE_ITEM sublabel "export" "reverted" )
        else()
          set(sublabel "reverted" ${sublabel} ${sublabel2} ${sublabel3})
        endif()

diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake
index ea16243b84b86754776105d641429453838f5e20..9b883989edbca0f4ee554a3740196adfae6a80f5 100644 (file)
--- a/development/cmake/modules/LyXMacros.cmake
+++ b/development/cmake/modules/LyXMacros.cmake
@@ -322,11 +322,7 @@ macro(settestlabel testname)
 endmacro()
 
 macro(setmarkedtestlabel testname reverted)
-  if(${reverted})
-    settestlabel(${testname} "reverted" ${ARGN})
-  else()
-    settestlabel(${testname} ${ARGN})
-  endif()
+  settestlabel(${testname} ${ARGN})
 endmacro()