Merge pull request #22369 from hrydgard/compact-gpu-test-output

pspautotests: More compact gpu test output, increase timeout in debug builds

test.py

@@ -41,8 +41,7 @@ TEST_ROOT = "pspautotests/tests/"
 TIMEOUT = 5
 
 # The slower CPU backends need a longer wall clock on the CPU-heavy tests - the interpreter runs
-# gpu/rendertarget/copy in about 4.5s against the JIT's 0.15s, since that test does over a million
-# guest-side vsprintf calls. Scale the timeout per backend rather than raising it for everyone, so
+# misc/deadbeef in about 3s. Scale the timeout per backend rather than raising it for everyone, so
 # a genuine hang under the JIT is still caught in five seconds.
 CPU_TIMEOUTS = {
   'interpreter': 20,
@@ -51,6 +50,8 @@ CPU_TIMEOUTS = {
   'jit-ir': 5,
 }
 
+DEBUG_TIMEOUT_SCALE = 3
+
 class Command(object):
   def __init__(self, cmd, data = None):
     self.cmd = cmd
@@ -668,6 +669,9 @@ def run_tests(test_list, args):
   global PPSSPP_EXE, TIMEOUT
   returncode = 0
   timeout = CPU_TIMEOUTS.get(cpu_backend(args), TIMEOUT)
+  # Debug builds are several times slower, enough for the heavier tests to brush the limit.
+  if 'Debug' in os.path.normpath(PPSSPP_EXE).split(os.sep):
+    timeout *= DEBUG_TIMEOUT_SCALE
 
   test_filenames = []
   for test in test_list: