Am Mittwoch, 28. Oktober 2015 um 23:29:30, schrieb Kornel Benko <kor...@lyx.org> > Am Mittwoch, 28. Oktober 2015 um 23:02:08, schrieb Stephan Witt > <st.w...@gmx.net> > > Am 28.10.2015 um 22:49 schrieb Vincent van Ravesteijn <v...@lyx.org>: > > > > > > > It is only a bit > > > > > annoying that I have to wait for a long time without getting any > > > > > feedback on the progress. > > > > > > > > > > Vincent > > > > > > > > > > > > > I don't feel guilty. I don't remember anyone saying anything about the > > > > 'env' command before. > > > > > > > > What do you mean with feedback about progress? > > > > > > > > Probably memory fading. > > > > > > > > Kornel > > > > > > I don't mean you. > > > > > > I mean that I don't get any response while running the updatetex2lyxtests > > > target, which causes me to wonder whether it is doing anything. Msvc > > > thingie probably. > > > > No, I don't think so. On my Mac it is the same. Since there were no visual > > CPU usage I suspect now it is some test for X11 availability? > > > > Stephan > > I am ready in some minutes, let me test first. >
Is that OK? The problem was, that cmake accumulated messages from runtests.py. Now runtests.py is called for each file separately. Kornel
diff --git a/src/tex2lyx/test/CMakeLists.txt b/src/tex2lyx/test/CMakeLists.txt index 304e162..81cbe02 100644 --- a/src/tex2lyx/test/CMakeLists.txt +++ b/src/tex2lyx/test/CMakeLists.txt @@ -61,17 +61,23 @@ endforeach() add_dependencies(lyx_run_tests ${_tex2lyx} ${_lyx}) -add_custom_command( - OUTPUT LyxTestFiles - COMMAND ${CMAKE_COMMAND} -E touch LyxTestFiles - COMMAND ${CMAKE_COMMAND} - -DENVIRON="${LYX_USERDIR_VER}=${LYX_TESTS_USERDIR}" - -DCOMMAND="${LYX_PYTHON_EXECUTABLE}" - -DPARAMS="${runtestsScript}'$<TARGET_FILE:${_tex2lyx}>'${scriptDir}'${CMAKE_CURRENT_SOURCE_DIR}" - -P ${TOP_SRC_DIR}/src/tex2lyx/test/env_custom_command.cmake - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - DEPENDS ${_tex2lyx} ${_lyx} -) +set(LyxTestFiles) +foreach(_fl ${_tex_tests}) + string(REGEX REPLACE "\\." "_" _f "LyxTestFiles${_fl}") + list(APPEND LyxTestFiles ${_f}) + + add_custom_command( + OUTPUT ${_f} + COMMAND ${CMAKE_COMMAND} -E touch ${_f} + COMMAND ${CMAKE_COMMAND} + -DENVIRON="${LYX_USERDIR_VER}=${LYX_TESTS_USERDIR}" + -DCOMMAND="${LYX_PYTHON_EXECUTABLE}" + -DPARAMS="${runtestsScript}'$<TARGET_FILE:${_tex2lyx}>'${scriptDir}'${CMAKE_CURRENT_SOURCE_DIR}'${_fl}" + -P ${TOP_SRC_DIR}/src/tex2lyx/test/env_custom_command.cmake + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" + DEPENDS ${_tex2lyx} ${_lyx} + ) +endforeach() -add_custom_target(updatetex2lyxtests DEPENDS LyxTestFiles) +add_custom_target(updatetex2lyxtests DEPENDS ${LyxTestFiles}) set_target_properties(updatetex2lyxtests PROPERTIES FOLDER "tests/tex2lyx")
signature.asc
Description: This is a digitally signed message part.