]> git.lyx.org Git - features.git/blobdiff - development/autotests/ExportTests.cmake
projects / features.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Cmake tests: Rename label 'reverted' to 'inverted'.
[features.git] / development / autotests / ExportTests.cmake
diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake
index 942dd4ec08ea901c568105d3dc1faeb8898d94ad..9b5c85d785595550dd6ca81fcdbe17834ac18fea 100644 (file)
--- a/development/autotests/ExportTests.cmake
+++ b/development/autotests/ExportTests.cmake
@@ -103,7 +103,7 @@ function(join rvalues glue routput)
   set(${routput} ${out} PARENT_SCOPE)
 endfunction()
 
-macro(maketestname testname reverted listsuspicious listignored listunreliable listlabels)
+macro(maketestname testname inverted listsuspicious listignored listunreliable listlabels)
   string(REGEX MATCH "\\/[a-z][a-z](_[A-Z][A-Z])?\\/" _v ${${testname}})
   if(_v)
     string(REGEX REPLACE "\\/" "" _v ${_v})
@@ -124,7 +124,7 @@ macro(maketestname testname reverted listsuspicious listignored listunreliable l
     findexpr(foundunreliable ${testname} ${listunreliablex} sublabel2)
     if (foundunreliable)
       set(sublabel "unreliable" ${sublabel} ${sublabel2})
-      list(REMOVE_ITEM sublabel "export" "reverted" "templates" "mathmacros" "manuals" "autotests")
+      list(REMOVE_ITEM sublabel "export" "inverted" "templates" "mathmacros" "manuals" "autotests")
     else()
       string(REGEX MATCH "_(systemF|texF|pdf3|pdf2|pdf|dvi|lyx16|xhtml)$" _v ${${testname}})
       # check if test _may_ be in listsuspicious
@@ -137,15 +137,15 @@ macro(maketestname testname reverted listsuspicious listignored listunreliable l
       if (mfound)
        set(sublabel3 "")
        findexpr(foundsuspended ${testname} ${listsuspendedx} sublabel3)
-       set(${reverted} 1)
+       set(${inverted} 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" "inverted" )
        else()
-         set(sublabel "reverted" ${sublabel} ${sublabel2} ${sublabel3})
+         set(sublabel "inverted" ${sublabel} ${sublabel2} ${sublabel3})
        endif()
       else()
-       set(${reverted} 0)
+       set(${inverted} 0)
       endif()
     endif()
     list(REMOVE_DUPLICATES sublabel)
@@ -153,20 +153,15 @@ macro(maketestname testname reverted listsuspicious listignored listunreliable l
       join(sublabel "." tmpprefixx)
       string(TOUPPER "${tmpprefixx}_" tmpprefix)
       set(${testname} "${tmpprefix}${${testname}}")
-      string(TOUPPER "${sublabel}_" tmpprefix)
       set(${listlabels} ${sublabel})
     endif()
   else()
+    # No testname because ignored
     set(${testname} "")
   endif()
 endmacro()
 
-# This labels should not be used in .*Tests files
-set(known_labels "export" "key" "layout" "load" "lyx2lyx"
-  "examples" "manuals" "mathmacros" "reverted" "templates" "unreliable" "suspended" 
-  "module" "roundtrip" "url")
-
-macro(loadTestList filename resList)
+macro(loadTestList filename resList depth)
   # Create list of strings from a file without comments
   # ENCODING parameter is a new feature in cmake 3.1
   if (CMAKE_VERSION VERSION_GREATER "3.1")
@@ -222,7 +217,7 @@ macro(loadTestList filename resList)
     if (_ff GREATER -1)
       message(STATUS "Label \"${_l}\" already in use. Reused in ${filename}")
     else()
-      list(APPEND known_labels ${_l})
+      assignLabelDepth(${depth} ${_l})
     endif()
   endforeach()
   foreach(_lg ${languages})
@@ -232,10 +227,25 @@ macro(loadTestList filename resList)
   endforeach()
 endmacro()
 
-loadTestList(suspiciousTests suspiciousTests)
-loadTestList(ignoredTests ignoredTests)
-loadTestList(suspendedTests suspendedTests)
-loadTestList(unreliableTests unreliableTests)
+# This labels should not be used in .*Tests files
+set(known_labels "")
+# Create depth info to each label
+macro(assignLabelDepth depth)
+  foreach(_lab ${ARGN})
+    list(APPEND known_labels ${_lab})
+    set(depth_${_lab} ${depth})
+  endforeach()
+endmacro()
+
+assignLabelDepth(0 "export" "key" "layout" "load" "lyx2lyx" "module" "roundtrip" "url")
+assignLabelDepth(1 "unreliable" "inverted")
+assignLabelDepth(2 "suspended")
+assignLabelDepth(3 "examples" "manuals" "mathmacros" "templates" "autotests")
+
+loadTestList(suspiciousTests suspiciousTests 7)
+loadTestList(ignoredTests ignoredTests 0)
+loadTestList(suspendedTests suspendedTests 6)
+loadTestList(unreliableTests unreliableTests 5)
 
 # preparing to add e.g. development/mathmacros to the foreach() loop
 foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates development/mathmacros)
@@ -273,7 +283,7 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates develo
     string(REGEX REPLACE "\\.lyx$" "" f ${f})
     set(TestName "export/${libsubfolder}/${f}_lyx16")
     set(mytestlabel ${testlabel})
-    maketestname(TestName reverted suspiciousTests ignoredTests unreliableTests mytestlabel)
+    maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel)
     if(TestName)
       add_test(NAME ${TestName}
         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
@@ -285,18 +295,18 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates develo
         -Dformat=lyx16x
         -Dextension=16.lyx
         -Dfile=${f}
-        -Dreverted=${reverted}
+        -Dinverted=${inverted}
         -DTOP_SRC_DIR=${TOP_SRC_DIR}
         -DPERL_EXECUTABLE=${PERL_EXECUTABLE}
         -P "${TOP_SRC_DIR}/development/autotests/export.cmake")
-      setmarkedtestlabel(${TestName} ${reverted} ${mytestlabel})
+      setmarkedtestlabel(${TestName} ${mytestlabel})
     endif()
     if(LYX_PYTHON_EXECUTABLE)
       set(lyx2lyxtestlabel "lyx2lyx")
       # For use of lyx2lyx we need the python executable
       set(mytestlabel ${lyx2lyxtestlabel})
       set(TestName "lyx2lyx/${libsubfolder}/${f}")
-      maketestname(TestName reverted suspiciousTests ignoredTests unreliableTests mytestlabel)
+      maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel)
       if(TestName)
         add_test(NAME ${TestName}
           WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
@@ -306,13 +316,13 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates develo
           "-DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR}"
           "-DLYXFILE=${LIBSUB_SRC_DIR}/${f}.lyx"
           -P "${TOP_SRC_DIR}/development/autotests/lyx2lyxtest.cmake")
-        setmarkedtestlabel(${TestName} ${reverted} ${mytestlabel})
+        setmarkedtestlabel(${TestName} ${mytestlabel})
       endif()
     endif()
     set(loadtestlabel "load")
     set(mytestlabel ${loadtestlabel})
     set(TestName "check_load/${libsubfolder}/${f}")
-    maketestname(TestName reverted suspiciousTests ignoredTests unreliableTests mytestlabel)
+    maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel)
     if(TestName)
       add_test(NAME ${TestName}
         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
@@ -322,7 +332,7 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates develo
         -DPARAMS_DIR=${TOP_SRC_DIR}/development/autotests
         -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
         -P "${TOP_SRC_DIR}/development/autotests/check_load.cmake")
