anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 13:04:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake build: autotests

Browse Source 
1.) Filenames for export changed
2.) Usage of wmctrl
3.) More temporary file to remove
This commit is contained in:
Kornel Benko 2012-12-11 18:59:05 +01:00
parent f02f671dd0
commit 57ca9ee073
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
development/autotests/export.cmake
View File

@ -5,11 +5,10 @@ message(STATUS "lyx_files = ${lyx_files}")
set(ERRORS) set(ERRORS)
foreach(format lyx16x xhtml) foreach(format lyx16x xhtml)
foreach(f ${lyx_files}) foreach(f ${lyx_files})
message(STATUS "Executing ${lyx} -e ${format} ${f}") message(STATUS "Executing ${lyx} -E ${format} localtest.${format} ${f}")
#execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${f} localtest.lyx)
execute_process(COMMAND ${CMAKE_COMMAND} -E remove localtest.xhtml localtest.16.lyx) execute_process(COMMAND ${CMAKE_COMMAND} -E remove localtest.xhtml localtest.16.lyx)
execute_process( execute_process(
COMMAND ${lyx} -E ${format} localtest.lyx ${f} COMMAND ${lyx} -E ${format} localtest.${format} ${f}
RESULT_VARIABLE _err) RESULT_VARIABLE _err)
string(COMPARE NOTEQUAL ${_err} 0 _erg) string(COMPARE NOTEQUAL ${_err} 0 _erg)
if(_erg) if(_erg)

7
development/autotests/keytest.py
View File

@ -234,7 +234,7 @@ def RaiseWindow():
#intr_system("echo x-session-manager open files: `lsof -p $X_PID | grep ICE-unix | wc -l`") #intr_system("echo x-session-manager open files: `lsof -p $X_PID | grep ICE-unix | wc -l`")
####intr_system("wmctrl -l | ( grep '"+lyx_window_name+"' || ( killall lyx ; sleep 1 ; killall -9 lyx ))") ####intr_system("wmctrl -l | ( grep '"+lyx_window_name+"' || ( killall lyx ; sleep 1 ; killall -9 lyx ))")
#intr_system("wmctrl -R '"+lyx_window_name+"' ;sleep 0.1") #intr_system("wmctrl -R '"+lyx_window_name+"' ;sleep 0.1")
system_retry(30, "wmctrl -a '"+lyx_window_name+"'") system_retry(30, "wmctrl -i -a '"+lyx_window_name+"'")
lyx_pid = os.environ.get('LYX_PID') lyx_pid = os.environ.get('LYX_PID')
@ -359,6 +359,9 @@ while not failed:
sendKeystring(c[4:], lyx_pid) sendKeystring(c[4:], lyx_pid)
else: else:
##intr_system('killall lyx; sleep 2 ; killall -9 lyx') ##intr_system('killall lyx; sleep 2 ; killall -9 lyx')
if lyx_pid is None:
print 'No path /proc/xxxx/status, exiting'
else:
print 'No path /proc/' + lyx_pid + '/status, exiting' print 'No path /proc/' + lyx_pid + '/status, exiting'
os._exit(1) os._exit(1)
elif c[0:4] == 'KD: ': elif c[0:4] == 'KD: ':
@ -412,6 +415,8 @@ while not failed:
else: else:
short_code = ccode short_code = ccode
lyx_dir = os.popen("dirname \"" + lyx_exe + "\"").read().rstrip() lyx_dir = os.popen("dirname \"" + lyx_exe + "\"").read().rstrip()
# on cmake-build there is no Makefile in this directory
if os.path.exists(lyx_dir + "/Makefile"):
print "Executing: grep 'PACKAGE =' " + lyx_dir + "/Makefile | sed -e 's/PACKAGE = \(.*\)/\\1/'" print "Executing: grep 'PACKAGE =' " + lyx_dir + "/Makefile | sed -e 's/PACKAGE = \(.*\)/\\1/'"
lyx_name = os.popen("grep 'PACKAGE =' " + lyx_dir + "/Makefile | sed -e 's/PACKAGE = \(.*\)/\\1/'").read().rstrip() lyx_name = os.popen("grep 'PACKAGE =' " + lyx_dir + "/Makefile | sed -e 's/PACKAGE = \(.*\)/\\1/'").read().rstrip()
intr_system("mkdir -p " + locale_dir + "/" + ccode + "/LC_MESSAGES") intr_system("mkdir -p " + locale_dir + "/" + ccode + "/LC_MESSAGES")

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

@ -51,7 +51,7 @@ 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}")
set(ENV{MAX_DROP} 1) set(ENV{MAX_DROP} 1)
file(GLOB _testfiles RELATIVE "${WORKDIR}" "test.*") file(GLOB _testfiles RELATIVE "${WORKDIR}" "test*.*" "#test*.*")
if(_testfiles) if(_testfiles)
# remove some leftover files from previous test # remove some leftover files from previous test
execute_process( execute_process(