Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

test.py: more python-2.5 support (process.terminate)

Browse source
This commit is contained in:
Aapo Rantalainen 2013-03-24 07:57:49 +02:00
parent df1d321b96
commit 62c378852a
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test.py
View file

@ -7,7 +7,7 @@ import subprocess
import threading
PPSSPP_EXECUTABLES = [ "Windows\\Release\\PPSSPPHeadless.exe", "build/PPSSPPHeadless" ]
PPSSPP_EXECUTABLES = [ "Windows\\Release\\PPSSPPHeadless.exe", "build/PPSSPPHeadless","./PPSSPPHeadless" ]
PPSSPP_EXE = None
TEST_ROOT = "pspautotests/tests/"
teamcity_mode = False
@ -32,6 +32,10 @@ class Command(object):
thread.join(timeout)
if thread.isAlive():
self.timeout = True
if sys.version_info < (2, 6):
os.kill(process.pid, signal.SIGKILL)
else:
process.terminate()
self.process.terminate()
thread.join()