X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fautotests%2Fexport.cmake;h=e42317937ac61bf9c9c8bfaa7fdfa963afe8f757;hb=66e4e94bdb4217173f73d8ee0bf261b9cfa0ecf4;hp=647b9ddc6eea195ed3aca2c445cdecdd50119512;hpb=997035fe66f76e327bfbe0fac4028f4cf2d59070;p=lyx.git

diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake
index 647b9ddc6e..e42317937a 100755
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -6,7 +6,7 @@
 #
 # LYX_ROOT  = ${TOP_SRC_DIR}/lib/{doc,examples,templates}
 # LYX_USERDIR_VER = Name of environment variable for the user directory
-# lyx       = 
+# lyx       =
 # format    = lyx16x|xhtml
 # extension = 16.lyx|xhtml
 # file      = xxx
@@ -28,12 +28,14 @@
 #
 
 set(Perl_Script "${TOP_SRC_DIR}/development/autotests/useSystemFonts.pl")
+set(GetTempDir "${TOP_SRC_DIR}/development/autotests/getTempDir.pl")
 set(_ft ${fonttype})
+execute_process(COMMAND ${PERL_EXECUTABLE} "${GetTempDir}" "${WORKDIR}" OUTPUT_VARIABLE TempDir)
 message(STATUS "using fonttype = ${_ft}")
 if(format MATCHES "dvi3|pdf4|pdf5")
   message(STATUS "LYX_TESTS_USERDIR = ${LYX_TESTS_USERDIR}")
   message(STATUS "Converting with perl ${Perl_Script}")
-  set(LYX_SOURCE "${WORKDIR}/${file}_${format}_${_ft}.lyx")
+  set(LYX_SOURCE "${TempDir}/${file}_${format}_${_ft}.lyx")
   message(STATUS "Using source \"${LYX_ROOT}/${file}.lyx\"")
   message(STATUS "Using dest \"${LYX_SOURCE}\"")
   execute_process(COMMAND ${PERL_EXECUTABLE} "${Perl_Script}" "${LYX_ROOT}/${file}.lyx" "${LYX_SOURCE}" ${format} ${_ft}
@@ -47,17 +49,30 @@ else()
   set(LYX_SOURCE "${LYX_ROOT}/${file}.lyx")
 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}")
-execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${file}.${extension})
+execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${result_file_name})
 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)
+
+#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)
   string(COMPARE EQUAL  ${_err} 0 _erg)
 else()
   string(COMPARE NOTEQUAL  ${_err} 0 _erg)
 endif()
+execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${TempDir}")
 if(_erg)
   message(STATUS "Exporting ${f}.lyx to ${format}")
   message(FATAL_ERROR "Export failed")