X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fautotests%2FCMakeLists.txt;h=471922972f0087d9e812bc8d4d32b56d5ab29256;hb=9dc6f09c6584f765576dfed9758889ecbb286937;hp=0ad195f71cf96dcbbb3d0bfd1143188aec084dd9;hpb=9c55af4a223ce4db29d643251109e245665344bd;p=features.git

diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt
index 0ad195f71c..471922972f 100644
--- a/development/autotests/CMakeLists.txt
+++ b/development/autotests/CMakeLists.txt
@@ -67,12 +67,18 @@ if(QT_USES_X11)
     message(STATUS "cmake build is therefore omitting keytests")
   endif()
 
-  if(Missing)
+  find_program(XVKBD_EXE NAMES "xvkbd")
+  if (XVKBD_EXE MATCHES "NOTFOUND")
+    message(STATUS "Missing xvkbd, omitting keytests")
+    list(APPEND Missing "xvkbd")
+  endif()
+
+  if(Missing OR NOT LYX_ENABLE_KEYTESTS)
     set(_runtest FALSE)
   else()
     project(keytest)
 
-    add_subdirectory(xvkbd)
+    #add_subdirectory(xvkbd)
 
     set(_runtest TRUE)
     set(KEYTEST "${CMAKE_CURRENT_SOURCE_DIR}/keytest.py")
@@ -101,10 +107,12 @@ if(QT_USES_X11)
         -DKEYTEST_INFILE=${_tf}
         -DBINDIR=$<TARGET_FILE_DIR:${_lyx}>
         -DLYX=${_lyx}
+	-DXVKBD_EXE=${XVKBD_EXE}
         -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
         -DLYX_USERDIR_VER=${LYX_USERDIR_VER}
         -DKEYTEST_OUTFILE=${_t}-out.txt
         -DPACKAGE=${PACKAGE}
+	-DFRONTEND=${LYX_USE_QT}
         -DLOCALE_DIR=${LOCALE_DIR}
         -P ${TOP_SRC_DIR}/development/autotests/single-test.cmake)
       settestlabel(keytest/${_t} "key")
@@ -114,5 +122,8 @@ if(QT_USES_X11)
 endif()
 
 if (LYX_ENABLE_EXPORT_TESTS)
+  set(lyx_ignored_count 0)
   include(${TOP_SRC_DIR}/development/autotests/ExportTests.cmake)
+  message(STATUS "Number of ignored export tests now ${lyx_ignored_count}")
+  set(LYX_ignored_count ${lyx_ignored_count} PARENT_SCOPE)
 endif()