anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

autotests: Enable the suffixed lyx to run the test too.

Browse Source 
(Hard coded 'lyx' replaced with real lyx-exe-file-name)
This commit is contained in:
Kornel Benko 2013-01-05 10:07:37 +01:00
parent 66ac0bbd8a
commit 9481d4182e
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
development/autotests/CMakeLists.txt
View File

@ -37,6 +37,7 @@ if(Q_WS_X11)
-DPO_BUILD_DIR=${TOP_BINARY_DIR}/po -DPO_BUILD_DIR=${TOP_BINARY_DIR}/po
-DKEYTEST_INFILE=${_tf} -DKEYTEST_INFILE=${_tf}
-DBINDIR=$<TARGET_FILE_DIR:${_lyx}> -DBINDIR=$<TARGET_FILE_DIR:${_lyx}>
-DLYX=${_lyx}
-DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME} -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
-DKEYTEST_OUTFILE=${_t}-out.txt -DKEYTEST_OUTFILE=${_t}-out.txt
-DPACKAGE=${PACKAGE} -DPACKAGE=${PACKAGE}

14
development/autotests/keytest.py
View File

@ -258,9 +258,13 @@ PO_BUILD_DIR = os.environ.get('PO_BUILD_DIR')
if not PO_BUILD_DIR is None: if not PO_BUILD_DIR is None:
print "PO_BUILD_DIR = " + PO_BUILD_DIR + "\n" print "PO_BUILD_DIR = " + PO_BUILD_DIR + "\n"
lyx = os.environ.get('LYX')
if lyx is None:
lyx = "lyx"
lyx_exe = os.environ.get('LYX_EXE') lyx_exe = os.environ.get('LYX_EXE')
if lyx_exe is None: if lyx_exe is None:
lyx_exe = "lyx" lyx_exe = lyx
xvkbd_exe = os.environ.get('XVKBD_EXE') xvkbd_exe = os.environ.get('XVKBD_EXE')
if xvkbd_exe is None: if xvkbd_exe is None:
@ -326,12 +330,12 @@ while not failed:
print "Ignoring comment line: " + c print "Ignoring comment line: " + c
elif c[0:9] == 'TestBegin': elif c[0:9] == 'TestBegin':
print "\n" print "\n"
lyx_pid=os.popen("pidof lyx").read() lyx_pid=os.popen("pidof " + lyx).read()
if lyx_pid != "": if lyx_pid != "":
print "Found running instance(s) of LyX: " + lyx_pid + ": killing them all\n" print "Found running instance(s) of LyX: " + lyx_pid + ": killing them all\n"
intr_system("killall lyx", True) intr_system("killall " + lyx, True)
time.sleep(0.5) time.sleep(0.5)
intr_system("killall -KILL lyx", True) intr_system("killall -KILL " + lyx, True)
time.sleep(0.2) time.sleep(0.2)
print "Starting LyX . . ." print "Starting LyX . . ."
if lyx_userdir is None: if lyx_userdir is None:
@ -339,7 +343,7 @@ while not failed:
else: else:
intr_system(lyx_exe + " -userdir " + lyx_userdir + " " + c[9:] + "&") intr_system(lyx_exe + " -userdir " + lyx_userdir + " " + c[9:] + "&")
while True: while True:
lyx_pid=os.popen("pidof lyx").read().rstrip() lyx_pid=os.popen("pidof " + lyx).read().rstrip()
if lyx_pid != "": if lyx_pid != "":
lyx_window_name=os.popen("wmctrl -l -p | grep ' " + str(lyx_pid) + " ' | cut -d ' ' -f 1").read().rstrip() lyx_window_name=os.popen("wmctrl -l -p | grep ' " + str(lyx_pid) + " ' | cut -d ' ' -f 1").read().rstrip()
if lyx_window_name != "": if lyx_window_name != "":

6
development/autotests/single-test.cmake
View File

@ -15,6 +15,7 @@
# -DKEYTEST_INFILE=xxxx \ # -DKEYTEST_INFILE=xxxx \
# -DKEYTEST_OUTFILE=xxx \ # -DKEYTEST_OUTFILE=xxx \
# -DBINDIR=xxx \ # -DBINDIR=xxx \
# -DLYX=xxx \
# -DWORKDIR=xxx \ # -DWORKDIR=xxx \
# -DLOCALE_DIR=xxx \ # -DLOCALE_DIR=xxx \
# -DPO_BUILD_DIR=xxx \ # -DPO_BUILD_DIR=xxx \
@ -23,7 +24,7 @@
set(KEYTEST "${AUTOTEST_ROOT}/keytest.py") set(KEYTEST "${AUTOTEST_ROOT}/keytest.py")
execute_process(COMMAND pidof lyx OUTPUT_VARIABLE LYX_PID RESULT_VARIABLE pidstat OUTPUT_VARIABLE pidres) execute_process(COMMAND pidof ${LYX} OUTPUT_VARIABLE LYX_PID RESULT_VARIABLE pidstat OUTPUT_VARIABLE pidres)
message(STATUS "pidres = ${pidres}") message(STATUS "pidres = ${pidres}")
if (NOT pidstat) if (NOT pidstat)
# lyx already running, remove trailing '\n' from pid # lyx already running, remove trailing '\n' from pid
@ -44,7 +45,7 @@ else()
set(LYX_WINDOW_NAME "") set(LYX_WINDOW_NAME "")
endif() endif()
set(LYX_EXE "${BINDIR}/lyx") set(LYX_EXE "${BINDIR}/${LYX}")
set(XVKBD_EXE "${BINDIR}/xvkbd") set(XVKBD_EXE "${BINDIR}/xvkbd")
# Environments needed by keytest.py # Environments needed by keytest.py
@ -55,6 +56,7 @@ set(ENV{LYX_USERDIR} ${WORKDIR})
set(ENV{LYX_PID} ${pidres}) set(ENV{LYX_PID} ${pidres})
set(ENV{LYX_WINDOW_NAME} ${LYX_WINDOW_NAME}) set(ENV{LYX_WINDOW_NAME} ${LYX_WINDOW_NAME})
set(ENV{LYX_EXE} ${LYX_EXE}) set(ENV{LYX_EXE} ${LYX_EXE})
set(ENV{LYX} ${LYX})
set(ENV{XVKBD_EXE} ${XVKBD_EXE}) set(ENV{XVKBD_EXE} ${XVKBD_EXE})
set(ENV{KEYTEST_INFILE} "${AUTOTEST_ROOT}/${KEYTEST_INFILE}") set(ENV{KEYTEST_INFILE} "${AUTOTEST_ROOT}/${KEYTEST_INFILE}")
set(ENV{KEYTEST_OUTFILE} "${WORKDIR}/${KEYTEST_OUTFILE}") set(ENV{KEYTEST_OUTFILE} "${WORKDIR}/${KEYTEST_OUTFILE}")