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

Cmake export tests: Use unique file names for exported files

Browse Source 
This should prevent possible errors for tests running in parallel.
We now also check for created export file.
  complainer/feature requester: Scott Kostyshak
This commit is contained in:
Kornel Benko 2014-09-09 19:02:20 +02:00
parent 5a6020ea15
commit efb8584ba1
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
development/autotests/export.cmake
View File

@ -47,12 +47,24 @@ else()
set(LYX_SOURCE "${LYX_ROOT}/${file}.lyx") set(LYX_SOURCE "${LYX_ROOT}/${file}.lyx")
endif() endif()
message(STATUS "Executing ${lyx} -userdir \"${LYX_TESTS_USERDIR}\" -E ${format} ${file}.${extension} \"${LYX_SOURCE}\"") set(result_file_name ${file}_${_ft}.${extension})
message(STATUS "Executing ${lyx} -userdir \"${LYX_TESTS_USERDIR}\" -E ${format} ${result_file_name} \"${LYX_SOURCE}\"")
set(ENV{${LYX_USERDIR_VER}} "${LYX_TESTS_USERDIR}") set(ENV{${LYX_USERDIR_VER}} "${LYX_TESTS_USERDIR}")
execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${file}.${extension}) execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${result_file_name})
execute_process( execute_process(
COMMAND ${lyx} -userdir "${LYX_TESTS_USERDIR}" -E ${format} ${file}.${extension} "${LYX_SOURCE}" COMMAND ${lyx} -userdir "${LYX_TESTS_USERDIR}" -E ${format} ${result_file_name} "${LYX_SOURCE}"
RESULT_VARIABLE _err) RESULT_VARIABLE _err)
#check if result file created
if (NOT _err)
if (NOT EXISTS "${result_file_name}")
message(STATUS "Expected result file \"${result_file_name}\" does not exist")
set(_err -1)
else()
message(STATUS "Expected result file \"${result_file_name}\" exists")
endif()
endif()
if(reverted) if(reverted)
string(COMPARE EQUAL ${_err} 0 _erg) string(COMPARE EQUAL ${_err} 0 _erg)
else() else()