X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fautotests%2Fexport.cmake;h=e42317937ac61bf9c9c8bfaa7fdfa963afe8f757;hb=c6b17b685a8cc0982a1544d90cdfdb6fba60a2e0;hp=bcdcb3a39cba62bfdb111e5422c804ff68f4fe8a;hpb=1f93b0805e2229c044afe705b0276702b57a7624;p=lyx.git

diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake
index bcdcb3a39c..e42317937a 100755
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -4,73 +4,76 @@
 # Copyright (c) 2012 Kornel Benko kornel@lyx.org
 #
 #
-# LYX_ROOT  = ${TOP_SRC_DIR}/lib/doc
-# lyx       = 
+# LYX_ROOT  = ${TOP_SRC_DIR}/lib/{doc,examples,templates}
+# LYX_USERDIR_VER = Name of environment variable for the user directory
+# lyx       =
 # format    = lyx16x|xhtml
 # extension = 16.lyx|xhtml
 # file      = xxx
 #
 # Script should be called like:
 # cmake -DLYX_ROOT=xxx \
+#       -DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR} \
+#       -DWORKDIR=${BUILD_DIR}/autotests/out-home \
+#       -DLYX_USERDIR_VER=${LYX_USERDIR_VER} \
 #       -Dlyx=xxx \
 #       -Dformat=xxx \
+#       -Dfonttype=xxx \
 #       -Dextension=xxx \
 #       -Dfile=xxx \
+#       -Dreverted=[01] \
+#       -DTOP_SRC_DIR=${TOP_SRC_DIR}
+#       -DPERL_EXECUTABLE=${PERL_EXECUTABLE}
 #       -P "${TOP_SRC_DIR}/development/autotests/export.cmake"
 #
 
-message(STATUS "Executing ${lyx} -E ${format} ${file}.${extension} ${LYX_ROOT}/${file}.lyx")
-execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${file}.${extension})
+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 "${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}
+    RESULT_VARIABLE _err)
+  string(COMPARE EQUAL  ${_err} 0 _erg)
+  if(NOT _erg)
+    message(FATAL_ERROR "Export failed while converting")
+  endif()
+else()
+  message(STATUS "Not converting")
+  set(LYX_SOURCE "${LYX_ROOT}/${file}.lyx")
+endif()
+
+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 ${result_file_name})
 execute_process(
-  COMMAND ${lyx} -E ${format} ${file}.${extension} "${LYX_ROOT}/${file}.lyx"
+  COMMAND ${lyx} -userdir "${LYX_TESTS_USERDIR}" -E ${format} ${result_file_name} "${LYX_SOURCE}"
   RESULT_VARIABLE _err)
-string(COMPARE NOTEQUAL  ${_err} 0 _erg)
-if(erg)
-  message(STATUS "Exporting ${f}.lyx to ${format}")
-  message(FATAL_ERROR "Export failed")
-endif()
-# This script invokes the keytest.py script with the simple set-up needed
-# to re-run deterministic regression tests that one would like to have.
-#
-# AUTOTEST_ROOT   = ${LYX_ROOT}/development/autotests
-# KEYTEST_INFILE  = xxx-in.txt
-# KEYTEST_OUTFILE = xxx-out.txt
-# BINDIR          = ${BUILD_DIR}/bin
-# WORKDIR         = ${BUILD_DIR}/autotests/out-home
-# LOCALE_DIR      = ${BUILD_DIR}/autotests/locale
-# PO_BUILD_DIR    = ${BUILD_DIR}/po
-# PACKAGE         = lyx2.1
-#
-# Script should be called like:
-# cmake -DAUTOTEST_ROOT=xxxx \
-#       -DKEYTEST_INFILE=xxxx \
-#       -DKEYTEST_OUTFILE=xxx \
-#       -DBINDIR=xxx \
-#       -DWORKDIR=xxx \
-#       -DLOCALE_DIR=xxx \
-#       -DPO_BUILD_DIR=xxx \
-#       -DPACKAGE=xxx \
-#       -P ${AUTOTEST_ROOT}/single-test.cmake
 
-set(KEYTEST "${AUTOTEST_ROOT}/keytest.py")
+#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()
 
-execute_process(COMMAND pidof lyx OUTPUT_VARIABLE LYX_PID RESULT_VARIABLE pidstat OUTPUT_VARIABLE pidres)
-message(STATUS "pidres = ${pidres}")
-if (NOT pidstat)
-  # lyx already running, remove trailing '\n' from pid
-  string(REGEX REPLACE "\n" "" pidres ${pidres})
-  execute_process(COMMAND wmctrl -l -p OUTPUT_VARIABLE _wmco)
-  string(REGEX REPLACE "[\n]+" ";" _wmc ${_wmco})
-  foreach(_w ${_wmc})
-    string(REGEX MATCH "${pidres}" _wr ${_w})
-    if (${_wr} MATCHES ${pidres})
-      # this entry contains the pid, go search for X11-window-id
-      string(REGEX REPLACE " .*" "" _wr ${_w})
-      set(LYX_WINDOW_NAME ${_wr})
-      message(STATUS "Set LYX_WINDOW_NAME to ${_wr}")
-    endif()
-  endforeach()
+if(reverted)
+  string(COMPARE EQUAL  ${_err} 0 _erg)
 else()
-  set(pidres "")
-  set(LYX_WINDOW_NAME "")
+  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")
 endif()