]> git.lyx.org Git - features.git/commitdiff
When killing lyx instances, we may ignore failures of kill and killall (if the proces...
authorTommaso Cucinotta <tommaso@lyx.org>
Sat, 19 Feb 2011 21:00:01 +0000 (21:00 +0000)
committerTommaso Cucinotta <tommaso@lyx.org>
Sat, 19 Feb 2011 21:00:01 +0000 (21:00 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37734 a592a061-630c-0410-9148-cb99ea01b6c8

development/autotests/keytest.py

index cf5d13e0894c8c370545b4a2a8e6ee69ae5f2c2c..bbb57b4fe385bf2f194bacd11c4ac9a3e4709f1c 100755 (executable)
@@ -321,9 +321,9 @@ while not failed:
         lyx_pid=os.popen("pidof lyx").read()
         if lyx_pid != "":
             print "Found running instance(s) of LyX: " + lyx_pid + ": killing them all\n"
-            intr_system("killall lyx")
+            intr_system("killall lyx", True)
             time.sleep(0.5)
-            intr_system("killall -KILL lyx")
+            intr_system("killall -KILL lyx", True)
         time.sleep(0.2)
         print "Starting LyX . . ."
         if lyx_userdir is None:
@@ -376,7 +376,7 @@ while not failed:
     elif c[0:7] == 'TestEnd':
         time.sleep(0.5)
         print "Terminating lyx instance: " + str(lyx_pid) + "\n"
-        intr_system("kill -9 " + str(lyx_pid));
+        intr_system("kill -9 " + str(lyx_pid), True);
         while lyx_exists():
             print "Waiting for lyx to die...\n"
             time.sleep(0.5)