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

diff --git a/development/autotests/single-test.cmake b/development/autotests/single-test.cmake
index 0758e7fc56..34a3e96c35 100755
--- a/development/autotests/single-test.cmake
+++ b/development/autotests/single-test.cmake
@@ -23,6 +23,7 @@
 #       -DLOCALE_DIR=xxx \
 #       -DPO_BUILD_DIR=xxx \
 #       -DPACKAGE=xxx \
+#       -DFRONTEND=Qt? \
 #       -P ${AUTOTEST_ROOT}/single-test.cmake
 
 set(KEYTEST "${AUTOTEST_ROOT}/keytest.py")
@@ -48,6 +49,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,6 +75,7 @@ if(use_hacked)
 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")
@@ -75,7 +83,7 @@ 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_LOCALEDIR} "${LOCALE_DIR}")
 set(ENV{${LYX_USERDIR_VER}} "${LYX_TESTS_USERDIR}")
 set(ENV{LYX_PID} ${pidres})
 set(ENV{LYX_WINDOW_NAME} ${LYX_WINDOW_NAME})