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
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>
-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>
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()
#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 450
+\lyxformat 452
\begin_document
\begin_header
\textclass article
#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)
#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 450
+\lyxformat 452
\begin_document
\begin_header
\textclass article
#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 450
+\lyxformat 452
\begin_document
\begin_header
\textclass article
#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 450
+\lyxformat 452
\begin_document
\begin_header
\textclass article
#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 450
+\lyxformat 452
\begin_document
\begin_header
\textclass amsart
#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 450
+\lyxformat 452
\begin_document
\begin_header
\textclass article
#LyX file created by tex2lyx 2.1.0dev
-\lyxformat 450
+\lyxformat 452
\begin_document
\begin_header
\textclass article