From: Scott Kostyshak Date: Fri, 1 Mar 2013 05:15:47 +0000 (-0500) Subject: Remove keytest.py code from export.cmake X-Git-Tag: 2.1.0beta1~590 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6c15b944b165b6926608734cea8022d6782922d0;p=features.git Remove keytest.py code from export.cmake Export tests do not need keytest.py. --- diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake index 518886b6b9..9db0191427 100755 --- a/development/autotests/export.cmake +++ b/development/autotests/export.cmake @@ -29,48 +29,3 @@ if(_erg) message(STATUS "Exporting ${f}.lyx to ${format}") message(FATAL_ERROR "Export failed") endif() -# This script invokes the keytest.py script with the simple set-up needed -# to re-run deterministic regression tests that one would like to have. -# -# AUTOTEST_ROOT = ${LYX_ROOT}/development/autotests -# KEYTEST_INFILE = xxx-in.txt -# KEYTEST_OUTFILE = xxx-out.txt -# BINDIR = ${BUILD_DIR}/bin -# WORKDIR = ${BUILD_DIR}/autotests/out-home -# LOCALE_DIR = ${BUILD_DIR}/autotests/locale -# PO_BUILD_DIR = ${BUILD_DIR}/po -# PACKAGE = lyx2.1 -# -# Script should be called like: -# cmake -DAUTOTEST_ROOT=xxxx \ -# -DKEYTEST_INFILE=xxxx \ -# -DKEYTEST_OUTFILE=xxx \ -# -DBINDIR=xxx \ -# -DWORKDIR=xxx \ -# -DLOCALE_DIR=xxx \ -# -DPO_BUILD_DIR=xxx \ -# -DPACKAGE=xxx \ -# -P ${AUTOTEST_ROOT}/single-test.cmake - -set(KEYTEST "${AUTOTEST_ROOT}/keytest.py") - -execute_process(COMMAND pidof lyx OUTPUT_VARIABLE LYX_PID RESULT_VARIABLE pidstat OUTPUT_VARIABLE pidres) -message(STATUS "pidres = ${pidres}") -if (NOT pidstat) - # lyx already running, remove trailing '\n' from pid - string(REGEX REPLACE "\n" "" pidres ${pidres}) - execute_process(COMMAND wmctrl -l -p OUTPUT_VARIABLE _wmco) - string(REGEX REPLACE "[\n]+" ";" _wmc ${_wmco}) - foreach(_w ${_wmc}) - string(REGEX MATCH "${pidres}" _wr ${_w}) - if (${_wr} MATCHES ${pidres}) - # this entry contains the pid, go search for X11-window-id - string(REGEX REPLACE " .*" "" _wr ${_w}) - set(LYX_WINDOW_NAME ${_wr}) - message(STATUS "Set LYX_WINDOW_NAME to ${_wr}") - endif() - endforeach() -else() - set(pidres "") - set(LYX_WINDOW_NAME "") -endif()