The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 57ca9ee07305254fe984a403d05a8d0a2ab4ad06 Author: Kornel Benko <[email protected]> Date: Tue Dec 11 18:59:05 2012 +0100 Cmake build: autotests 1.) Filenames for export changed 2.) Usage of wmctrl 3.) More temporary file to remove diff --git a/development/autotests/export.cmake b/development/autotests/export.cmake index ceed5e4..b848cb4 100755 --- a/development/autotests/export.cmake +++ b/development/autotests/export.cmake @@ -5,11 +5,10 @@ message(STATUS "lyx_files = ${lyx_files}") set(ERRORS) foreach(format lyx16x xhtml) foreach(f ${lyx_files}) - message(STATUS "Executing ${lyx} -e ${format} ${f}") - #execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${f} localtest.lyx) + message(STATUS "Executing ${lyx} -E ${format} localtest.${format} ${f}") execute_process(COMMAND ${CMAKE_COMMAND} -E remove localtest.xhtml localtest.16.lyx) execute_process( - COMMAND ${lyx} -E ${format} localtest.lyx ${f} + COMMAND ${lyx} -E ${format} localtest.${format} ${f} RESULT_VARIABLE _err) string(COMPARE NOTEQUAL ${_err} 0 _erg) if(_erg) diff --git a/development/autotests/keytest.py b/development/autotests/keytest.py index 76492a3..dffff5a 100755 --- a/development/autotests/keytest.py +++ b/development/autotests/keytest.py @@ -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("wmctrl -l | ( grep '"+lyx_window_name+"' || ( killall lyx ; sleep 1 ; killall -9 lyx ))") #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') @@ -359,7 +359,10 @@ while not failed: sendKeystring(c[4:], lyx_pid) else: ##intr_system('killall lyx; sleep 2 ; killall -9 lyx') - print 'No path /proc/' + lyx_pid + '/status, exiting' + if lyx_pid is None: + print 'No path /proc/xxxx/status, exiting' + else: + print 'No path /proc/' + lyx_pid + '/status, exiting' os._exit(1) elif c[0:4] == 'KD: ': key_delay = c[4:].rstrip('\n') @@ -412,15 +415,17 @@ while not failed: else: short_code = ccode lyx_dir = os.popen("dirname \"" + lyx_exe + "\"").read().rstrip() - 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() - intr_system("mkdir -p " + locale_dir + "/" + ccode + "/LC_MESSAGES") - if lyx_dir[0:3] == "../": - rel_dir = "../../" + lyx_dir - else: - rel_dir = lyx_dir - intr_system("rm -f " + locale_dir + "/" + ccode + "/LC_MESSAGES/" + lyx_name + ".mo") - intr_system("ln -s " + rel_dir + "/../po/" + short_code + ".gmo " + locale_dir + "/" + ccode + "/LC_MESSAGES/" + lyx_name + ".mo") + # 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/'" + 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") + if lyx_dir[0:3] == "../": + rel_dir = "../../" + lyx_dir + else: + rel_dir = lyx_dir + intr_system("rm -f " + locale_dir + "/" + ccode + "/LC_MESSAGES/" + lyx_name + ".mo") + intr_system("ln -s " + rel_dir + "/../po/" + short_code + ".gmo " + locale_dir + "/" + ccode + "/LC_MESSAGES/" + lyx_name + ".mo") else: print "Unrecognised Command '" + c + "'\n" failed = True diff --git a/development/autotests/single-test.cmake b/development/autotests/single-test.cmake index 5ab0316..5da1c99 100755 --- a/development/autotests/single-test.cmake +++ b/development/autotests/single-test.cmake @@ -51,7 +51,7 @@ set(ENV{XVKBD_EXE} ${XVKBD_EXE}) set(ENV{KEYTEST_INFILE} "${AUTOTEST_ROOT}/${KEYTEST_INFILE}") set(ENV{KEYTEST_OUTFILE} "${WORKDIR}/${KEYTEST_OUTFILE}") set(ENV{MAX_DROP} 1) -file(GLOB _testfiles RELATIVE "${WORKDIR}" "test.*") +file(GLOB _testfiles RELATIVE "${WORKDIR}" "test*.*" "#test*.*") if(_testfiles) # remove some leftover files from previous test execute_process( ----------------------------------------------------------------------- Summary of changes: development/autotests/export.cmake | 5 ++--- development/autotests/keytest.py | 27 ++++++++++++++++----------- development/autotests/single-test.cmake | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) hooks/post-receive -- The LyX Source Repository
