anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake tests: Rename label 'reverted' to 'inverted'.

Browse Source
This commit is contained in:
Kornel Benko 2015-12-03 00:23:07 +01:00
parent cf3156d22d
commit 548a7ac364
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
development/autotests/ExportTests.cmake
View File

@ -103,7 +103,7 @@ function(join rvalues glue routput)
set(${routput} ${out} PARENT_SCOPE) set(${routput} ${out} PARENT_SCOPE)
endfunction() 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}}) string(REGEX MATCH "\\/[a-z][a-z](_[A-Z][A-Z])?\\/" _v ${${testname}})
if(_v) if(_v)
string(REGEX REPLACE "\\/" "" _v ${_v}) string(REGEX REPLACE "\\/" "" _v ${_v})
@ -124,7 +124,7 @@ macro(maketestname testname reverted listsuspicious listignored listunreliable l
findexpr(foundunreliable ${testname} ${listunreliablex} sublabel2) findexpr(foundunreliable ${testname} ${listunreliablex} sublabel2)
if (foundunreliable) if (foundunreliable)
set(sublabel "unreliable" ${sublabel} ${sublabel2}) 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() else()
string(REGEX MATCH "_(systemF|texF|pdf3|pdf2|pdf|dvi|lyx16|xhtml)$" _v ${${testname}}) string(REGEX MATCH "_(systemF|texF|pdf3|pdf2|pdf|dvi|lyx16|xhtml)$" _v ${${testname}})
# check if test _may_ be in listsuspicious # check if test _may_ be in listsuspicious
@ -137,15 +137,15 @@ macro(maketestname testname reverted listsuspicious listignored listunreliable l
if (mfound) if (mfound)
set(sublabel3 "") set(sublabel3 "")
findexpr(foundsuspended ${testname} ${listsuspendedx} sublabel3) findexpr(foundsuspended ${testname} ${listsuspendedx} sublabel3)
set(${reverted} 1) set(${inverted} 1)
if (foundsuspended) if (foundsuspended)
set(sublabel "suspended" ${sublabel} ${sublabel2} ${sublabel3}) set(sublabel "suspended" ${sublabel} ${sublabel2} ${sublabel3})
list(REMOVE_ITEM sublabel "export" "reverted" ) list(REMOVE_ITEM sublabel "export" "inverted" )
else() else()
set(sublabel "reverted" ${sublabel} ${sublabel2} ${sublabel3}) set(sublabel "inverted" ${sublabel} ${sublabel2} ${sublabel3})
endif() endif()
else() else()
set(${reverted} 0) set(${inverted} 0)
endif() endif()
endif() endif()
list(REMOVE_DUPLICATES sublabel) list(REMOVE_DUPLICATES sublabel)
@ -238,7 +238,7 @@ macro(assignLabelDepth depth)
endmacro() endmacro()
assignLabelDepth(0 "export" "key" "layout" "load" "lyx2lyx" "module" "roundtrip" "url") assignLabelDepth(0 "export" "key" "layout" "load" "lyx2lyx" "module" "roundtrip" "url")
assignLabelDepth(1 "unreliable" "reverted") assignLabelDepth(1 "unreliable" "inverted")
assignLabelDepth(2 "suspended") assignLabelDepth(2 "suspended")
assignLabelDepth(3 "examples" "manuals" "mathmacros" "templates" "autotests") 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}) string(REGEX REPLACE "\\.lyx$" "" f ${f})
set(TestName "export/${libsubfolder}/${f}_lyx16") set(TestName "export/${libsubfolder}/${f}_lyx16")
set(mytestlabel ${testlabel}) set(mytestlabel ${testlabel})
maketestname(TestName reverted suspiciousTests ignoredTests unreliableTests mytestlabel) maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel)
if(TestName) if(TestName)
add_test(NAME ${TestName} add_test(NAME ${TestName}
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" 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 -Dformat=lyx16x
-Dextension=16.lyx -Dextension=16.lyx
-Dfile=${f} -Dfile=${f}
-Dreverted=${reverted} -Dinverted=${inverted}
-DTOP_SRC_DIR=${TOP_SRC_DIR} -DTOP_SRC_DIR=${TOP_SRC_DIR}
-DPERL_EXECUTABLE=${PERL_EXECUTABLE} -DPERL_EXECUTABLE=${PERL_EXECUTABLE}
-P "${TOP_SRC_DIR}/development/autotests/export.cmake") -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 # For use of lyx2lyx we need the python executable
set(mytestlabel ${lyx2lyxtestlabel}) set(mytestlabel ${lyx2lyxtestlabel})
set(TestName "lyx2lyx/${libsubfolder}/${f}") set(TestName "lyx2lyx/${libsubfolder}/${f}")
maketestname(TestName reverted suspiciousTests ignoredTests unreliableTests mytestlabel) maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel)
if(TestName) if(TestName)
add_test(NAME ${TestName} add_test(NAME ${TestName}
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" 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(loadtestlabel "load")
set(mytestlabel ${loadtestlabel}) set(mytestlabel ${loadtestlabel})
set(TestName "check_load/${libsubfolder}/${f}") set(TestName "check_load/${libsubfolder}/${f}")
maketestname(TestName reverted suspiciousTests ignoredTests unreliableTests mytestlabel) maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel)
if(TestName) if(TestName)
add_test(NAME ${TestName} add_test(NAME ${TestName}
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" 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}") set(TestName "export/${libsubfolder}/${f}_${format}_${fonttype}")
endif() endif()
set(mytestlabel ${testlabel}) set(mytestlabel ${testlabel})
maketestname(TestName reverted suspiciousTests ignoredTests unreliableTests mytestlabel) maketestname(TestName inverted suspiciousTests ignoredTests unreliableTests mytestlabel)
if(TestName) if(TestName)
add_test(NAME ${TestName} add_test(NAME ${TestName}
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" 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} -Dfonttype=${fonttype}
-Dextension=${format} -Dextension=${format}
-Dfile=${f} -Dfile=${f}
-Dreverted=${reverted} -Dinverted=${inverted}
-DTOP_SRC_DIR=${TOP_SRC_DIR} -DTOP_SRC_DIR=${TOP_SRC_DIR}
-DPERL_EXECUTABLE=${PERL_EXECUTABLE} -DPERL_EXECUTABLE=${PERL_EXECUTABLE}
-P "${TOP_SRC_DIR}/development/autotests/export.cmake") -P "${TOP_SRC_DIR}/development/autotests/export.cmake")

4
development/autotests/export.cmake
View File

@ -21,7 +21,7 @@
# -Dfonttype=xxx \ # -Dfonttype=xxx \
# -Dextension=xxx \ # -Dextension=xxx \
# -Dfile=xxx \ # -Dfile=xxx \
# -Dreverted=[01] \ # -Dinverted=[01] \
# -DTOP_SRC_DIR=${TOP_SRC_DIR} # -DTOP_SRC_DIR=${TOP_SRC_DIR}
# -DPERL_EXECUTABLE=${PERL_EXECUTABLE} # -DPERL_EXECUTABLE=${PERL_EXECUTABLE}
# -P "${TOP_SRC_DIR}/development/autotests/export.cmake" # -P "${TOP_SRC_DIR}/development/autotests/export.cmake"
@ -68,7 +68,7 @@ if (NOT _err)
endif() endif()
endif() endif()
if(reverted) if(inverted)
string(COMPARE EQUAL ${_err} 0 _erg) string(COMPARE EQUAL ${_err} 0 _erg)
else() else()
string(COMPARE NOTEQUAL ${_err} 0 _erg) string(COMPARE NOTEQUAL ${_err} 0 _erg)

4
development/checkurls/CMakeLists.txt
View File

@ -62,5 +62,5 @@ set_tests_properties(${URL_TEST_NAMES}
set_tests_properties("check_translators" set_tests_properties("check_translators"
PROPERTIES RESOURCE_LOCK "url.lock") PROPERTIES RESOURCE_LOCK "url.lock")
settestlabel("check_inaccessible_urls" "reverted") settestlabel("check_inaccessible_urls" "inverted")
settestlabel("check_invalid_urls" "reverted") settestlabel("check_invalid_urls" "inverted")