-      setmarkedtestlabel(${TestName} ${reverted} ${mytestlabel})
+      setmarkedtestlabel(${TestName} ${mytestlabel})
       set_tests_properties(${TestName} PROPERTIES RUN_SERIAL ON)
     endif()
     getoutputformats("${LIBSUB_SRC_DIR}/${f}.lyx" formatlist)
@@ -339,7 +349,7 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates develo
           set(TestName "export/${libsubfolder}/${f}_${format}_${fonttype}")
         endif()
         set(mytestlabel ${testlabel})
-        maketestname(TestName reverted suspiciousTests ignoredTests unreliableTests mytestlabel)
+        maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel)
         if(TestName)
           add_test(NAME ${TestName}
             WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
@@ -351,11 +361,11 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates develo
             -Dfonttype=${fonttype}
             -Dextension=${format}
             -Dfile=${f}
-            -Dreverted=${reverted}
+            -Dinverted=${inverted}
             -DTOP_SRC_DIR=${TOP_SRC_DIR}
             -DPERL_EXECUTABLE=${PERL_EXECUTABLE}
             -P "${TOP_SRC_DIR}/development/autotests/export.cmake")
-          setmarkedtestlabel(${TestName} ${reverted} ${mytestlabel}) # check for suspended pdf/dvi exports
+          setmarkedtestlabel(${TestName} ${mytestlabel}) # check for suspended pdf/dvi exports
         endif()
       endforeach()
     endforeach()
Repository for new features