commit e39025797ee8e08b09400d7b2af74f8b1f6df3f1
Author: Kornel Benko <[email protected]>
Date: Wed Dec 2 13:28:16 2015 +0100
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 b0e7595..f99646e 100644
--- 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 ea16243..9b88398 100644
--- 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()