From d97c34f4fe92891e8da07bc5e1285743cbd13b06 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Wed, 3 Sep 2014 12:25:28 +0200 Subject: [PATCH] Cmake tests: Disable keytests if missing needed input files The files first-time-in.txt and hello-world-in.txt are used as first tests to initialize the test environment for the other keytests. --- development/autotests/CMakeLists.txt | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt index 4ea5c70172..3dd4213842 100644 --- a/development/autotests/CMakeLists.txt +++ b/development/autotests/CMakeLists.txt @@ -67,18 +67,29 @@ if(QT_USES_X11) message(STATUS "cmake build is therefore omitting keytests") endif() - if(NOT Missing) + if(Missing) + set(_runtest FALSE) + else() project(keytest) add_subdirectory(xvkbd) + set(_runtest TRUE) set(KEYTEST "${CMAKE_CURRENT_SOURCE_DIR}/keytest.py") file(GLOB TESTST RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*-in.txt") file(GLOB TESTSS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*-in.sh") - list(REMOVE_ITEM TESTST hello-world-in.txt first-time-in.txt) + set(_firsttxt hello-world-in.txt first-time-in.txt) + foreach(_f ${_firsttxt}) + list(FIND TESTST ${_f} _ff) + if(NOT _ff GREATER -1) + set(_runtest FALSE) + endif() + endforeach() + list(REMOVE_ITEM TESTST ${_firsttxt}) list(SORT TESTST) - - foreach(_tf first-time-in.txt hello-world-in.txt ${TESTST}) + endif() + if(_runtest) + foreach(_tf ${_firsttxt} ${TESTST}) string(REGEX REPLACE "-in\\.(txt|sh)" "" _t ${_tf}) add_test(NAME keytest/${_t} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}" -- 2.39.2