Long time no use of the autotests machinery, needs an update.

diff --git a/development/autotests/keytest.py b/development/autotests/keytest.py
index 27b6d484b7457c90d54b8986d282b31c2776ef7f..608ce7357b193542d98448eb3d208866ebddd020 100755 (executable)
--- a/development/autotests/keytest.py
+++ b/development/autotests/keytest.py
@@ -151,22 +151,13 @@ class CommandSourceFromFile(CommandSource):
         self.i = self.i + 1
         return line
 
+
 def lyx_exists():
     if lyx_pid is None:
         return False
     fname = '/proc/' + lyx_pid + '/status'
     return os.path.exists(fname)
 
-def lyx_sleeping():
-    fname = '/proc/' + lyx_pid + '/status'
-    f = open(fname, 'r')
-    lines = f.readlines()
-    sleeping = lines[1].find('(sleeping)') > 0
-
-    # print 'LYX_STATE', lines[1] , 'SLEEPING=', sleeping
-
-    return sleeping
-
 
 # Interruptible os.system()
 def intr_system(cmd, ignore_err = False):
@@ -179,6 +170,12 @@ def intr_system(cmd, ignore_err = False):
     return ret
 
 
+# Return true if LyX (identified via lyx_pid) is sleeping
+def lyx_sleeping():
+    fname = '/proc/' + lyx_pid + '/status'
+    return intr_system("grep 'State.*sleeping' " + fname)
+
+
 def sendKeystring(keystr, LYX_PID):
 
     # print "sending keystring "+keystr+"\n"
@@ -351,8 +348,10 @@ while not failed:
         count = 5
         while count > 0:
             lyx_pid=os.popen("pidof " + lyx).read().rstrip()
+            print 'lyx_pid=' + lyx_pid, '\n'
             if lyx_pid != "":
                 lyx_window_name=os.popen("wmctrl -l -p | grep ' " + str(lyx_pid) +  " ' | cut -d ' ' -f 1").read().rstrip()
+                print 'lyx_win=' + lyx_window_name, '\n'
                 if lyx_window_name != "":
                     break
             else:

diff --git a/development/autotests/single-test.sh b/development/autotests/single-test.sh
index 3cf509ae0104843bb8eeb5cbd05aba9c0d1cf0b0..bb0ed2a7c6f20d881a5d5ed7d11c7c7d59f361d8 100755 (executable)
--- a/development/autotests/single-test.sh
+++ b/development/autotests/single-test.sh
@@ -26,6 +26,10 @@ if [ "$(pidof lyx)" != "" ]; then
     export LYX_PID=$(pidof lyx)
     export LYX_WINDOW_NAME=$(wmctrl -l -p | grep " $LYX_PID " | cut -d ' ' -f 1);
 fi
+
+echo LYX_PID=$LYX_PID
+echo LYX_WINDOW_NAME=$LYX_WINDOW_NAME
+
 export MAX_LOOPS=1
 export LYX_EXE=${LYX_EXE:-../../src/lyx}
 
@@ -35,4 +39,4 @@ else
     export XVKBD_EXE=${XVKBD_EXE:-xvkbd};
 fi
 
-$KEYTEST
+python -m trace --trace $KEYTEST

diff --git a/development/autotests/stop_autotests.tcl b/development/autotests/stop_autotests.tcl
index 5b15c682a61ef45d40f2b5db465ab1d90741dce6..7822826e878239b52cf3b7c97ea52e8d8b2e4e27 100755 (executable)
--- a/development/autotests/stop_autotests.tcl
+++ b/development/autotests/stop_autotests.tcl
@@ -1,4 +1,4 @@
-#!/usr/bin/wish8.5
+#!/usr/bin/wish
 
 wm attributes . -topmost 1