From 548a7ac364bef7c5685260f178eb2722b9a38084 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Thu, 3 Dec 2015 00:23:07 +0100 Subject: [PATCH] Cmake tests: Rename label 'reverted' to 'inverted'. --- development/autotests/ExportTests.cmake | 26 ++++++++++++------------- development/autotests/export.cmake | 4 ++-- development/checkurls/CMakeLists.txt | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake index 0e8c128558..9b5c85d785 100644 --- 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 "suspended" ${sublabel} ${sublabel2} ${sublabel3}) - list(REMOVE_ITEM sublabel "export" "reverted" ) + 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) @@ -238,7 +238,7 @@ macro(assignLabelDepth depth) endmacro() assignLabelDepth(0 "export" "key" "layout" "load" "lyx2lyx" "module" "roundtrip" "url") -assignLabelDepth(1 "unreliable" "reverted") +assignLabelDepth(1 "unreliable" "inverted") assignLabelDepth(2 "suspended") assignLabelDepth(3 "examples" "manuals" "mathmacros" "templates" "autotests") @@ -283,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}" @@ -295,7 +295,7 @@ 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") @@ -306,7 +306,7 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates develo # 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}" @@ -322,7 +322,7 @@ foreach(libsubfolderx autotests/export lib/doc lib/examples lib/templates develo 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}" @@ -349,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}" @@ -361,7 +361,7 @@ 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") diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake index 4369c3a8b2..6ff47187e2 100755 --- a/development/autotests/export.cmake +++ b/development/autotests/export.cmake @@ -21,7 +21,7 @@ # -Dfonttype=xxx \ # -Dextension=xxx \ # -Dfile=xxx \ -# -Dreverted=[01] \ +# -Dinverted=[01] \ # -DTOP_SRC_DIR=${TOP_SRC_DIR} # -DPERL_EXECUTABLE=${PERL_EXECUTABLE} # -P "${TOP_SRC_DIR}/development/autotests/export.cmake" @@ -68,7 +68,7 @@ if (NOT _err) endif() endif() -if(reverted) +if(inverted) string(COMPARE EQUAL ${_err} 0 _erg) else() string(COMPARE NOTEQUAL ${_err} 0 _erg) diff --git a/development/checkurls/CMakeLists.txt b/development/checkurls/CMakeLists.txt index 13918fb849..308c054f9b 100644 --- a/development/checkurls/CMakeLists.txt +++ b/development/checkurls/CMakeLists.txt @@ -62,5 +62,5 @@ set_tests_properties(${URL_TEST_NAMES} set_tests_properties("check_translators" PROPERTIES RESOURCE_LOCK "url.lock") -settestlabel("check_inaccessible_urls" "reverted") -settestlabel("check_invalid_urls" "reverted") +settestlabel("check_inaccessible_urls" "inverted") +settestlabel("check_invalid_urls" "inverted") -- 2.39.2