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 0758e7fc56abb8213be29c86576fe6d0bfc07f41..f76bb214d545bbab6d21f5b2961145fdf5b886bf 100755 (executable)
--- a/development/autotests/single-test.cmake
+++ b/development/autotests/single-test.cmake
@@ -48,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)
@@ -75,7 +81,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})