Fixup commit ff42fe

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

diff --git a/development/autotests/single-test.cmake b/development/autotests/single-test.cmake
index ecb8fbbcc9fc8ce59839a15dade1acb7a49a3899..f76bb214d545bbab6d21f5b2961145fdf5b886bf 100755 (executable)
--- a/development/autotests/single-test.cmake
+++ b/development/autotests/single-test.cmake
@@ -13,6 +13,7 @@
 #
 # Script should be called like:
 # cmake -DAUTOTEST_ROOT=xxxx \
+#       -DLYX_TESTS_USERDIR=${LYX_TESTS_USERDIR}
 #       -DKEYTEST_INFILE=xxxx \
 #       -DKEYTEST_OUTFILE=xxx \
 #       -DBINDIR=xxx \
@@ -47,6 +48,12 @@ else()
   set(LYX_WINDOW_NAME "")
 endif()
 
+#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)
@@ -68,14 +75,14 @@ else()
   set(XVKBD_EXE "/usr/bin/xvkbd")
 endif()
 
-if(EXISTS "${WORKDIR}/.lyx/session")
-  execute_process(COMMAND ${CMAKE_COMMAND} -E remove -f "${WORKDIR}/.lyx/session")
+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_VER}} "${WORKDIR}/.lyx")
+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})