From df1d321b96c55b5ba9144f69677b6148c3cf7bd9 Mon Sep 17 00:00:00 2001
From: Aapo Rantalainen <aapo.rantalainen@gmail.com>
Date: Sun, 24 Mar 2013 07:49:01 +0200
Subject: [PATCH 1/2] test.py: can be run with python-2.5

---
 test.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test.py b/test.py
index 7e3efca9c9..af9cf105d5 100755
--- a/test.py
+++ b/test.py
@@ -2,7 +2,6 @@
 # Automated script to run the pspautotests test suite in PPSSPP.
 
 import sys
-import io
 import os
 import subprocess
 import threading
@@ -31,7 +30,7 @@ class Command(object):
     thread.start()
 
     thread.join(timeout)
-    if thread.is_alive():
+    if thread.isAlive():
       self.timeout = True
       self.process.terminate()
       thread.join()

From 62c378852a6b14e451b367f84e52b1eae5856abb Mon Sep 17 00:00:00 2001
From: Aapo Rantalainen <aapo.rantalainen@gmail.com>
Date: Sun, 24 Mar 2013 07:57:49 +0200
Subject: [PATCH 2/2] test.py: more python-2.5 support (process.terminate)

---
 test.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test.py b/test.py
index af9cf105d5..b109b98d9d 100755
--- a/test.py
+++ b/test.py
@@ -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()