From 6faca211b1688b5d453da2a6faa043ef3b6bcaef Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 23 Mar 2013 22:36:46 -0700 Subject: [PATCH] Make test.py run the most recently built binary. --- test.py | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/test.py b/test.py index 7e3efca9c9..5965ecfb0a 100755 --- a/test.py +++ b/test.py @@ -6,9 +6,23 @@ import io import os import subprocess import threading +import glob -PPSSPP_EXECUTABLES = [ "Windows\\Release\\PPSSPPHeadless.exe", "build/PPSSPPHeadless" ] +PPSSPP_EXECUTABLES = [ + # Windows + "Windows\\Debug\\PPSSPPHeadless.exe", + "Windows\\Release\\PPSSPPHeadless.exe", + "Windows\\x64\\Debug\\PPSSPPHeadless.exe", + "Windows\\x64\\Release\\PPSSPPHeadless.exe", + # Mac + "build*/Debug/PPSSPPHeadless", + "build*/Release/PPSSPPHeadless", + "build*/RelWithDebInfo/PPSSPPHeadless", + "build*/MinSizeRel}/PPSSPPHeadless", + # Linux + "build*/PPSSPPHeadless" +] PPSSPP_EXE = None TEST_ROOT = "pspautotests/tests/" teamcity_mode = False @@ -199,10 +213,13 @@ def init(): print("(checked for existence of cpu/cpu_alu/cpu_alu.prx)") sys.exit(1) - for p in PPSSPP_EXECUTABLES: - if os.path.exists(p): - PPSSPP_EXE = p - break + possible_exes = [glob.glob(f) for f in PPSSPP_EXECUTABLES] + possible_exes = [x for sublist in possible_exes for x in sublist] + existing = filter(os.path.exists, possible_exes) + if existing: + PPSSPP_EXE = max((os.path.getmtime(f), f) for f in existing)[1] + else: + PPSSPP_EXE = None if not PPSSPP_EXE: print("PPSSPP executable missing, please build one.")