Remove MergedManuals.lyx from export tests

[lyx.git] / development / autotests / single-test.cmake

diff --git a/development/autotests/single-test.cmake b/development/autotests/single-test.cmake
index e1b5b59d53563fab7246111788c49803690e0c0a..3f452cc5c7ed3c79deea36c7e220c72e0937c263 100755 (executable)
--- a/development/autotests/single-test.cmake
+++ b/development/autotests/single-test.cmake
@@ -15,6 +15,7 @@
 #       -DKEYTEST_INFILE=xxxx \
 #       -DKEYTEST_OUTFILE=xxx \
 #       -DBINDIR=xxx \
+#       -DLYX=xxx \
 #       -DWORKDIR=xxx \
 #       -DLOCALE_DIR=xxx \
 #       -DPO_BUILD_DIR=xxx \
@@ -23,7 +24,7 @@
 
 set(KEYTEST "${AUTOTEST_ROOT}/keytest.py")
 
-execute_process(COMMAND pidof lyx OUTPUT_VARIABLE LYX_PID RESULT_VARIABLE pidstat OUTPUT_VARIABLE pidres)
+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
@@ -44,29 +45,42 @@ else()
   set(LYX_WINDOW_NAME "")
 endif()
 
-set(LYX_EXE "${BINDIR}/lyx")
+set(LYX_EXE "${BINDIR}/${LYX}")
 set(XVKBD_EXE "${BINDIR}/xvkbd")
+set(ENV{XVKBD_HACKED} "1")
 
+if(EXISTS "${WORKDIR}/.lyx/session")
+  execute_process(COMMAND ${CMAKE_COMMAND} -E remove -f "${WORKDIR}/.lyx/session")
+endif()
 # Environments needed by keytest.py
 set(ENV{PACKAGE} ${PACKAGE})
 set(ENV{LOCALE_DIR} ${LOCALE_DIR})
 set(ENV{LYX_LOCALEDIR} "${WORKDIR}/../locale")
-set(ENV{LYX_USERDIR} ${WORKDIR})
+set(ENV{LYX_USERDIR} "${WORKDIR}/.lyx")
 set(ENV{LYX_PID} ${pidres})
 set(ENV{LYX_WINDOW_NAME} ${LYX_WINDOW_NAME})
 set(ENV{LYX_EXE} ${LYX_EXE})
+set(ENV{LYX} ${LYX})
 set(ENV{XVKBD_EXE} ${XVKBD_EXE})
 set(ENV{KEYTEST_INFILE} "${AUTOTEST_ROOT}/${KEYTEST_INFILE}")
 set(ENV{KEYTEST_OUTFILE} "${WORKDIR}/${KEYTEST_OUTFILE}")
 set(ENV{PO_BUILD_DIR} "${PO_BUILD_DIR}")
 set(ENV{MAX_DROP} 0)
-set(ENV{MAX_LOOP} 1)
+set(ENV{MAX_LOOPS} 1)
+string(REGEX REPLACE "-in\\.(txt|sh)$" "" _jj ${KEYTEST_INFILE})
+if(EXISTS "${WORKDIR}/../${_jj}.lyx.emergency")
+  execute_process(
+  COMMAND ${CMAKE_COMMAND} -E remove -f "${WORKDIR}/../${_jj}.lyx.emergency" )
+endif()
 file(GLOB _testfiles RELATIVE "${WORKDIR}" "test*.*" "#test*.*")
 if(_testfiles)
   # remove some leftover files from previous test
   execute_process(
   COMMAND ${CMAKE_COMMAND} -E remove -f ${_testfiles} )
 endif()
+if(EXISTS "${AUTOTEST_ROOT}/${_jj}.lyx")
+  configure_file("${AUTOTEST_ROOT}/${_jj}.lyx" "${WORKDIR}/../${_jj}.lyx" COPYONLY)
+endif()
 execute_process(
   COMMAND python ${KEYTEST}
   RESULT_VARIABLE KEYTEST_RES)