X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fautotests%2FCMakeLists.txt;h=485e9767eee2aa6ecf2dcaf95cb1321bd23677b1;hb=2b6f822badd407cf3780ec647f67fccfd94e52a4;hp=87dfeac3f3b773d6292bce705c84bde04657afa6;hpb=dbd3e5a0f8d27cbd72471c380831e67890d8c457;p=lyx.git diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt index 87dfeac3f3..485e9767ee 100644 --- a/development/autotests/CMakeLists.txt +++ b/development/autotests/CMakeLists.txt @@ -8,7 +8,7 @@ set(LYX_HOME "out-home") set(LOCALE_DIR "${CMAKE_CURRENT_BINARY_DIR}/locale") file(MAKE_DIRECTORY "${LOCALE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}") -if(Q_WS_X11) +if(QT_USES_X11) set(Missing) set(XVFBDLIBS) # Make sure, the needed programs are in PATH @@ -67,18 +67,30 @@ if(Q_WS_X11) message(STATUS "cmake build is therefore omitting keytests") endif() - if(NOT Missing) + if(Missing OR NOT LYX_ENABLE_KEYTESTS) + set(_runtest FALSE) + else() project(keytest) add_subdirectory(xvkbd) + set(_runtest TRUE) set(KEYTEST "${CMAKE_CURRENT_SOURCE_DIR}/keytest.py") file(GLOB TESTST RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*-in.txt") file(GLOB TESTSS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*-in.sh") - list(REMOVE_ITEM TESTST hello-world-in.txt first-time-in.txt) + set(_firsttxt first-time-in.txt hello-world-in.txt) + foreach(_f ${_firsttxt}) + list(FIND TESTST ${_f} _ff) + if(NOT _ff GREATER -1) + set(_runtest FALSE) + break() + endif() + endforeach() + list(REMOVE_ITEM TESTST ${_firsttxt}) list(SORT TESTST) - - foreach(_tf first-time-in.txt hello-world-in.txt ${TESTST}) + endif() + if(_runtest) + foreach(_tf ${_firsttxt} ${TESTST}) string(REGEX REPLACE "-in\\.(txt|sh)" "" _t ${_tf}) add_test(NAME keytest/${_t} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" @@ -93,135 +105,15 @@ if(Q_WS_X11) -DLYX_USERDIR_VER=${LYX_USERDIR_VER} -DKEYTEST_OUTFILE=${_t}-out.txt -DPACKAGE=${PACKAGE} + -DFRONTEND=${LYX_USE_QT} -DLOCALE_DIR=${LOCALE_DIR} -P ${TOP_SRC_DIR}/development/autotests/single-test.cmake) + settestlabel(keytest/${_t} "key") + set_tests_properties(keytest/${_t} PROPERTIES RUN_SERIAL ON) endforeach() endif() endif() -macro(getoutputformats filepath varname) - file(STRINGS "${filepath}" lines) - set(out_formats "xhtml" "pdf" "pdf2" "pdf5") - set(${varname} ${out_formats}) - foreach(_l ${lines}) - if(_l MATCHES "^\\\\default_output_format +\([^ ]+\)") - if(CMAKE_MATCH_1 STREQUAL "default") - set(found ${out_formats}) - elseif(CMAKE_MATCH_1 STREQUAL "xhtml") - set(found "xhtml") - else() - set(found "xhtml" ${CMAKE_MATCH_1}) - endif() - set(${varname} ${found}) - break() - endif() - endforeach() -endmacro() - -macro(maketestname testname reverted listreverted listignored) - list(FIND ${listignored} ${${testname}} _idx) - if (${_idx} LESS 0) - list(FIND ${listreverted} ${${testname}} _idx) - if (${_idx} LESS 0) - set(${reverted} 0) - else() - set(${reverted} 1) - set(${testname} "INVERTED_SEE-README.ctest_${${testname}}") - endif() - else() - set(${testname} "") - endif() -endmacro() - -macro(loadTestList filename resList) - # Create list of strings from a file without comments - file(STRINGS ${filename} tempList) - set(${resList}) - foreach(_l ${tempList}) - string(REGEX REPLACE "[ \t]*#.*" "" _newl "${_l}") - if(_newl) - list(APPEND ${resList} "${_newl}") - endif() - endforeach() -endmacro() - -loadTestList(revertedTests revertedTests) -loadTestList(ignoredTests ignoredTests) - -foreach(libsubfolder doc examples templates) - set(LIBSUB_SRC_DIR "${TOP_SRC_DIR}/lib/${libsubfolder}") - file(GLOB_RECURSE lyx_files RELATIVE "${LIBSUB_SRC_DIR}" "${LIBSUB_SRC_DIR}/*.lyx") - list(SORT lyx_files) - # Now create 2 lists. One for files in a language dir, one without - set(lang_lyx_files) - set(nolang_lyx_files) - foreach(f ${lyx_files}) - string(REGEX MATCHALL "^[a-z][a-z](_[A-Z][A-Z])?\\/" _v ${f}) - if(_v) - list(APPEND lang_lyx_files ${f}) - else() - list(APPEND nolang_lyx_files ${f}) - endif() - endforeach() - foreach(f ${nolang_lyx_files} ${lang_lyx_files}) - # Strip extension - string(REGEX REPLACE "\\.lyx$" "" f ${f}) - set(TestName "export/${libsubfolder}/${f}_lyx16") - maketestname(TestName reverted revertedTests ignoredTests) - if(TestName) - add_test(NAME ${TestName} - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" - COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR} - -DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR} - -Dlyx=$ - -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME} - -DLYX_USERDIR_VER=${LYX_USERDIR_VER} - -Dformat=lyx16x - -Dextension=16.lyx - -Dfile=${f} - -Dreverted=${reverted} - -P "${TOP_SRC_DIR}/development/autotests/export.cmake") - endif() - set(TestName "lyx2lyx/${libsubfolder}/${f}") - maketestname(TestName reverted revertedTests ignoredTests) - if(TestName) - add_test(NAME ${TestName} - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" - COMMAND ${CMAKE_COMMAND} -DLYX2LYX=${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx - -DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR} - -DLYXFILE=${LIBSUB_SRC_DIR}/${f}.lyx - -P "${TOP_SRC_DIR}/development/autotests/lyx2lyxtest.cmake") - endif() - set(TestName "check_load/${libsubfolder}/${f}") - maketestname(TestName reverted revertedTests ignoredTests) - if(TestName) - add_test(NAME ${TestName} - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" - COMMAND ${CMAKE_COMMAND} -DLYXFILE=${LIBSUB_SRC_DIR}/${f}.lyx - -DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR} - -Dlyx=$ - -DPARAMS_DIR=${TOP_SRC_DIR}/development/autotests - -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME} - -P "${TOP_SRC_DIR}/development/autotests/check_load.cmake") - endif() - getoutputformats("${LIBSUB_SRC_DIR}/${f}.lyx" formatlist) - foreach(format ${formatlist}) - set(TestName "export/${libsubfolder}/${f}_${format}") - maketestname(TestName reverted revertedTests ignoredTests) - if(TestName) - add_test(NAME ${TestName} - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" - COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${LIBSUB_SRC_DIR} - -DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR} - -Dlyx=$ - -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME} - -Dformat=${format} - -Dextension=${format} - -Dfile=${f} - -Dreverted=${reverted} - -P "${TOP_SRC_DIR}/development/autotests/export.cmake") - endif() - endforeach() - endforeach() -endforeach() - +if (LYX_ENABLE_EXPORT_TESTS) + include(${TOP_SRC_DIR}/development/autotests/ExportTests.cmake) +endif()