X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fautotests%2Fsingle-test.cmake;h=34a3e96c355d87fb06652923f28d6f8884d15ffb;hb=90adb4f3146522cf0d3dfe8ac3400eb688515c05;hp=f9e9a28a9e8e03bfe829a4e2135dde52d87f7efd;hpb=b436a03b3468dd15b27ee1c35e09d79b49192996;p=lyx.git

diff --git a/development/autotests/single-test.cmake b/development/autotests/single-test.cmake
index f9e9a28a9e..34a3e96c35 100755
--- a/development/autotests/single-test.cmake
+++ b/development/autotests/single-test.cmake
@@ -6,24 +6,29 @@
 # KEYTEST_OUTFILE = xxx-out.txt
 # BINDIR          = ${BUILD_DIR}/bin
 # WORKDIR         = ${BUILD_DIR}/autotests/out-home
+# LYX_USERDIR_VER = ${LYX_USERDIR_VER}
 # LOCALE_DIR      = ${BUILD_DIR}/autotests/locale
 # PO_BUILD_DIR    = ${BUILD_DIR}/po
 # PACKAGE         = lyx2.1
 #
 # Script should be called like:
 # cmake -DAUTOTEST_ROOT=xxxx \
+#       -DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR}
 #       -DKEYTEST_INFILE=xxxx \
 #       -DKEYTEST_OUTFILE=xxx \
 #       -DBINDIR=xxx \
+#       -DLYX=xxx \
 #       -DWORKDIR=xxx \
+#       -DLYX_USERDIR_VER=${LYX_USERDIR_VER} \
 #       -DLOCALE_DIR=xxx \
 #       -DPO_BUILD_DIR=xxx \
 #       -DPACKAGE=xxx \
+#       -DFRONTEND=Qt? \
 #       -P ${AUTOTEST_ROOT}/single-test.cmake
 
 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,28 +49,66 @@ else()
   set(LYX_WINDOW_NAME "")
 endif()
 
-set(LYX_EXE "${BINDIR}/lyx")
-set(XVKBD_EXE "${BINDIR}/xvkbd")
+#check for plausible DISPLAY environment (needed bei keytests)
+set(DISPLAY_VAR $ENV{DISPLAY})
+if(NOT DISPLAY_VAR MATCHES "^[a-zA-Z\\.]*:[0-9]+\(\\.[0-9]+\)?$")
+  message(FATAL_ERROR "Invalid DISPLAY environment value (== '${DISPLAY_VAR}')")
+endif()
+
+set(LYX_EXE "${BINDIR}/${LYX}")
+set(use_hacked $ENV{XVKBD_HACKED})
+if(NOT use_hacked)
+  if(use_hacked STREQUAL "")
+    # ENV{XVKBD_HACKED} probably not set, so the default should be
+    # to use the hacked
+    set(use_hacked "1")
+  else()
+    set(use_hacked "0")
+  endif()
+else()
+  set(use_hacked "1")
+endif()
 
+set(ENV{XVKBD_HACKED} ${use_hacked})
+if(use_hacked)
+  set(XVKBD_EXE "${BINDIR}/xvkbd")
+else()
+  set(XVKBD_EXE "/usr/bin/xvkbd")
+endif()
+set(ENV{QT_FRONTEND} ${FRONTEND})
+
+if(EXISTS "${LYX_TESTS_USERDIR}/session")
+  execute_process(COMMAND ${CMAKE_COMMAND} -E remove -f "${LYX_TESTS_USERDIR}/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} ${LYX_USERDIR})
+set(ENV{LYX_LOCALEDIR} "${LOCALE_DIR}")
+set(ENV{${LYX_USERDIR_VER}} "${LYX_TESTS_USERDIR}")
 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} 1)
+set(ENV{MAX_DROP} 0)
+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)