The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 96dd1363a2e662f4894a9725e669086fda6f25da Author: Kornel Benko <[email protected]> Date: Thu Dec 13 15:35:04 2012 +0100 Cmake build: all tests 1.) Rename tests to show their grouping 2.) Adapt the roundtrip tests to new lyx-format diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt index 7cebe09..c79a37d 100644 --- a/development/autotests/CMakeLists.txt +++ b/development/autotests/CMakeLists.txt @@ -30,7 +30,7 @@ if(Q_WS_X11) foreach(_tf first-time-in.txt hello-world-in.txt ${TESTST}) string(REGEX REPLACE "-in\\.(txt|sh)" "" _t ${_tf}) - add_test(NAME "auto_${_t}" + add_test(NAME "autotests/${_t}" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" COMMAND ${CMAKE_COMMAND} -DAUTOTEST_ROOT=${TOP_SRC_DIR}/development/autotests @@ -50,7 +50,7 @@ file(GLOB lyx_files RELATIVE "${TOP_SRC_DIR}/lib/doc" "${TOP_SRC_DIR}/lib/doc/*. foreach(f ${lyx_files}) # Strip extension string(REGEX REPLACE "\\.lyx$" "" f ${f}) - add_test(NAME export_${f}_lyx16 + add_test(NAME autotests/export_${f}_lyx16 WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${TOP_SRC_DIR}/lib/doc -Dlyx=$<TARGET_FILE:lyx> @@ -58,7 +58,7 @@ foreach(f ${lyx_files}) -Dextension=16.lyx -Dfile=${f} -P "${TOP_SRC_DIR}/development/autotests/export.cmake") - add_test(NAME export_${f}_xhtml + add_test(NAME autotests/export_${f}_xhtml WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${TOP_SRC_DIR}/lib/doc -Dlyx=$<TARGET_FILE:lyx> diff --git a/src/support/tests/CMakeLists.txt b/src/support/tests/CMakeLists.txt index d464c2a..8452e08 100644 --- a/src/support/tests/CMakeLists.txt +++ b/src/support/tests/CMakeLists.txt @@ -38,14 +38,14 @@ foreach(_src ${check_PROGRAMS}) string(REPLACE "check_" "" _srcx ${_src}) set(src_data_file "${TOP_SRC_DIR}/src/support/tests/regfiles/${_srcx}") set(created_data_file "${CMAKE_CURRENT_BINARY_DIR}/regfiles/${_src}_data") - add_test(NAME build_${_srcx} + add_test(NAME support/${_srcx}/build COMMAND "${CMAKE_COMMAND}" --build ${CMAKE_BINARY_DIR} --target ${_src}) - add_test(NAME data_${_srcx} + add_test(NAME support/${_srcx}/createdata COMMAND ${_src} > "${created_data_file}") - add_test(NAME compare_${_srcx} + add_test(NAME support/${_srcx}/compare COMMAND ${CMAKE_COMMAND} -E compare_files "${src_data_file}" "${created_data_file}") - set_tests_properties(data_${_srcx} PROPERTIES DEPENDS build_${_srcx} ) - set_tests_properties(compare_${_srcx} PROPERTIES DEPENDS data_${_srcx}) + set_tests_properties(support/${_srcx}/createdata PROPERTIES DEPENDS support/${_srcx}/build ) + set_tests_properties(support/${_srcx}/compare PROPERTIES DEPENDS support/${_srcx}/createdata) endforeach() diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx index a9d4ac8..fe08094 100644 --- a/src/tex2lyx/test/CJK.lyx.lyx +++ b/src/tex2lyx/test/CJK.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 450 +\lyxformat 452 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/CMakeLists.txt b/src/tex2lyx/test/CMakeLists.txt index 5e1cd31..9f28120 100644 --- a/src/tex2lyx/test/CMakeLists.txt +++ b/src/tex2lyx/test/CMakeLists.txt @@ -32,17 +32,17 @@ ADD_CUSTOM_COMMAND( #ADD_CUSTOM_TARGET(test DEPENDS ${_tex2lyx} ${_lyx} ${_test_output}) -add_test(NAME build_tex2lyx +add_test(NAME tex2lyx/create_tex2lyx COMMAND "${CMAKE_COMMAND}" --build ${CMAKE_BINARY_DIR} --target ${_tex2lyx}) -add_test(NAME build_lyx +add_test(NAME tex2lyx/create_lyx COMMAND "${CMAKE_COMMAND}" --build ${CMAKE_BINARY_DIR} --target ${_lyx}) -add_test(NAME roundtrip_tex2lyx +add_test(NAME tex2lyx/roundtrip WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" COMMAND ${LYX_PYTHON_EXECUTABLE} "${TOP_SRC_DIR}/src/tex2lyx/test/runtests.py" "${TOP_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${_tex2lyx}" "${TOP_SRC_DIR}/lib/scripts" "${CMAKE_CURRENT_BINARY_DIR}") -set_tests_properties(build_tex2lyx PROPERTIES DEPENDS build_lyx) -set_tests_properties(roundtrip_tex2lyx PROPERTIES DEPENDS build_tex2lyx) +set_tests_properties(tex2lyx/create_tex2lyx PROPERTIES DEPENDS tex2lyx/create_lyx) +set_tests_properties(tex2lyx/roundtrip PROPERTIES DEPENDS tex2lyx/create_tex2lyx) diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx index 5801e6e..fec9abe 100644 --- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx +++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 450 +\lyxformat 452 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx index c9ff209..76842e8 100644 --- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx +++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 450 +\lyxformat 452 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx index ac42d0a..5383966 100644 --- a/src/tex2lyx/test/test-insets.lyx.lyx +++ b/src/tex2lyx/test/test-insets.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 450 +\lyxformat 452 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/test-modules.lyx.lyx b/src/tex2lyx/test/test-modules.lyx.lyx index 4d5f427..029b0aa 100644 --- a/src/tex2lyx/test/test-modules.lyx.lyx +++ b/src/tex2lyx/test/test-modules.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 450 +\lyxformat 452 \begin_document \begin_header \textclass amsart diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx index 80b5c2e..cb8c329 100644 --- a/src/tex2lyx/test/test-structure.lyx.lyx +++ b/src/tex2lyx/test/test-structure.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 450 +\lyxformat 452 \begin_document \begin_header \textclass article diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx index 924341a..a5a7d75 100644 --- a/src/tex2lyx/test/test.lyx.lyx +++ b/src/tex2lyx/test/test.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.1.0dev -\lyxformat 450 +\lyxformat 452 \begin_document \begin_header \textclass article ----------------------------------------------------------------------- Summary of changes: development/autotests/CMakeLists.txt | 6 +++--- src/support/tests/CMakeLists.txt | 10 +++++----- src/tex2lyx/test/CJK.lyx.lyx | 2 +- src/tex2lyx/test/CMakeLists.txt | 10 +++++----- src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx | 2 +- .../test/box-color-size-space-align.lyx.lyx | 2 +- src/tex2lyx/test/test-insets.lyx.lyx | 2 +- src/tex2lyx/test/test-modules.lyx.lyx | 2 +- src/tex2lyx/test/test-structure.lyx.lyx | 2 +- src/tex2lyx/test/test.lyx.lyx | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) hooks/post-receive -- The LyX Source Repository
